Java 3590 (eugenp#11367) (eugenp#11380)

* 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]>
zdougherty-softwarfare · Oct 29, 2021 · 5f9befd · 5f9befd
1 parent 3b80d77
commit 5f9befd
Show file tree

Hide file tree

Showing 111 changed files with 531 additions and 371 deletions.
diff --git a/algorithms-miscellaneous-5/pom.xml b/algorithms-miscellaneous-5/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-commons</artifactId>
-            <version>${junit.platform.version}</version>
+            <version>${junit-platform.version}</version>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
@@ -53,7 +53,6 @@
         <commons-codec.version>1.11</commons-codec.version>
         <commons-math3.version>3.6.1</commons-math3.version>
         <guava.version>28.1-jre</guava.version>
-        <junit.platform.version>1.6.0</junit.platform.version>
     </properties>
 
 </project>
diff --git a/algorithms-miscellaneous-6/pom.xml b/algorithms-miscellaneous-6/pom.xml
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-commons</artifactId>
-            <version>${junit.platform.version}</version>
+            <version>${junit-platform.version}</version>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
@@ -46,7 +46,6 @@
     <properties>
         <guava.version>28.1-jre</guava.version>
         <org.assertj.core.version>3.9.0</org.assertj.core.version>
-        <junit.platform.version>1.6.0</junit.platform.version>
         <commons-math3.version>3.6.1</commons-math3.version>
     </properties>
 

