From e27eb5b8eb1c072a0b029d6008814ea52e386aa1 Mon Sep 17 00:00:00 2001
From: chaos2418 <>
Date: Fri, 5 Nov 2021 14:31:19 +0530
Subject: [PATCH 1/3] JAVA-1672: removing redundant junit declarations

---
 algorithms-sorting-2/pom.xml                 |  6 ------
 algorithms-sorting/pom.xml                   |  6 ------
 atomikos/pom.xml                             |  6 ------
 google-web-toolkit/pom.xml                   |  6 ------
 grpc/pom.xml                                 |  6 ------
 json-2/pom.xml                               |  6 ------
 junit5/pom.xml                               | 17 +----------------
 libraries-data/pom.xml                       | 16 ++++++++++------
 libraries-server/pom.xml                     |  6 ------
 libraries/pom.xml                            |  6 ------
 maven-modules/maven-integration-test/pom.xml |  6 ------
 maven-modules/maven-properties/pom.xml       |  9 ---------
 micronaut/pom.xml                            |  6 ------
 persistence-modules/java-jpa-3/pom.xml       |  6 ------
 restx/pom.xml                                |  6 ------
 spring-ejb/ejb-beans/pom.xml                 |  6 ------
 tensorflow-java/pom.xml                      | 12 ------------
 xml/pom.xml                                  | 12 ------------
 18 files changed, 11 insertions(+), 133 deletions(-)

