From 33890e34b0a29518e8f8a7b02b3325bff4052d4e Mon Sep 17 00:00:00 2001
From: chaos2418 <>
Date: Tue, 9 Nov 2021 22:12:33 +0530
Subject: [PATCH 1/2] JAVA-1673: removing junit and surefire configs from
 maven-modules

---
 .../maven-copy-files/copy-rename-maven-plugin/pom.xml      | 2 +-
 maven-modules/maven-copy-files/maven-antrun-plugin/pom.xml | 2 +-
 .../maven-copy-files/maven-resources-plugin/pom.xml        | 2 +-
 maven-modules/maven-copy-files/pom.xml                     | 2 +-
 maven-modules/maven-integration-test/pom.xml               | 7 +++----
 maven-modules/maven-multi-source/pom.xml                   | 3 +--
 maven-modules/maven-plugins/pom.xml                        | 5 ++---
 maven-modules/pom.xml                                      | 4 ----
 8 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/maven-modules/maven-copy-files/copy-rename-maven-plugin/pom.xml b/maven-modules/maven-copy-files/copy-rename-maven-plugin/pom.xml
index 6feb8284e6..06a44ed4fb 100644
--- a/maven-modules/maven-copy-files/copy-rename-maven-plugin/pom.xml
+++ b/maven-modules/maven-copy-files/copy-rename-maven-plugin/pom.xml
@@ -54,7 +54,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.22.1</version>
+                    <version>2.22.2</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-jar-plugin</artifactId>
diff --git a/maven-modules/maven-copy-files/maven-antrun-plugin/pom.xml b/maven-modules/maven-copy-files/maven-antrun-plugin/pom.xml
index 5168e0e965..b005f4b125 100644
--- a/maven-modules/maven-copy-files/maven-antrun-plugin/pom.xml
+++ b/maven-modules/maven-copy-files/maven-antrun-plugin/pom.xml
@@ -57,7 +57,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.22.1</version>
+                    <version>2.22.2</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-jar-plugin</artifactId>
diff --git a/maven-modules/maven-copy-files/maven-resources-plugin/pom.xml b/maven-modules/maven-copy-files/maven-resources-plugin/pom.xml
index 6829898b45..a49095f528 100644
--- a/maven-modules/maven-copy-files/maven-resources-plugin/pom.xml
+++ b/maven-modules/maven-copy-files/maven-resources-plugin/pom.xml
@@ -54,7 +54,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.22.1</version>
+                    <version>2.22.2</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-jar-plugin</artifactId>
diff --git a/maven-modules/maven-copy-files/pom.xml b/maven-modules/maven-copy-files/pom.xml
index 94bf952361..57d0ddf647 100644
--- a/maven-modules/maven-copy-files/pom.xml
+++ b/maven-modules/maven-copy-files/pom.xml
@@ -51,7 +51,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.22.1</version>
+                    <version>2.22.2</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-jar-plugin</artifactId>
diff --git a/maven-modules/maven-integration-test/pom.xml b/maven-modules/maven-integration-test/pom.xml
index 01be0ad1a4..56c243e3c5 100644
--- a/maven-modules/maven-integration-test/pom.xml
+++ b/maven-modules/maven-integration-test/pom.xml
@@ -86,8 +86,8 @@
                 </configuration>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven.surefire.version}</version>
                 <configuration>
                     <excludes>
                         <exclude>DataTest.java</exclude>
@@ -171,8 +171,8 @@
             <build>
                 <plugins>
                     <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <version>${maven.surefire.version}</version>
                         <configuration>
                             <excludes>
                                 <exclude>DataTest.java</exclude>
@@ -217,8 +217,8 @@
             <build>
                 <plugins>
                     <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <version>${maven.surefire.version}</version>
                         <executions>
                             <execution>
                                 <phase>integration-test</phase>
@@ -269,7 +269,6 @@
     <properties>
         <maven.resources.version>3.0.2</maven.resources.version>
         <maven.compiler.version>3.8.0</maven.compiler.version>
-        <maven.surefire.version>2.22.0</maven.surefire.version>
         <maven.failsafe.version>2.22.0</maven.failsafe.version>
         <maven.verifier.version>1.1</maven.verifier.version>
         <maven.clean.version>3.0.0</maven.clean.version>
diff --git a/maven-modules/maven-multi-source/pom.xml b/maven-modules/maven-multi-source/pom.xml
index 65e00419af..d9863b31a9 100644
--- a/maven-modules/maven-multi-source/pom.xml
+++ b/maven-modules/maven-multi-source/pom.xml
@@ -54,8 +54,8 @@
             <build>
                 <plugins>
                     <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <version>${maven.surefire.version}</version>
                         <executions>
                             <execution>
                                 <phase>integration-test</phase>
@@ -81,7 +81,6 @@
     <properties>
         <maven.resources.version>3.0.2</maven.resources.version>
         <maven.compiler.version>3.8.0</maven.compiler.version>
-        <maven.surefire.version>2.22.0</maven.surefire.version>
         <maven.failsafe.version>2.22.0</maven.failsafe.version>
         <maven.verifier.version>1.1</maven.verifier.version>
         <maven.clean.version>3.0.0</maven.clean.version>
diff --git a/maven-modules/maven-plugins/pom.xml b/maven-modules/maven-plugins/pom.xml
index 29b3b550ea..4aa295c8a8 100644
--- a/maven-modules/maven-plugins/pom.xml
+++ b/maven-modules/maven-plugins/pom.xml
@@ -84,8 +84,8 @@
             <build>
                 <plugins>
                     <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <version>${maven.surefire.version}</version>
                         <configuration>
                             <excludes>
                                 <exclude>DataTest.java</exclude>
@@ -105,8 +105,8 @@
             <build>
                 <plugins>
                     <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <version>${maven.surefire.version}</version>
                         <executions>
                             <execution>
                                 <phase>integration-test</phase>
@@ -132,7 +132,6 @@
     <properties>
         <maven.resources.version>3.0.2</maven.resources.version>
         <maven.compiler.version>3.8.0</maven.compiler.version>
-        <maven.surefire.version>2.22.0</maven.surefire.version>
         <maven.failsafe.version>2.22.0</maven.failsafe.version>
         <maven.verifier.version>1.1</maven.verifier.version>
         <maven.clean.version>3.0.0</maven.clean.version>
diff --git a/maven-modules/pom.xml b/maven-modules/pom.xml
index 0aadb873e5..3bd2c8b9ec 100644
--- a/maven-modules/pom.xml
+++ b/maven-modules/pom.xml
@@ -57,8 +57,4 @@
         </dependencies>
     </dependencyManagement>
 
-    <properties>
-        <junit-jupiter.version>5.8.1</junit-jupiter.version>
-    </properties>
-
 </project>
\ No newline at end of file

From 2acb6ff29132bbf62c650cd9c33d2b3219f201b9 Mon Sep 17 00:00:00 2001
From: chaos2418 <>
Date: Wed, 10 Nov 2021 09:36:41 +0530
Subject: [PATCH 2/2] JAVA-1673: updating surefire plugin in xml module

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

diff --git a/xml/pom.xml b/xml/pom.xml
index f88f0f89b0..d8aa77583b 100644
--- a/xml/pom.xml
+++ b/xml/pom.xml
@@ -178,8 +178,8 @@
                 <version>${maven-compiler-plugin.version}</version>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
             </plugin>
         </plugins>
     </build>
@@ -242,7 +242,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <version>${maven-surefire-plugin.version}</version>
                         <configuration>
                             <excludes>
                                 <exclude>CustomerTest.java</exclude>