Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use bom for junit with upgrade to 5.7.2 and testcontainer dependencies (#6532) 

* use bom for junit and testcontainer dependencies

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>

* remove some duplicate and redundant dependencies declaration as we now have the bom

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
This commit is contained in:
Olivier Lamy 2021-07-25 21:23:57 +10:00 committed by GitHub
parent c9a5d8df58
commit 41481669af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pom.xml
View File

@ -37,7 +37,7 @@
<jmh.version>1.26</jmh.version> <jmh.version>1.26</jmh.version>
<jmhjar.name>benchmarks</jmhjar.name> <jmhjar.name>benchmarks</jmhjar.name>
<tycho-version>2.1.0</tycho-version> <tycho-version>2.1.0</tycho-version>
<junit.version>5.7.0</junit.version> <junit.version>5.7.2</junit.version>
<maven.version>3.6.3</maven.version> <maven.version>3.6.3</maven.version>
<maven.resolver.version>1.6.1</maven.resolver.version> <maven.resolver.version>1.6.1</maven.resolver.version>
<weld.version>3.1.8.Final</weld.version> <weld.version>3.1.8.Final</weld.version>
@ -1117,9 +1117,11 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit</groupId>
<artifactId>junit-jupiter</artifactId> <artifactId>junit-bom</artifactId>
<version>${junit.version}</version> <version>${junit.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency> </dependency>
<!-- Test Container Deps --> <!-- Test Container Deps -->
<dependency> <dependency>
@ -1129,13 +1131,10 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.testcontainers</groupId> <groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId> <artifactId>testcontainers-bom</artifactId>
<version>${testcontainers.version}</version>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${testcontainers.version}</version> <version>${testcontainers.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.java.dev.jna</groupId> <groupId>net.java.dev.jna</groupId>

1
tests/test-loginservice/pom.xml
View File

@ -50,7 +50,6 @@
<dependency> <dependency>
<groupId>org.testcontainers</groupId> <groupId>org.testcontainers</groupId>
<artifactId>mariadb</artifactId> <artifactId>mariadb</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

16
tests/test-sessions/pom.xml
View File

@ -9,22 +9,6 @@
<artifactId>test-sessions-parent</artifactId> <artifactId>test-sessions-parent</artifactId>
<name>Jetty Tests :: Sessions :: Parent</name> <name>Jetty Tests :: Sessions :: Parent</name>
<packaging>pom</packaging> <packaging>pom</packaging>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
<modules> <modules>
<module>test-sessions-common</module> <module>test-sessions-common</module>
<module>test-file-sessions</module> <module>test-file-sessions</module>

1
tests/test-sessions/test-gcloud-sessions/pom.xml
View File

@ -72,7 +72,6 @@
<dependency> <dependency>
<groupId>org.testcontainers</groupId> <groupId>org.testcontainers</groupId>
<artifactId>gcloud</artifactId> <artifactId>gcloud</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

1
tests/test-sessions/test-jdbc-sessions/pom.xml
View File

@ -81,7 +81,6 @@
<dependency> <dependency>
<groupId>org.testcontainers</groupId> <groupId>org.testcontainers</groupId>
<artifactId>mariadb</artifactId> <artifactId>mariadb</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>