Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move scala dep from bom #2542

Merged
merged 1 commit into from
Nov 24, 2020
Merged

Move scala dep from bom #2542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 0 additions & 42 deletions dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@
<version.lib.jsonp-impl>1.1.6</version.lib.jsonp-impl>
<version.lib.junit4>4.13.1</version.lib.junit4>
<version.lib.junit>5.6.2</version.lib.junit>
<version.lib.kafka-junit5>3.2.1</version.lib.kafka-junit5>
<version.lib.kafka>2.5.0</version.lib.kafka>
<version.lib.log4j>2.13.3</version.lib.log4j>
<version.lib.logback>1.2.3</version.lib.logback>
Expand Down Expand Up @@ -115,7 +114,6 @@
<version.lib.prometheus>0.9.0</version.lib.prometheus>
<version.lib.reactive-streams-tck>1.0.3</version.lib.reactive-streams-tck>
<version.lib.reactivestreams>1.0.3</version.lib.reactivestreams>
<version.lib.scala>2.12.10</version.lib.scala>
<version.lib.slf4j>1.7.30</version.lib.slf4j>
<version.lib.smallrye-openapi>1.2.0</version.lib.smallrye-openapi>
<version.lib.snakeyaml>1.27</version.lib.snakeyaml>
Expand Down Expand Up @@ -986,25 +984,6 @@
<artifactId>kafka-clients</artifactId>
<version>${version.lib.kafka}</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka_2.12</artifactId>
<version>${version.lib.kafka}</version>
<exclusions>
<exclusion>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
</exclusion>
<exclusion>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
</exclusion>
<exclusion>
<groupId>org.scala-lang</groupId>
<artifactId>scala-reflect</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Testing libraries -->
<dependency>
<groupId>org.mockito</groupId>
Expand Down Expand Up @@ -1107,27 +1086,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.salesforce.kafka.test</groupId>
<artifactId>kafka-junit5</artifactId>
<version>${version.lib.kafka-junit5}</version>
<exclusions>
<exclusion>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>${version.lib.zookeeper}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${version.lib.scala}</version>
</dependency>
<dependency>
<groupId>org.reactivestreams</groupId>
<artifactId>reactive-streams-tck</artifactId>
Expand Down
43 changes: 43 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,12 @@
<version.lib.groovy-all>2.4.14</version.lib.groovy-all>
<version.lib.jgit>4.9.9.201903122025-r</version.lib.jgit>
<version.lib.jsch>0.1.55</version.lib.jsch>
<version.lib.kafka-junit5>3.2.1</version.lib.kafka-junit5>
<version.lib.netty.tcnative>2.0.26.Final</version.lib.netty.tcnative>
<version.lib.restito>0.9.1</version.lib.restito>
<version.lib.rxjava2-jdk9-interop>0.1.0</version.lib.rxjava2-jdk9-interop>
<version.lib.rxjava>2.0.8</version.lib.rxjava>
<version.lib.scala>2.12.10</version.lib.scala>
<!-- This is to force upgrade of transitive dep from arquillian -->
<!-- 2.x versions used http (not https) to access maven central -->
<version.lib.shrinkwrap-resolver>3.0.1</version.lib.shrinkwrap-resolver>
Expand Down Expand Up @@ -739,6 +741,47 @@

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka_2.12</artifactId>
<version>${version.lib.kafka}</version>
<exclusions>
<exclusion>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
</exclusion>
<exclusion>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
</exclusion>
<exclusion>
<groupId>org.scala-lang</groupId>
<artifactId>scala-reflect</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.salesforce.kafka.test</groupId>
<artifactId>kafka-junit5</artifactId>
<version>${version.lib.kafka-junit5}</version>
<exclusions>
<exclusion>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>${version.lib.zookeeper}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<scope>test</scope>
<version>${version.lib.scala}</version>
</dependency>
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-mock</artifactId>
Expand Down