From d716de4a4f81c0669c0743d6a6c7ba3d4144e463 Mon Sep 17 00:00:00 2001
From: chaos2418 <>
Date: Wed, 3 Nov 2021 16:11:27 +0530
Subject: [PATCH] JAVA-1668: updating parent-spring-5's junit and surefire
 configurations

---
 ethereum/pom.xml        | 12 ------------
 parent-spring-5/pom.xml | 19 +++++++++++++------
 spring-core-3/pom.xml   | 12 ------------
 spring-core-4/pom.xml   | 12 ------------
 4 files changed, 13 insertions(+), 42 deletions(-)

diff --git a/ethereum/pom.xml b/ethereum/pom.xml
index 7fc4057341..95dd1c0955 100644
--- a/ethereum/pom.xml
+++ b/ethereum/pom.xml
@@ -144,18 +144,6 @@
             </exclusions>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <version>${junit-jupiter.version}</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.hamcrest</groupId>
-                    <artifactId>hamcrest-core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest</artifactId>
diff --git a/parent-spring-5/pom.xml b/parent-spring-5/pom.xml
index c4446ddda8..01e8671099 100644
--- a/parent-spring-5/pom.xml
+++ b/parent-spring-5/pom.xml
@@ -21,18 +21,25 @@
             <artifactId>spring-core</artifactId>
             <version>${spring.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit-jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>${maven-surefire-plugin.version}</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
     <properties>
         <spring.version>5.3.9</spring.version>
         <spring-security.version>5.2.3.RELEASE</spring-security.version>
         <spring-boot-starter-test.version>1.5.10.RELEASE</spring-boot-starter-test.version>
+        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-core-3/pom.xml b/spring-core-3/pom.xml
index 50d2e7ac5e..9e777a4a03 100644
--- a/spring-core-3/pom.xml
+++ b/spring-core-3/pom.xml
@@ -55,18 +55,6 @@
             <version>${spring.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>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-            <version>${junit-jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <properties>
diff --git a/spring-core-4/pom.xml b/spring-core-4/pom.xml
index 5706b2ee75..f9665a672b 100644
--- a/spring-core-4/pom.xml
+++ b/spring-core-4/pom.xml
@@ -55,18 +55,6 @@
             <version>${spring.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>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-            <version>${junit-jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>