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

Move some of the test deps out of quarkus-bom #17772

Merged
merged 1 commit into from
Jun 28, 2021
Merged

Move some of the test deps out of quarkus-bom #17772

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
34 changes: 0 additions & 34 deletions bom/application/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@
<agroal.version>1.11</agroal.version>
<jboss-transaction-spi.version>7.6.0.Final</jboss-transaction-spi.version>
<elasticsearch-rest-client.version>7.10.0</elasticsearch-rest-client.version>
<rxjava1.version>1.3.8</rxjava1.version>
<rxjava.version>2.2.21</rxjava.version>
<wildfly.openssl.version>1.0.6.Final</wildfly.openssl.version>
<jboss-logging-annotations.version>2.2.1.Final</jboss-logging-annotations.version>
Expand Down Expand Up @@ -129,7 +128,6 @@
<junit.jupiter.version>5.7.2</junit.jupiter.version>
<testng.version>6.14.2</testng.version>
<assertj.version>3.19.0</assertj.version>
<json-smart.version>2.4.1</json-smart.version>
<infinispan.version>12.1.4.Final</infinispan.version>
<infinispan.protostream.version>4.4.1.Final</infinispan.protostream.version>
<caffeine.version>2.9.1</caffeine.version>
Expand Down Expand Up @@ -170,15 +168,13 @@
<proton-j.version>0.33.8</proton-j.version>
<okhttp.version>3.14.9</okhttp.version>
<sentry.version>4.3.0</sentry.version>
<subethasmtp.version>3.1.7</subethasmtp.version>
<hibernate-quarkus-local-cache.version>0.1.0</hibernate-quarkus-local-cache.version>
<kubernetes-client.version>5.4.1</kubernetes-client.version>
<flapdoodle.mongo.version>2.2.0</flapdoodle.mongo.version>
<quarkus-spring-api.version>5.2.SP4</quarkus-spring-api.version>
<quarkus-spring-data-api.version>2.1.SP2</quarkus-spring-data-api.version>
<quarkus-spring-security-api.version>5.2.Final</quarkus-spring-security-api.version>
<quarkus-spring-boot-api.version>2.1.SP1</quarkus-spring-boot-api.version>
<htmlunit.version>2.40.0</htmlunit.version>
<mockito.version>3.11.2</mockito.version>
<jna.version>5.3.1</jna.version><!-- should satisfy both testcontainers and mongodb -->
<antlr.version>4.8</antlr.version>
Expand Down Expand Up @@ -2926,11 +2922,6 @@
<artifactId>rxjava</artifactId>
<version>${rxjava.version}</version>
</dependency>
<dependency>
<groupId>io.reactivex</groupId>
<artifactId>rxjava</artifactId>
<version>${rxjava1.version}</version>
</dependency>
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-api</artifactId>
Expand Down Expand Up @@ -3684,11 +3675,6 @@
<artifactId>assertj-core</artifactId>
<version>${assertj.version}</version>
</dependency>
<dependency>
<groupId>org.subethamail</groupId>
<artifactId>subethasmtp</artifactId>
<version>${subethasmtp.version}</version>
</dependency>

<dependency>
<groupId>org.mongodb</groupId>
Expand Down Expand Up @@ -3721,11 +3707,6 @@
<artifactId>mongodb-crypt</artifactId>
<version>${mongo-crypt.version}</version>
</dependency>
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
<version>${json-smart.version}</version>
</dependency>
<dependency>
<!-- Solves version conflicts -->
<!-- (1) between de.flapdoodle.embed.mongo and mongodb-crypt and -->
Expand Down Expand Up @@ -4453,21 +4434,6 @@
<version>${jacoco.version}</version>
<classifier>runtime</classifier>
</dependency>
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
<version>${htmlunit.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.smallrye.reactive</groupId>
<artifactId>smallrye-mutiny-vertx-core</artifactId>
Expand Down
31 changes: 26 additions & 5 deletions bom/test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,27 @@
<description>Dependency management for integration tests. Importable by third party extension developers.</description>

<properties>
<testcontainers.version>1.15.3</testcontainers.version>
<rxjava1.version>1.3.8</rxjava1.version>
<strimzi-test-container.version>0.22.1</strimzi-test-container.version>
</properties>

<dependencyManagement>
<dependencies>

<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers-bom</artifactId>
<version>${testcontainers.version}</version>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>io.reactivex</groupId>
<artifactId>rxjava</artifactId>
<version>${rxjava1.version}</version>
</dependency>

<dependency>
<groupId>io.strimzi</groupId>
<artifactId>strimzi-test-container</artifactId>
Expand All @@ -46,7 +53,21 @@
</exclusion>
</exclusions>
</dependency>

</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bom</artifactId>
<type>pom</type>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</project>
28 changes: 26 additions & 2 deletions build-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@
what we work with by self downloading it: -->
<graal-sdk.version-for-documentation>21.1.0</graal-sdk.version-for-documentation>
<mandrel.version-for-documentation>21.0</mandrel.version-for-documentation>
<rest-assured.version>4.3.2</rest-assured.version>
<mutiny-client.version>1.1.0</mutiny-client.version>

<htmlunit.version>2.40.0</htmlunit.version>
<subethasmtp.version>3.1.7</subethasmtp.version>

<!-- Dev tools -->
<freemarker.version>2.3.31</freemarker.version>
Expand Down Expand Up @@ -283,6 +284,22 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
<version>${htmlunit.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Webjars for UI related -->
<dependency>
<groupId>org.webjars</groupId>
Expand All @@ -299,6 +316,13 @@
<artifactId>jquery</artifactId>
<version>${webjar.jquery.version}</version>
</dependency>

<dependency>
<groupId>org.subethamail</groupId>
<artifactId>subethasmtp</artifactId>
<version>${subethasmtp.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down