Skip to content

Commit 5f9befd

Browse files
dkapilchaos2418
dkapil
and
chaos2418
authored
* Java 3590 (eugenp#11367) * JAVA-3590: updating junit-jupiter dependency in the main pom.xml * resolving unnecessary mockito stubbings exception * adding junit-bom in dependency management * fixing tests which were not getting discovered * Revert "fixing tests which were not getting discovered" This reverts commit 2e9ed8d. * fixing tests in ninja, open-liberty and spring-ejb * removing junit4 dependency and replacing it with junit-vintage-engine * removing junit4 dependency and replacing it with junit-vintage-engine in testing-modules, maven-modules and aws-lambda * removing junit dependency and replacing it with junit-vintage-engine * removing junit and replacing it with junit-vintage-engine * fixing tests that were not getting discovered due to old version of junit:junit * updated failsafe plugin configuration to skip integration tests in blade * fixing tests that were not getting discovered due to old version of junit:junit * fixing tests in libraries and libraries-2 modules Co-authored-by: chaos2418 <> * Java 3590 - fixing integration tests in restx and spring-5-webflux (eugenp#11382) * JAVA-3590: updating junit-jupiter dependency in the main pom.xml * resolving unnecessary mockito stubbings exception * adding junit-bom in dependency management * fixing tests which were not getting discovered * Revert "fixing tests which were not getting discovered" This reverts commit 2e9ed8d. * fixing tests in ninja, open-liberty and spring-ejb * removing junit4 dependency and replacing it with junit-vintage-engine * removing junit4 dependency and replacing it with junit-vintage-engine in testing-modules, maven-modules and aws-lambda * removing junit dependency and replacing it with junit-vintage-engine * removing junit and replacing it with junit-vintage-engine * fixing tests that were not getting discovered due to old version of junit:junit * updated failsafe plugin configuration to skip integration tests in blade * fixing tests that were not getting discovered due to old version of junit:junit * fixing tests in libraries and libraries-2 modules * fixing integration tests in restx and spring-5-webflux Co-authored-by: chaos2418 <> Co-authored-by: chaos2418 <[email protected]>
1 parent 3b80d77 commit 5f9befd

File tree

111 files changed

+531
-371
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+531
-371
lines changed

‎algorithms-miscellaneous-5/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>org.junit.platform</groupId>
3939
<artifactId>junit-platform-commons</artifactId>
40-
<version>${junit.platform.version}</version>
40+
<version>${junit-platform.version}</version>
4141
</dependency>
4242
<dependency>
4343
<groupId>org.assertj</groupId>
@@ -53,7 +53,6 @@
5353
<commons-codec.version>1.11</commons-codec.version>
5454
<commons-math3.version>3.6.1</commons-math3.version>
5555
<guava.version>28.1-jre</guava.version>
56-
<junit.platform.version>1.6.0</junit.platform.version>
5756
</properties>
5857

5958
</project>

‎algorithms-miscellaneous-6/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<dependency>
2323
<groupId>org.junit.platform</groupId>
2424
<artifactId>junit-platform-commons</artifactId>
25-
<version>${junit.platform.version}</version>
25+
<version>${junit-platform.version}</version>
2626
</dependency>
2727
<dependency>
2828
<groupId>org.assertj</groupId>
@@ -46,7 +46,6 @@
4646
<properties>
4747
<guava.version>28.1-jre</guava.version>
4848
<org.assertj.core.version>3.9.0</org.assertj.core.version>
49-
<junit.platform.version>1.6.0</junit.platform.version>
5049
<commons-math3.version>3.6.1</commons-math3.version>
5150
</properties>
5251

‎algorithms-sorting-2/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<dependency>
3333
<groupId>org.junit.jupiter</groupId>
3434
<artifactId>junit-jupiter-api</artifactId>
35-
<version>${junit-jupiter-api.version}</version>
35+
<version>${junit-jupiter.version}</version>
3636
<scope>test</scope>
3737
</dependency>
3838
<dependency>
@@ -47,7 +47,6 @@
4747
<commons-math3.version>3.6.1</commons-math3.version>
4848
<org.assertj.core.version>3.9.0</org.assertj.core.version>
4949
<commons-codec.version>1.11</commons-codec.version>
50-
<junit-jupiter-api.version>5.3.1</junit-jupiter-api.version>
5150
</properties>
5251

5352
</project>

‎algorithms-sorting/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<dependency>
3434
<groupId>org.junit.jupiter</groupId>
3535
<artifactId>junit-jupiter-api</artifactId>
36-
<version>${junit-jupiter-api.version}</version>
36+
<version>${junit-jupiter.version}</version>
3737
<scope>test</scope>
3838
</dependency>
3939
<dependency>
@@ -48,7 +48,6 @@
4848
<commons-math3.version>3.6.1</commons-math3.version>
4949
<org.assertj.core.version>3.9.0</org.assertj.core.version>
5050
<commons-codec.version>1.11</commons-codec.version>
51-
<junit-jupiter-api.version>5.3.1</junit-jupiter-api.version>
5251
</properties>
5352

5453
</project>

‎apache-shiro/pom.xml

-4
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@
3939
<scope>runtime</scope>
4040
</dependency>
4141
<!-- spring-sec -->
42-
<dependency>
43-
<groupId>org.springframework.boot</groupId>
44-
<artifactId>spring-boot-starter-web</artifactId>
45-
</dependency>
4642
<dependency>
4743
<groupId>org.springframework.boot</groupId>
4844
<artifactId>spring-boot-starter-security</artifactId>

‎atomikos/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@
7272
<version>${derby.version}</version>
7373
</dependency>
7474
<dependency>
75-
<groupId>junit</groupId>
76-
<artifactId>junit</artifactId>
77-
<version>${junit.version}</version>
75+
<groupId>org.junit.vintage</groupId>
76+
<artifactId>junit-vintage-engine</artifactId>
77+
<version>${junit-jupiter.version}</version>
7878
<scope>test</scope>
7979
</dependency>
8080
<!-- the JTA API -->

‎aws-lambda/lambda/pom.xml

+7
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,13 @@
6262
<groupId>com.googlecode.json-simple</groupId>
6363
<artifactId>json-simple</artifactId>
6464
<version>${json-simple.version}</version>
65+
<exclusions>
66+
<!-- junit4 dependency is excluded as it should to be resolved from junit-vintage-engine included in parent-modules. -->
67+
<exclusion>
68+
<groupId>junit</groupId>
69+
<artifactId>junit</artifactId>
70+
</exclusion>
71+
</exclusions>
6572
</dependency>
6673
</dependencies>
6774

‎aws-lambda/shipping-tracker/ShippingFunction/pom.xml

+8-10
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,17 @@
1212
<dependency>
1313
<groupId>com.amazonaws</groupId>
1414
<artifactId>aws-lambda-java-core</artifactId>
15-
<version>1.2.0</version>
15+
<version>${aws-lambda-java-core.version}</version>
1616
</dependency>
1717
<dependency>
1818
<groupId>com.amazonaws</groupId>
1919
<artifactId>aws-lambda-java-events</artifactId>
20-
<version>3.1.0</version>
20+
<version>${aws-lambda-java-events.version}</version>
2121
</dependency>
2222
<dependency>
2323
<groupId>com.fasterxml.jackson.core</groupId>
2424
<artifactId>jackson-databind</artifactId>
25-
<version>2.11.2</version>
26-
</dependency>
27-
<dependency>
28-
<groupId>junit</groupId>
29-
<artifactId>junit</artifactId>
30-
<version>4.12</version>
31-
<scope>test</scope>
25+
<version>${jackson-databind.version}</version>
3226
</dependency>
3327
<dependency>
3428
<groupId>org.hibernate</groupId>
@@ -43,7 +37,7 @@
4337
<dependency>
4438
<groupId>org.postgresql</groupId>
4539
<artifactId>postgresql</artifactId>
46-
<version>42.2.16</version>
40+
<version>${postgresql.version}</version>
4741
</dependency>
4842
</dependencies>
4943

@@ -71,6 +65,10 @@
7165
<maven.compiler.source>1.8</maven.compiler.source>
7266
<maven.compiler.target>1.8</maven.compiler.target>
7367
<hibernate.version>5.4.21.Final</hibernate.version>
68+
<aws-lambda-java-core.version>1.2.0</aws-lambda-java-core.version>
69+
<aws-lambda-java-events.version>3.1.0</aws-lambda-java-events.version>
70+
<jackson-databind.version>2.11.2</jackson-databind.version>
71+
<postgresql.version>42.2.16</postgresql.version>
7472
</properties>
7573

7674
</project>

‎aws-lambda/todo-reminder/ToDoFunction/pom.xml

+26-15
Original file line numberDiff line numberDiff line change
@@ -12,70 +12,70 @@
1212
<dependency>
1313
<groupId>com.amazonaws</groupId>
1414
<artifactId>aws-lambda-java-core</artifactId>
15-
<version>1.2.1</version>
15+
<version>${aws-lambda-java-core.version}</version>
1616
</dependency>
1717
<dependency>
1818
<groupId>com.amazonaws</groupId>
1919
<artifactId>aws-lambda-java-events</artifactId>
20-
<version>3.6.0</version>
20+
<version>${aws-lambda-java-events.version}</version>
2121
</dependency>
2222
<dependency>
2323
<groupId>uk.org.webcompere</groupId>
2424
<artifactId>lightweight-config</artifactId>
25-
<version>1.1.0</version>
25+
<version>${lightweight-config.version}</version>
2626
</dependency>
2727
<dependency>
2828
<groupId>com.amazonaws</groupId>
2929
<artifactId>aws-lambda-java-log4j2</artifactId>
30-
<version>1.2.0</version>
30+
<version>${aws-lambda-java-log4j2.version}</version>
3131
</dependency>
3232
<dependency>
3333
<groupId>org.apache.logging.log4j</groupId>
3434
<artifactId>log4j-slf4j-impl</artifactId>
35-
<version>2.13.2</version>
35+
<version>${log4j-slf4j-impl.version}</version>
3636
</dependency>
3737
<dependency>
3838
<groupId>io.github.openfeign</groupId>
3939
<artifactId>feign-core</artifactId>
40-
<version>11.2</version>
40+
<version>${feign-core.version}</version>
4141
</dependency>
4242
<dependency>
4343
<groupId>io.github.openfeign</groupId>
4444
<artifactId>feign-slf4j</artifactId>
45-
<version>11.2</version>
45+
<version>${feign-core.version}</version>
4646
</dependency>
4747
<dependency>
4848
<groupId>io.github.openfeign</groupId>
4949
<artifactId>feign-gson</artifactId>
50-
<version>11.2</version>
50+
<version>${feign-core.version}</version>
5151
</dependency>
5252
<dependency>
5353
<groupId>com.google.inject</groupId>
5454
<artifactId>guice</artifactId>
55-
<version>5.0.1</version>
55+
<version>${guice.version}</version>
5656
</dependency>
5757
<dependency>
58-
<groupId>junit</groupId>
59-
<artifactId>junit</artifactId>
60-
<version>4.13.1</version>
58+
<groupId>org.junit.vintage</groupId>
59+
<artifactId>junit-vintage-engine</artifactId>
60+
<version>${junit-jupiter.version}</version>
6161
<scope>test</scope>
6262
</dependency>
6363
<dependency>
6464
<groupId>uk.org.webcompere</groupId>
6565
<artifactId>system-stubs-junit4</artifactId>
66-
<version>1.2.0</version>
66+
<version>${system-stubs-junit4.version}</version>
6767
<scope>test</scope>
6868
</dependency>
6969
<dependency>
7070
<groupId>org.mockito</groupId>
7171
<artifactId>mockito-core</artifactId>
72-
<version>3.3.0</version>
72+
<version>${mockito-core.version}</version>
7373
<scope>test</scope>
7474
</dependency>
7575
<dependency>
7676
<groupId>org.assertj</groupId>
7777
<artifactId>assertj-core</artifactId>
78-
<version>3.19.0</version>
78+
<version>${assertj-core.version}</version>
7979
<scope>test</scope>
8080
</dependency>
8181
</dependencies>
@@ -103,6 +103,17 @@
103103
<properties>
104104
<maven.compiler.source>1.8</maven.compiler.source>
105105
<maven.compiler.target>1.8</maven.compiler.target>
106+
<aws-lambda-java-core.version>1.2.1</aws-lambda-java-core.version>
107+
<aws-lambda-java-events.version>3.6.0</aws-lambda-java-events.version>
108+
<lightweight-config.version>1.1.0</lightweight-config.version>
109+
<aws-lambda-java-log4j2.version>1.2.0</aws-lambda-java-log4j2.version>
110+
<log4j-slf4j-impl.version>2.13.2</log4j-slf4j-impl.version>
111+
<feign-core.version>11.2</feign-core.version>
112+
<guice.version>5.0.1</guice.version>
113+
<system-stubs-junit4.version>1.2.0</system-stubs-junit4.version>
114+
<mockito-core.version>3.3.0</mockito-core.version>
115+
<assertj-core.version>3.19.0</assertj-core.version>
116+
<junit-jupiter.version>5.8.1</junit-jupiter.version>
106117
</properties>
107118

108119
</project>

‎blade/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
<artifactId>maven-failsafe-plugin</artifactId>
7171
<version>${maven-failsafe-plugin.version}</version>
7272
<configuration>
73+
<skipITs>true</skipITs>
7374
<includes>
7475
<include>**/*LiveTest.java</include>
7576
</includes>

‎core-groovy-2/gmavenplus-pom.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<dependency>
3434
<groupId>org.junit.platform</groupId>
3535
<artifactId>junit-platform-runner</artifactId>
36-
<version>${junit.platform.version}</version>
36+
<version>${junit-platform.version}</version>
3737
<scope>test</scope>
3838
</dependency>
3939
<dependency>
@@ -95,7 +95,7 @@
9595
<dependency>
9696
<groupId>org.junit.platform</groupId>
9797
<artifactId>junit-platform-surefire-provider</artifactId>
98-
<version>${junit.platform.version}</version>
98+
<version>${junit-platform-surefire-provider.version}</version>
9999
</dependency>
100100
</dependencies>
101101
<executions>
@@ -165,7 +165,6 @@
165165

166166
<properties>
167167
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
168-
<junit.platform.version>1.0.0</junit.platform.version>
169168
<hsqldb.version>2.4.0</hsqldb.version>
170169
<spock-core.version>1.1-groovy-2.4</spock-core.version>
171170
<commons-lang3.version>3.9</commons-lang3.version>

‎core-groovy-2/pom.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<dependency>
3535
<groupId>org.junit.platform</groupId>
3636
<artifactId>junit-platform-runner</artifactId>
37-
<version>${junit.platform.version}</version>
37+
<version>${junit-platform.version}</version>
3838
<scope>test</scope>
3939
</dependency>
4040
<dependency>
@@ -94,7 +94,7 @@
9494
<dependency>
9595
<groupId>org.junit.platform</groupId>
9696
<artifactId>junit-platform-surefire-provider</artifactId>
97-
<version>${junit.platform.version}</version>
97+
<version>${junit-platform-surefire-provider.version}</version>
9898
</dependency>
9999
</dependencies>
100100
<executions>
@@ -162,7 +162,6 @@
162162
</repositories>
163163

164164
<properties>
165-
<junit.platform.version>1.0.0</junit.platform.version>
166165
<hsqldb.version>2.4.0</hsqldb.version>
167166
<spock-core.version>1.1-groovy-2.4</spock-core.version>
168167
<groovy-wslite.version>1.1.3</groovy-wslite.version>

‎core-groovy-collections/pom.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>org.junit.platform</groupId>
4141
<artifactId>junit-platform-runner</artifactId>
42-
<version>${junit.platform.version}</version>
42+
<version>${junit-platform.version}</version>
4343
<scope>test</scope>
4444
</dependency>
4545
<dependency>
@@ -80,7 +80,7 @@
8080
<dependency>
8181
<groupId>org.junit.platform</groupId>
8282
<artifactId>junit-platform-surefire-provider</artifactId>
83-
<version>${junit.platform.version}</version>
83+
<version>${junit-platform-surefire-provider.version}</version>
8484
</dependency>
8585
</dependencies>
8686
<executions>
@@ -119,7 +119,6 @@
119119
</repositories>
120120

121121
<properties>
122-
<junit.platform.version>1.0.0</junit.platform.version>
123122
<groovy.version>2.5.6</groovy.version>
124123
<groovy-all.version>2.5.6</groovy-all.version>
125124
<groovy-sql.version>2.5.6</groovy-sql.version>

‎core-groovy-strings/pom.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>org.junit.platform</groupId>
4141
<artifactId>junit-platform-runner</artifactId>
42-
<version>${junit.platform.version}</version>
42+
<version>${junit-platform.version}</version>
4343
<scope>test</scope>
4444
</dependency>
4545
<dependency>
@@ -80,7 +80,7 @@
8080
<dependency>
8181
<groupId>org.junit.platform</groupId>
8282
<artifactId>junit-platform-surefire-provider</artifactId>
83-
<version>${junit.platform.version}</version>
83+
<version>${junit-platform-surefire-provider.version}</version>
8484
</dependency>
8585
</dependencies>
8686
<executions>
@@ -109,7 +109,6 @@
109109
</repositories>
110110

111111
<properties>
112-
<junit.platform.version>1.0.0</junit.platform.version>
113112
<groovy.version>2.5.6</groovy.version>
114113
<groovy-all.version>2.5.6</groovy-all.version>
115114
<groovy-sql.version>2.5.6</groovy-sql.version>

‎core-groovy/pom.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>org.junit.platform</groupId>
4141
<artifactId>junit-platform-runner</artifactId>
42-
<version>${junit.platform.version}</version>
42+
<version>${junit-platform.version}</version>
4343
<scope>test</scope>
4444
</dependency>
4545
<dependency>
@@ -80,7 +80,7 @@
8080
<dependency>
8181
<groupId>org.junit.platform</groupId>
8282
<artifactId>junit-platform-surefire-provider</artifactId>
83-
<version>${junit.platform.version}</version>
83+
<version>${junit-platform-surefire-provider.version}</version>
8484
</dependency>
8585
</dependencies>
8686
<executions>
@@ -109,7 +109,6 @@
109109
</repositories>
110110

111111
<properties>
112-
<junit.platform.version>1.0.0</junit.platform.version>
113112
<groovy.version>2.5.6</groovy.version>
114113
<groovy-all.version>2.5.6</groovy-all.version>
115114
<groovy-sql.version>2.5.6</groovy-sql.version>

0 commit comments

Comments
 (0)