From 64a134f05e2ceec645a0e1cdf2cf061f6fbf552e Mon Sep 17 00:00:00 2001
From: chaos2418 <>
Date: Tue, 2 Nov 2021 17:27:04 +0530
Subject: [PATCH] JAVA-1665: updated parent-java's junit and surefire
configurations
---
core-java-modules/core-java-11-2/pom.xml | 18 ------------------
core-java-modules/core-java-14/pom.xml | 12 ------------
core-java-modules/core-java-15/pom.xml | 12 ------------
core-java-modules/core-java-16/pom.xml | 12 ------------
core-java-modules/core-java-17/pom.xml | 12 ------------
.../core-java-concurrency-2/pom.xml | 11 ++++++-----
core-java-modules/core-java-jndi/pom.xml | 17 -----------------
core-java-modules/core-java-jvm-2/pom.xml | 5 -----
core-java-modules/core-java-jvm/pom.xml | 5 -----
.../core-java-networking-3/pom.xml | 5 -----
core-java-modules/core-java-os/pom.xml | 6 ------
core-java-modules/core-java-streams-2/pom.xml | 5 -----
.../core-java-string-algorithms-3/pom.xml | 5 -----
.../core-java-string-conversions-2/pom.xml | 5 -----
.../core-java-time-measurements/pom.xml | 4 +---
core-java-modules/pom.xml | 4 ----
guava-modules/guava-collections-list/pom.xml | 12 ------------
guava-modules/guava-collections-map/pom.xml | 15 ---------------
guava-modules/guava-collections-set/pom.xml | 12 ------------
guava-modules/guava-collections/pom.xml | 12 ------------
guava-modules/guava-io/pom.xml | 15 ---------------
guava-modules/guava-utilities/pom.xml | 12 ------------
guava-modules/pom.xml | 13 -------------
jackson-modules/pom.xml | 12 ------------
jackson-simple/pom.xml | 12 ------------
java-collections-conversions-2/pom.xml | 6 ------
parent-java/pom.xml | 17 +++++++++++++++--
.../math-test-functions/pom.xml | 14 --------------
.../string-test-functions/pom.xml | 14 --------------
testing-modules/testing-assertions/pom.xml | 12 ------------
30 files changed, 22 insertions(+), 294 deletions(-)
diff --git a/core-java-modules/core-java-11-2/pom.xml b/core-java-modules/core-java-11-2/pom.xml
index 68e8b66d67..3ab8e883b0 100644
--- a/core-java-modules/core-java-11-2/pom.xml
+++ b/core-java-modules/core-java-11-2/pom.xml
@@ -32,24 +32,6 @@
mockserver-junit-jupiter
${mockserver.version}
-
- org.junit.jupiter
- junit-jupiter-engine
- ${junit-jupiter.version}
- test
-
-
- org.junit.jupiter
- junit-jupiter-params
- ${junit-jupiter.version}
- test
-
-
- org.junit.jupiter
- junit-jupiter-api
- ${junit-jupiter.version}
- test
-
org.apache.commons
commons-lang3
diff --git a/core-java-modules/core-java-14/pom.xml b/core-java-modules/core-java-14/pom.xml
index a03332d8bc..de01d17b0d 100644
--- a/core-java-modules/core-java-14/pom.xml
+++ b/core-java-modules/core-java-14/pom.xml
@@ -22,18 +22,6 @@
${assertj.version}
test
-
- org.junit.jupiter
- junit-jupiter-engine
- ${junit-jupiter.version}
- test
-
-
- org.junit.jupiter
- junit-jupiter-api
- ${junit-jupiter.version}
- test
-
diff --git a/core-java-modules/core-java-15/pom.xml b/core-java-modules/core-java-15/pom.xml
index 091f0568a7..a71987c23a 100644
--- a/core-java-modules/core-java-15/pom.xml
+++ b/core-java-modules/core-java-15/pom.xml
@@ -27,18 +27,6 @@
${assertj.version}
test
-
- org.junit.jupiter
- junit-jupiter-engine
- ${junit-jupiter.version}
- test
-
-
- org.junit.jupiter
- junit-jupiter-api
- ${junit-jupiter.version}
- test
-
diff --git a/core-java-modules/core-java-16/pom.xml b/core-java-modules/core-java-16/pom.xml
index 5d10325f03..790b7dd057 100644
--- a/core-java-modules/core-java-16/pom.xml
+++ b/core-java-modules/core-java-16/pom.xml
@@ -28,18 +28,6 @@
commons-lang3
3.12.0
-
- org.junit.jupiter
- junit-jupiter-engine
- ${junit-jupiter.version}
- test
-
-
- org.junit.jupiter
- junit-jupiter-api
- ${junit-jupiter.version}
- test
-
diff --git a/core-java-modules/core-java-17/pom.xml b/core-java-modules/core-java-17/pom.xml
index f9a7ec326b..f1f4edc484 100644
--- a/core-java-modules/core-java-17/pom.xml
+++ b/core-java-modules/core-java-17/pom.xml
@@ -23,18 +23,6 @@
${assertj.version}
test
-
- org.junit.jupiter
- junit-jupiter-engine
- ${junit-jupiter.version}
- test
-
-
- org.junit.jupiter
- junit-jupiter-api
- ${junit-jupiter.version}
- test
-
diff --git a/core-java-modules/core-java-concurrency-2/pom.xml b/core-java-modules/core-java-concurrency-2/pom.xml
index b8a1d641d4..c61f28a6b3 100644
--- a/core-java-modules/core-java-concurrency-2/pom.xml
+++ b/core-java-modules/core-java-concurrency-2/pom.xml
@@ -15,11 +15,6 @@
-
- org.junit.vintage
- junit-vintage-engine
- test
-
com.googlecode.thread-weaver
threadweaver
@@ -31,6 +26,12 @@
tempus-fugit
${tempus-fugit.version}
test
+
+
+ junit
+ junit
+
+
com.googlecode.multithreadedtc
diff --git a/core-java-modules/core-java-jndi/pom.xml b/core-java-modules/core-java-jndi/pom.xml
index f1b374b2b5..1728c0b5d9 100644
--- a/core-java-modules/core-java-jndi/pom.xml
+++ b/core-java-modules/core-java-jndi/pom.xml
@@ -15,23 +15,6 @@
-
- org.junit.jupiter
- junit-jupiter
- ${junit-jupiter.version}
- test
-
-
- org.junit.jupiter
- junit-jupiter-api
- ${junit-jupiter.version}
- test
-
-
- org.junit.jupiter
- junit-jupiter-engine
- ${junit-jupiter.version}
-
org.springframework
spring-core
diff --git a/core-java-modules/core-java-jvm-2/pom.xml b/core-java-modules/core-java-jvm-2/pom.xml
index 173cf27955..08c8de75a9 100644
--- a/core-java-modules/core-java-jvm-2/pom.xml
+++ b/core-java-modules/core-java-jvm-2/pom.xml
@@ -15,11 +15,6 @@
-
- org.junit.vintage
- junit-vintage-engine
- test
-
org.assertj
assertj-core
diff --git a/core-java-modules/core-java-jvm/pom.xml b/core-java-modules/core-java-jvm/pom.xml
index afbe0b0ee3..a8ab4d9f2e 100644
--- a/core-java-modules/core-java-jvm/pom.xml
+++ b/core-java-modules/core-java-jvm/pom.xml
@@ -16,11 +16,6 @@
-
- org.junit.vintage
- junit-vintage-engine
- test
-
org.apache.commons
commons-lang3
diff --git a/core-java-modules/core-java-networking-3/pom.xml b/core-java-modules/core-java-networking-3/pom.xml
index 4a05af8b25..1579418b54 100644
--- a/core-java-modules/core-java-networking-3/pom.xml
+++ b/core-java-modules/core-java-networking-3/pom.xml
@@ -35,11 +35,6 @@
${assertj.version}
test
-
- org.junit.vintage
- junit-vintage-engine
- test
-
com.sun.mail
javax.mail
diff --git a/core-java-modules/core-java-os/pom.xml b/core-java-modules/core-java-os/pom.xml
index b279e3d6cb..34afbec210 100644
--- a/core-java-modules/core-java-os/pom.xml
+++ b/core-java-modules/core-java-os/pom.xml
@@ -16,12 +16,6 @@
-
- org.junit.jupiter
- junit-jupiter-engine
- ${junit-jupiter.version}
- test
-
org.apache.commons
commons-collections4
diff --git a/core-java-modules/core-java-streams-2/pom.xml b/core-java-modules/core-java-streams-2/pom.xml
index 087a8378b1..08b82bcc11 100644
--- a/core-java-modules/core-java-streams-2/pom.xml
+++ b/core-java-modules/core-java-streams-2/pom.xml
@@ -30,11 +30,6 @@
log4j
${log4j.version}
-
- org.junit.vintage
- junit-vintage-engine
- test
-
org.assertj
assertj-core
diff --git a/core-java-modules/core-java-string-algorithms-3/pom.xml b/core-java-modules/core-java-string-algorithms-3/pom.xml
index 6376bfa677..4287696332 100644
--- a/core-java-modules/core-java-string-algorithms-3/pom.xml
+++ b/core-java-modules/core-java-string-algorithms-3/pom.xml
@@ -26,11 +26,6 @@
guava
${guava.version}
-
- org.junit.jupiter
- junit-jupiter
- test
-
commons-validator
commons-validator
diff --git a/core-java-modules/core-java-string-conversions-2/pom.xml b/core-java-modules/core-java-string-conversions-2/pom.xml
index ff4955726b..68be7d2c08 100644
--- a/core-java-modules/core-java-string-conversions-2/pom.xml
+++ b/core-java-modules/core-java-string-conversions-2/pom.xml
@@ -20,11 +20,6 @@
guava
${guava.version}
-
- org.junit.vintage
- junit-vintage-engine
- test
-
org.hamcrest
hamcrest
diff --git a/core-java-modules/core-java-time-measurements/pom.xml b/core-java-modules/core-java-time-measurements/pom.xml
index 663cf6708b..5a2a13290b 100644
--- a/core-java-modules/core-java-time-measurements/pom.xml
+++ b/core-java-modules/core-java-time-measurements/pom.xml
@@ -75,8 +75,8 @@
+ org.apache.maven.plugins
maven-surefire-plugin
- ${maven-surefire-plugin.version}
-javaagent:${settings.localRepository}/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar
@@ -97,8 +97,6 @@
1.8.9
2.0.7
1.44
-
- 2.22.1
\ No newline at end of file
diff --git a/core-java-modules/pom.xml b/core-java-modules/pom.xml
index 9f184310e9..872161c2bd 100644
--- a/core-java-modules/pom.xml
+++ b/core-java-modules/pom.xml
@@ -134,8 +134,4 @@
-
- 2.22.2
-
-
diff --git a/guava-modules/guava-collections-list/pom.xml b/guava-modules/guava-collections-list/pom.xml
index e57198ec40..671cbea39d 100644
--- a/guava-modules/guava-collections-list/pom.xml
+++ b/guava-modules/guava-collections-list/pom.xml
@@ -27,18 +27,6 @@
${commons-lang3.version}
-
- org.junit.jupiter
- junit-jupiter
- ${junit-jupiter.version}
- test
-
-
- org.junit.vintage
- junit-vintage-engine
- ${junit-jupiter.version}
- test
-
org.assertj
assertj-core
diff --git a/guava-modules/guava-collections-map/pom.xml b/guava-modules/guava-collections-map/pom.xml
index 7f3e470fc3..e4d33ce0cc 100644
--- a/guava-modules/guava-collections-map/pom.xml
+++ b/guava-modules/guava-collections-map/pom.xml
@@ -15,21 +15,6 @@
../
-
-
- org.junit.jupiter
- junit-jupiter
- ${junit-jupiter.version}
- test
-
-
- org.junit.vintage
- junit-vintage-engine
- ${junit-jupiter.version}
- test
-
-
-
guava-collections-map
diff --git a/guava-modules/guava-collections-set/pom.xml b/guava-modules/guava-collections-set/pom.xml
index 09e3f42e83..97e03155e7 100644
--- a/guava-modules/guava-collections-set/pom.xml
+++ b/guava-modules/guava-collections-set/pom.xml
@@ -16,18 +16,6 @@
-
- org.junit.jupiter
- junit-jupiter
- ${junit-jupiter.version}
- test
-
-
- org.junit.vintage
- junit-vintage-engine
- ${junit-jupiter.version}
- test
-
org.assertj
assertj-core
diff --git a/guava-modules/guava-collections/pom.xml b/guava-modules/guava-collections/pom.xml
index 6dc7510a1e..f3356cf982 100644
--- a/guava-modules/guava-collections/pom.xml
+++ b/guava-modules/guava-collections/pom.xml
@@ -32,18 +32,6 @@
${jool.version}
-
- org.junit.jupiter
- junit-jupiter
- ${junit-jupiter.version}
- test
-
-
- org.junit.vintage
- junit-vintage-engine
- ${junit-jupiter.version}
- test
-
org.assertj
assertj-core
diff --git a/guava-modules/guava-io/pom.xml b/guava-modules/guava-io/pom.xml
index 11a5d4ada6..f1f75b43a8 100644
--- a/guava-modules/guava-io/pom.xml
+++ b/guava-modules/guava-io/pom.xml
@@ -14,21 +14,6 @@
../
-
-
- org.junit.jupiter
- junit-jupiter
- ${junit-jupiter.version}
- test
-
-
- org.junit.vintage
- junit-vintage-engine
- ${junit-jupiter.version}
- test
-
-
-
guava-io
diff --git a/guava-modules/guava-utilities/pom.xml b/guava-modules/guava-utilities/pom.xml
index 6049a62e85..b33ea16c11 100644
--- a/guava-modules/guava-utilities/pom.xml
+++ b/guava-modules/guava-utilities/pom.xml
@@ -21,18 +21,6 @@
${commons-lang3.version}
-
- org.junit.jupiter
- junit-jupiter
- ${junit-jupiter.version}
- test
-
-
- org.junit.vintage
- junit-vintage-engine
- ${junit-jupiter.version}
- test
-
org.assertj
assertj-core
diff --git a/guava-modules/pom.xml b/guava-modules/pom.xml
index cbfb47fa0f..019776ad3d 100644
--- a/guava-modules/pom.xml
+++ b/guava-modules/pom.xml
@@ -34,22 +34,9 @@
guava
${guava.version}
-
- org.junit.jupiter
- junit-jupiter
- ${junit-jupiter.version}
- test
-
-
- org.junit.vintage
- junit-vintage-engine
- ${junit-jupiter.version}
- test
-
- 2.22.2
29.0-jre
diff --git a/jackson-modules/pom.xml b/jackson-modules/pom.xml
index 1bb684af0a..14e34a41bf 100644
--- a/jackson-modules/pom.xml
+++ b/jackson-modules/pom.xml
@@ -35,18 +35,6 @@
jackson-dataformat-xml
${jackson.version}
-
- org.junit.jupiter
- junit-jupiter
- ${junit-jupiter.version}
- test
-
-
- org.junit.vintage
- junit-vintage-engine
- ${junit-jupiter.version}
- test
-
\ No newline at end of file
diff --git a/jackson-simple/pom.xml b/jackson-simple/pom.xml
index 72e31ee5e3..ae8e380b33 100644
--- a/jackson-simple/pom.xml
+++ b/jackson-simple/pom.xml
@@ -22,18 +22,6 @@
${jackson.version}
-
- org.junit.jupiter
- junit-jupiter
- ${junit-jupiter.version}
- test
-
-
- org.junit.vintage
- junit-vintage-engine
- ${junit-jupiter.version}
- test
-
org.assertj
assertj-core
diff --git a/java-collections-conversions-2/pom.xml b/java-collections-conversions-2/pom.xml
index 55dc6e30b6..cd4366e87c 100644
--- a/java-collections-conversions-2/pom.xml
+++ b/java-collections-conversions-2/pom.xml
@@ -32,12 +32,6 @@
modelmapper
${modelmapper.version}
-
- org.junit.vintage
- junit-vintage-engine
- ${junit-jupiter.version}
- test
-
org.hamcrest
hamcrest
diff --git a/parent-java/pom.xml b/parent-java/pom.xml
index 103b5f179c..ae6eeb40a9 100644
--- a/parent-java/pom.xml
+++ b/parent-java/pom.xml
@@ -1,7 +1,7 @@
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
parent-java
0.0.1-SNAPSHOT
@@ -40,10 +40,23 @@
+
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ ${maven-surefire-plugin.version}
+
+
+
+
+
31.0.1-jre
2.3.7
2.2
+ 2.22.2
\ No newline at end of file
diff --git a/testing-modules/parallel-tests-junit/math-test-functions/pom.xml b/testing-modules/parallel-tests-junit/math-test-functions/pom.xml
index eae1bf61e7..7ead2051e2 100644
--- a/testing-modules/parallel-tests-junit/math-test-functions/pom.xml
+++ b/testing-modules/parallel-tests-junit/math-test-functions/pom.xml
@@ -13,21 +13,11 @@
0.0.1-SNAPSHOT
-
-
- org.junit.vintage
- junit-vintage-engine
- ${junit-jupiter.version}
- test
-
-
-
org.apache.maven.plugins
maven-surefire-plugin
- ${maven-surefire-plugin.version}
all
10
@@ -45,8 +35,4 @@
-
- 2.22.0
-
-
\ No newline at end of file
diff --git a/testing-modules/parallel-tests-junit/string-test-functions/pom.xml b/testing-modules/parallel-tests-junit/string-test-functions/pom.xml
index c838558fc2..86b4078eb3 100644
--- a/testing-modules/parallel-tests-junit/string-test-functions/pom.xml
+++ b/testing-modules/parallel-tests-junit/string-test-functions/pom.xml
@@ -13,21 +13,11 @@
0.0.1-SNAPSHOT
-
-
- org.junit.vintage
- junit-vintage-engine
- ${junit-jupiter.version}
- test
-
-
-
org.apache.maven.plugins
maven-surefire-plugin
- ${maven-surefire-plugin.version}
all
true
@@ -37,8 +27,4 @@
-
- 2.22.0
-
-
\ No newline at end of file
diff --git a/testing-modules/testing-assertions/pom.xml b/testing-modules/testing-assertions/pom.xml
index d5c5981b33..f9cd35c5e5 100644
--- a/testing-modules/testing-assertions/pom.xml
+++ b/testing-modules/testing-assertions/pom.xml
@@ -18,18 +18,6 @@
logback-classic
${logback.version}
-
- org.junit.jupiter
- junit-jupiter-engine
- ${junit-jupiter.version}
- test
-
-
- org.junit.jupiter
- junit-jupiter-api
- ${junit-jupiter.version}
- test
-
org.assertj
assertj-core