diff --git a/algorithms-sorting-2/pom.xml b/algorithms-sorting-2/pom.xml
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>${junit-jupiter-api.version}</version>
+            <version>${junit-jupiter.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -47,7 +47,6 @@
         <commons-math3.version>3.6.1</commons-math3.version>
         <org.assertj.core.version>3.9.0</org.assertj.core.version>
         <commons-codec.version>1.11</commons-codec.version>
-        <junit-jupiter-api.version>5.3.1</junit-jupiter-api.version>
     </properties>
 
 </project>
diff --git a/algorithms-sorting/pom.xml b/algorithms-sorting/pom.xml
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>${junit-jupiter-api.version}</version>
+            <version>${junit-jupiter.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -48,7 +48,6 @@
         <commons-math3.version>3.6.1</commons-math3.version>
         <org.assertj.core.version>3.9.0</org.assertj.core.version>
         <commons-codec.version>1.11</commons-codec.version>
-        <junit-jupiter-api.version>5.3.1</junit-jupiter-api.version>
     </properties>
 
 </project>
diff --git a/apache-shiro/pom.xml b/apache-shiro/pom.xml
@@ -39,10 +39,6 @@
             <scope>runtime</scope>
         </dependency>
         <!-- spring-sec -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>

diff --git a/atomikos/pom.xml b/atomikos/pom.xml
@@ -72,9 +72,9 @@
             <version>${derby.version}</version>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <version>${junit-jupiter.version}</version>
             <scope>test</scope>
         </dependency>
         <!-- the JTA API -->

diff --git a/aws-lambda/lambda/pom.xml b/aws-lambda/lambda/pom.xml
@@ -62,6 +62,13 @@
             <groupId>com.googlecode.json-simple</groupId>
             <artifactId>json-simple</artifactId>
             <version>${json-simple.version}</version>
+            <exclusions>
+                <!-- junit4 dependency is excluded as it should to be resolved from junit-vintage-engine included in parent-modules. -->
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 

diff --git a/aws-lambda/shipping-tracker/ShippingFunction/pom.xml b/aws-lambda/shipping-tracker/ShippingFunction/pom.xml
@@ -12,23 +12,17 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-core</artifactId>
-            <version>1.2.0</version>
+            <version>${aws-lambda-java-core.version}</version>
         </dependency>
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-events</artifactId>
-            <version>3.1.0</version>
+            <version>${aws-lambda-java-events.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.11.2</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
+            <version>${jackson-databind.version}</version>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
@@ -43,7 +37,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.2.16</version>
+            <version>${postgresql.version}</version>
         </dependency>
     </dependencies>
 
@@ -71,6 +65,10 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <hibernate.version>5.4.21.Final</hibernate.version>
+        <aws-lambda-java-core.version>1.2.0</aws-lambda-java-core.version>
+        <aws-lambda-java-events.version>3.1.0</aws-lambda-java-events.version>
+        <jackson-databind.version>2.11.2</jackson-databind.version>
+        <postgresql.version>42.2.16</postgresql.version>
     </properties>
 
 </project>
diff --git a/aws-lambda/todo-reminder/ToDoFunction/pom.xml b/aws-lambda/todo-reminder/ToDoFunction/pom.xml
@@ -12,70 +12,70 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-core</artifactId>
-            <version>1.2.1</version>
+            <version>${aws-lambda-java-core.version}</version>
         </dependency>
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-events</artifactId>
-            <version>3.6.0</version>
+            <version>${aws-lambda-java-events.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.org.webcompere</groupId>
             <artifactId>lightweight-config</artifactId>
-            <version>1.1.0</version>
+            <version>${lightweight-config.version}</version>
         </dependency>
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-log4j2</artifactId>
-            <version>1.2.0</version>
+            <version>${aws-lambda-java-log4j2.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.13.2</version>
+            <version>${log4j-slf4j-impl.version}</version>
         </dependency>
         <dependency>
             <groupId>io.github.openfeign</groupId>
             <artifactId>feign-core</artifactId>
-            <version>11.2</version>
+            <version>${feign-core.version}</version>
         </dependency>
         <dependency>
             <groupId>io.github.openfeign</groupId>
             <artifactId>feign-slf4j</artifactId>
-            <version>11.2</version>
+            <version>${feign-core.version}</version>
         </dependency>
         <dependency>
             <groupId>io.github.openfeign</groupId>
             <artifactId>feign-gson</artifactId>
-            <version>11.2</version>
+            <version>${feign-core.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
-            <version>5.0.1</version>
+            <version>${guice.version}</version>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.1</version>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <version>${junit-jupiter.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>uk.org.webcompere</groupId>
             <artifactId>system-stubs-junit4</artifactId>
-            <version>1.2.0</version>
+            <version>${system-stubs-junit4.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>3.3.0</version>
+            <version>${mockito-core.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.19.0</version>
+            <version>${assertj-core.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -103,6 +103,17 @@
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
+        <aws-lambda-java-core.version>1.2.1</aws-lambda-java-core.version>
+        <aws-lambda-java-events.version>3.6.0</aws-lambda-java-events.version>
+        <lightweight-config.version>1.1.0</lightweight-config.version>
+        <aws-lambda-java-log4j2.version>1.2.0</aws-lambda-java-log4j2.version>
+        <log4j-slf4j-impl.version>2.13.2</log4j-slf4j-impl.version>
+        <feign-core.version>11.2</feign-core.version>
+        <guice.version>5.0.1</guice.version>
+        <system-stubs-junit4.version>1.2.0</system-stubs-junit4.version>
+        <mockito-core.version>3.3.0</mockito-core.version>
+        <assertj-core.version>3.19.0</assertj-core.version>
+        <junit-jupiter.version>5.8.1</junit-jupiter.version>
     </properties>
 
 </project>
diff --git a/blade/pom.xml b/blade/pom.xml
@@ -70,6 +70,7 @@
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <version>${maven-failsafe-plugin.version}</version>
                 <configuration>
+                    <skipITs>true</skipITs>
                     <includes>
                         <include>**/*LiveTest.java</include>
                     </includes>

diff --git a/core-groovy-2/gmavenplus-pom.xml b/core-groovy-2/gmavenplus-pom.xml
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-runner</artifactId>
-            <version>${junit.platform.version}</version>
+            <version>${junit-platform.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -95,7 +95,7 @@
                     <dependency>
                         <groupId>org.junit.platform</groupId>
                         <artifactId>junit-platform-surefire-provider</artifactId>
-                        <version>${junit.platform.version}</version>
+                        <version>${junit-platform-surefire-provider.version}</version>
                     </dependency>
                 </dependencies>
                 <executions>
@@ -165,7 +165,6 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <junit.platform.version>1.0.0</junit.platform.version>
         <hsqldb.version>2.4.0</hsqldb.version>
         <spock-core.version>1.1-groovy-2.4</spock-core.version>
         <commons-lang3.version>3.9</commons-lang3.version>

diff --git a/core-groovy-2/pom.xml b/core-groovy-2/pom.xml
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-runner</artifactId>
-            <version>${junit.platform.version}</version>
+            <version>${junit-platform.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -94,7 +94,7 @@
                     <dependency>
                         <groupId>org.junit.platform</groupId>
                         <artifactId>junit-platform-surefire-provider</artifactId>
-                        <version>${junit.platform.version}</version>
+                        <version>${junit-platform-surefire-provider.version}</version>
                     </dependency>
                 </dependencies>
                 <executions>
@@ -162,7 +162,6 @@
     </repositories>
 
     <properties>
-        <junit.platform.version>1.0.0</junit.platform.version>
         <hsqldb.version>2.4.0</hsqldb.version>
         <spock-core.version>1.1-groovy-2.4</spock-core.version>
         <groovy-wslite.version>1.1.3</groovy-wslite.version>

diff --git a/core-groovy-collections/pom.xml b/core-groovy-collections/pom.xml
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-runner</artifactId>
-            <version>${junit.platform.version}</version>
+            <version>${junit-platform.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -80,7 +80,7 @@
                     <dependency>
                         <groupId>org.junit.platform</groupId>
                         <artifactId>junit-platform-surefire-provider</artifactId>
-                        <version>${junit.platform.version}</version>
+                        <version>${junit-platform-surefire-provider.version}</version>
                     </dependency>
                 </dependencies>
                 <executions>
@@ -119,7 +119,6 @@
     </repositories>
 
     <properties>
-        <junit.platform.version>1.0.0</junit.platform.version>
         <groovy.version>2.5.6</groovy.version>
         <groovy-all.version>2.5.6</groovy-all.version>
         <groovy-sql.version>2.5.6</groovy-sql.version>

diff --git a/core-groovy-strings/pom.xml b/core-groovy-strings/pom.xml
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-runner</artifactId>
-            <version>${junit.platform.version}</version>
+            <version>${junit-platform.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -80,7 +80,7 @@
                     <dependency>
                         <groupId>org.junit.platform</groupId>
                         <artifactId>junit-platform-surefire-provider</artifactId>
-                        <version>${junit.platform.version}</version>
+                        <version>${junit-platform-surefire-provider.version}</version>
                     </dependency>
                 </dependencies>
                 <executions>
@@ -109,7 +109,6 @@
     </repositories>
 
     <properties>
-        <junit.platform.version>1.0.0</junit.platform.version>
         <groovy.version>2.5.6</groovy.version>
         <groovy-all.version>2.5.6</groovy-all.version>
         <groovy-sql.version>2.5.6</groovy-sql.version>

diff --git a/core-groovy/pom.xml b/core-groovy/pom.xml
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-runner</artifactId>
-            <version>${junit.platform.version}</version>
+            <version>${junit-platform.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -80,7 +80,7 @@
                     <dependency>
                         <groupId>org.junit.platform</groupId>
                         <artifactId>junit-platform-surefire-provider</artifactId>
-                        <version>${junit.platform.version}</version>
+                        <version>${junit-platform-surefire-provider.version}</version>
                     </dependency>
                 </dependencies>
                 <executions>
@@ -109,7 +109,6 @@
     </repositories>
 
     <properties>
-        <junit.platform.version>1.0.0</junit.platform.version>
         <groovy.version>2.5.6</groovy.version>
         <groovy-all.version>2.5.6</groovy-all.version>
         <groovy-sql.version>2.5.6</groovy-sql.version>