diff --git a/algorithms-sorting-2/pom.xml b/algorithms-sorting-2/pom.xml
index b673af9d70..c9bec354f3 100644
--- a/algorithms-sorting-2/pom.xml
+++ b/algorithms-sorting-2/pom.xml
@@ -29,12 +29,6 @@
             <version>${lombok.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-            <version>${junit-jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
diff --git a/algorithms-sorting/pom.xml b/algorithms-sorting/pom.xml
index b853fd80ee..e916d0aae5 100644
--- a/algorithms-sorting/pom.xml
+++ b/algorithms-sorting/pom.xml
@@ -30,12 +30,6 @@
             <version>${lombok.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-            <version>${junit-jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
diff --git a/atomikos/pom.xml b/atomikos/pom.xml
index cb10168c0d..cd798825d1 100644
--- a/atomikos/pom.xml
+++ b/atomikos/pom.xml
@@ -71,12 +71,6 @@
             <artifactId>derby</artifactId>
             <version>${derby.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <version>${junit-jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
         <!-- the JTA API -->
         <dependency>
             <groupId>javax.transaction</groupId>
diff --git a/google-web-toolkit/pom.xml b/google-web-toolkit/pom.xml
index 1a49ced021..bcccc136a4 100644
--- a/google-web-toolkit/pom.xml
+++ b/google-web-toolkit/pom.xml
@@ -44,12 +44,6 @@
             <artifactId>gwt-dev</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <version>${junit-jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/grpc/pom.xml b/grpc/pom.xml
index f034b2b517..6f0c3b5c91 100644
--- a/grpc/pom.xml
+++ b/grpc/pom.xml
@@ -37,12 +37,6 @@
 			<version>${io.grpc.version}</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.junit.vintage</groupId>
-			<artifactId>junit-vintage-engine</artifactId>
-			<version>${junit-jupiter.version}</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>javax.annotation</groupId>
 			<artifactId>javax.annotation-api</artifactId>
diff --git a/json-2/pom.xml b/json-2/pom.xml
index 53d67320ba..b4301c41e5 100644
--- a/json-2/pom.xml
+++ b/json-2/pom.xml
@@ -24,12 +24,6 @@
             <artifactId>jsoniter</artifactId>
             <version>${jsoniter.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <version>${junit-jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
diff --git a/junit5/pom.xml b/junit5/pom.xml
index b9804408a2..00b04ea292 100644
--- a/junit5/pom.xml
+++ b/junit5/pom.xml
@@ -8,8 +8,8 @@
     <name>junit5</name>
 
     <parent>
-        <artifactId>parent-modules</artifactId>
         <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
@@ -18,19 +18,4 @@
         <maven.compiler.target>8</maven.compiler.target>
     </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-            <version>5.8.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.8.1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
 </project>
\ No newline at end of file
diff --git a/libraries-data/pom.xml b/libraries-data/pom.xml
index 3db34709e7..dd48453a8c 100644
--- a/libraries-data/pom.xml
+++ b/libraries-data/pom.xml
@@ -14,12 +14,6 @@
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <version>${junit-jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka-streams</artifactId>
@@ -92,6 +86,10 @@
                     <groupId>commons-codec</groupId>
                     <artifactId>commons-codec</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -104,6 +102,12 @@
             <artifactId>flink-test-utils_2.11</artifactId>
             <version>${flink.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
diff --git a/libraries-server/pom.xml b/libraries-server/pom.xml
index a9c340b319..954f666785 100644
--- a/libraries-server/pom.xml
+++ b/libraries-server/pom.xml
@@ -61,12 +61,6 @@
             <artifactId>netty-all</artifactId>
             <version>${netty.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <version>${junit-jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
         <!-- tomcat -->
         <dependency>
             <groupId>org.apache.tomcat</groupId>
diff --git a/libraries/pom.xml b/libraries/pom.xml
index 4ecf82aa87..b2e429ff65 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -146,12 +146,6 @@
             <artifactId>jmh-core</artifactId>
             <version>${jmh-core.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <version>${junit-jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>info.debatty</groupId>
             <artifactId>java-lsh</artifactId>
diff --git a/maven-modules/maven-integration-test/pom.xml b/maven-modules/maven-integration-test/pom.xml
index 4283baf63b..01be0ad1a4 100644
--- a/maven-modules/maven-integration-test/pom.xml
+++ b/maven-modules/maven-integration-test/pom.xml
@@ -26,12 +26,6 @@
             <artifactId>jersey-hk2</artifactId>
             <version>${jersey.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <version>${junit-jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/maven-modules/maven-properties/pom.xml b/maven-modules/maven-properties/pom.xml
index b3169a7fb0..88e13a0fb8 100644
--- a/maven-modules/maven-properties/pom.xml
+++ b/maven-modules/maven-properties/pom.xml
@@ -14,15 +14,6 @@
         <relativePath>../..</relativePath>
     </parent>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <version>${junit-jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
     <build>
         <plugins>
             <plugin>
diff --git a/micronaut/pom.xml b/micronaut/pom.xml
index f36f565a94..019bd6ab29 100644
--- a/micronaut/pom.xml
+++ b/micronaut/pom.xml
@@ -64,12 +64,6 @@
             <version>${logback.version}</version>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <version>${junit-jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-core</artifactId>
diff --git a/persistence-modules/java-jpa-3/pom.xml b/persistence-modules/java-jpa-3/pom.xml
index ad649d58d8..0eb4b8075d 100644
--- a/persistence-modules/java-jpa-3/pom.xml
+++ b/persistence-modules/java-jpa-3/pom.xml
@@ -68,12 +68,6 @@
             <version>${assertj.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <version>${junit-jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>postgresql</artifactId>
diff --git a/restx/pom.xml b/restx/pom.xml
index ea9f927563..57736f60cd 100644
--- a/restx/pom.xml
+++ b/restx/pom.xml
@@ -113,12 +113,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <version>${junit-jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/spring-ejb/ejb-beans/pom.xml b/spring-ejb/ejb-beans/pom.xml
index 10bc6d3104..8a41da5448 100644
--- a/spring-ejb/ejb-beans/pom.xml
+++ b/spring-ejb/ejb-beans/pom.xml
@@ -80,12 +80,6 @@
             <artifactId>arquillian-junit-container</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <version>${junit-jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
         <!-- https://mvnrepository.com/artifact/joda-time/joda-time -->
         <dependency>
             <groupId>joda-time</groupId>
diff --git a/tensorflow-java/pom.xml b/tensorflow-java/pom.xml
index 2ac4d28a37..4dd86d45e3 100644
--- a/tensorflow-java/pom.xml
+++ b/tensorflow-java/pom.xml
@@ -21,18 +21,6 @@
             <artifactId>tensorflow</artifactId>
             <version>${tensorflow.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-            <version>${junit-jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit-jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/xml/pom.xml b/xml/pom.xml
index 6bae312452..f88f0f89b0 100644
--- a/xml/pom.xml
+++ b/xml/pom.xml
@@ -107,18 +107,6 @@
             <artifactId>commons-lang</artifactId>
             <version>${commons-lang.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <version>${junit-jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <version>${junit-jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>

From 0f8560ed36c7ff2586c0c580cfeb9311e8d70856 Mon Sep 17 00:00:00 2001
From: chaos2418 <>
Date: Fri, 5 Nov 2021 16:04:59 +0530
Subject: [PATCH 2/3] JAVA-1672: removing redundant junit-platform-commons
 declarations

---
 algorithms-miscellaneous-5/pom.xml      | 5 -----
 algorithms-miscellaneous-6/pom.xml      | 5 -----
 testing-modules/spring-testing/pom.xml  | 5 -----
 testing-modules/test-containers/pom.xml | 6 ------
 4 files changed, 21 deletions(-)

diff --git a/algorithms-miscellaneous-5/pom.xml b/algorithms-miscellaneous-5/pom.xml
index 32ecce58a6..c68ac96c38 100644
--- a/algorithms-miscellaneous-5/pom.xml
+++ b/algorithms-miscellaneous-5/pom.xml
@@ -34,11 +34,6 @@
             <artifactId>guava</artifactId>
             <version>${guava.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-commons</artifactId>
-            <version>${junit-platform.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
diff --git a/algorithms-miscellaneous-6/pom.xml b/algorithms-miscellaneous-6/pom.xml
index 6d5f211c8a..a9eb75cf1e 100644
--- a/algorithms-miscellaneous-6/pom.xml
+++ b/algorithms-miscellaneous-6/pom.xml
@@ -19,11 +19,6 @@
             <artifactId>guava</artifactId>
             <version>${guava.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-commons</artifactId>
-            <version>${junit-platform.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
diff --git a/testing-modules/spring-testing/pom.xml b/testing-modules/spring-testing/pom.xml
index ff5265eab8..08b56c9a1a 100644
--- a/testing-modules/spring-testing/pom.xml
+++ b/testing-modules/spring-testing/pom.xml
@@ -60,11 +60,6 @@
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-jpa</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-commons</artifactId>
-            <version>${junit-platform.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
diff --git a/testing-modules/test-containers/pom.xml b/testing-modules/test-containers/pom.xml
index aa2c85af21..687bc418ad 100644
--- a/testing-modules/test-containers/pom.xml
+++ b/testing-modules/test-containers/pom.xml
@@ -23,12 +23,6 @@
             <version>${junit-platform.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-commons</artifactId>
-            <version>${junit-platform.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>

From 073e3c1771b9774e6c6f9de16e761bdb5728c601 Mon Sep 17 00:00:00 2001
From: chaos2418 <>
Date: Fri, 5 Nov 2021 16:35:29 +0530
Subject: [PATCH 3/3] JAVA-1672: updating surefire version in main pom

---
 pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index f2a53f38b7..855cf54f0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1398,8 +1398,7 @@
         <logback.version>1.2.6</logback.version>
 
         <!-- plugins -->
-        <!-- can't upgrade the plugin yet; as there is an issue with 2.22 no longer running all the tests-->
-        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
         <java.version>1.8</java.version>