From 0ae1bfedde54a50b2f6820a6a0ee63d1890e2f03 Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztof.woyke.sp@lhsystems.com>
Date: Mon, 29 Mar 2021 18:57:35 +0200
Subject: [PATCH] JAVA-4931: Cleanup surefire config. Part 2.

---
 core-groovy-2/pom.xml                           |  2 --
 core-groovy-collections/pom.xml                 |  2 --
 core-java-modules/core-java-streams-3/pom.xml   |  2 --
 ddd-modules/mainapp/pom.xml                     |  1 -
 ddd/pom.xml                                     |  9 ---------
 guava-modules/guava-collections-list/pom.xml    |  8 --------
 guava-modules/guava-collections-map/pom.xml     |  8 --------
 guava-modules/guava-collections-set/pom.xml     |  8 --------
 guava-modules/guava-collections/pom.xml         |  8 --------
 guava-modules/guava-io/pom.xml                  |  8 --------
 guava-modules/guava-utilities/pom.xml           |  8 --------
 guava-modules/pom.xml                           | 11 +----------
 jackson-modules/pom.xml                         | 10 ----------
 jackson-simple/pom.xml                          |  8 --------
 logging-modules/log-mdc/pom.xml                 |  8 --------
 logging-modules/pom.xml                         | 10 ----------
 persistence-modules/hibernate-libraries/pom.xml |  1 -
 quarkus/pom.xml                                 |  3 ---
 spring-5/pom.xml                                |  1 -
 spring-core-3/pom.xml                           | 11 -----------
 spring-core-4/pom.xml                           | 11 -----------
 spring-web-modules/spring-mvc-basics-2/pom.xml  |  9 ---------
 22 files changed, 1 insertion(+), 146 deletions(-)

diff --git a/core-groovy-2/pom.xml b/core-groovy-2/pom.xml
index b1bfa19771..207c090615 100644
--- a/core-groovy-2/pom.xml
+++ b/core-groovy-2/pom.xml
@@ -115,7 +115,6 @@
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire.plugin.version}</version>
                 <configuration>
                     <useFile>false</useFile>
                     <includes>
@@ -186,7 +185,6 @@
         <logback.version>1.2.3</logback.version>
         <groovy.version>2.5.7</groovy.version>
         <assembly.plugin.version>3.1.0</assembly.plugin.version>
-        <surefire.plugin.version>2.20.1</surefire.plugin.version>
         <compiler.plugin.version>3.8.0</compiler.plugin.version>
         <groovy.compiler.version>3.3.0-01</groovy.compiler.version>
     </properties>
diff --git a/core-groovy-collections/pom.xml b/core-groovy-collections/pom.xml
index 125dfca4c1..770bcc57d6 100644
--- a/core-groovy-collections/pom.xml
+++ b/core-groovy-collections/pom.xml
@@ -101,7 +101,6 @@
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire.plugin.version}</version>
                 <configuration>
                     <useFile>false</useFile>
                     <includes>
@@ -128,7 +127,6 @@
         <hsqldb.version>2.4.0</hsqldb.version>
         <spock-core.version>1.1-groovy-2.4</spock-core.version>
         <gmavenplus-plugin.version>1.6</gmavenplus-plugin.version>
-        <surefire.plugin.version>2.20.1</surefire.plugin.version>
     </properties>
 
 </project>
diff --git a/core-java-modules/core-java-streams-3/pom.xml b/core-java-modules/core-java-streams-3/pom.xml
index cbb7366a7d..6597c999d8 100644
--- a/core-java-modules/core-java-streams-3/pom.xml
+++ b/core-java-modules/core-java-streams-3/pom.xml
@@ -49,8 +49,6 @@
     <properties>
         <!-- testing -->
         <assertj.version>3.6.1</assertj.version>
-        <!-- plugins -->
-        <maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
     </properties>
 
 </project>
diff --git a/ddd-modules/mainapp/pom.xml b/ddd-modules/mainapp/pom.xml
index 59d2ad7d3a..6b913df979 100644
--- a/ddd-modules/mainapp/pom.xml
+++ b/ddd-modules/mainapp/pom.xml
@@ -29,7 +29,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.16</version>
                 <configuration>
                     <enableAssertions>true</enableAssertions>
                 </configuration>
diff --git a/ddd/pom.xml b/ddd/pom.xml
index 7d03208802..41fccc7d5f 100644
--- a/ddd/pom.xml
+++ b/ddd/pom.xml
@@ -99,15 +99,6 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <properties>
         <joda-money.version>1.0.1</joda-money.version>
 
diff --git a/guava-modules/guava-collections-list/pom.xml b/guava-modules/guava-collections-list/pom.xml
index cc52a5d48b..78a4aeb8ea 100644
--- a/guava-modules/guava-collections-list/pom.xml
+++ b/guava-modules/guava-collections-list/pom.xml
@@ -66,14 +66,6 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
-            </plugin>
-        </plugins>
     </build>
 
     <properties>
diff --git a/guava-modules/guava-collections-map/pom.xml b/guava-modules/guava-collections-map/pom.xml
index 82d634265b..f3f829f25f 100644
--- a/guava-modules/guava-collections-map/pom.xml
+++ b/guava-modules/guava-collections-map/pom.xml
@@ -38,14 +38,6 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
-            </plugin>
-        </plugins>
     </build>
 
     <properties>
diff --git a/guava-modules/guava-collections-set/pom.xml b/guava-modules/guava-collections-set/pom.xml
index 8f58148e41..0e53527aef 100644
--- a/guava-modules/guava-collections-set/pom.xml
+++ b/guava-modules/guava-collections-set/pom.xml
@@ -37,14 +37,6 @@
 
     <build>
         <finalName>guava-collections-set</finalName>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
-            </plugin>
-        </plugins>
     </build>
 
     <properties>
diff --git a/guava-modules/guava-collections/pom.xml b/guava-modules/guava-collections/pom.xml
index 53c55dc655..90ed99bab7 100644
--- a/guava-modules/guava-collections/pom.xml
+++ b/guava-modules/guava-collections/pom.xml
@@ -71,14 +71,6 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
-            </plugin>
-        </plugins>
     </build>
 
     <properties>
diff --git a/guava-modules/guava-io/pom.xml b/guava-modules/guava-io/pom.xml
index 6b3280755c..b77bad575d 100644
--- a/guava-modules/guava-io/pom.xml
+++ b/guava-modules/guava-io/pom.xml
@@ -40,14 +40,6 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
-            </plugin>
-        </plugins>
     </build>
 
 </project>
\ No newline at end of file
diff --git a/guava-modules/guava-utilities/pom.xml b/guava-modules/guava-utilities/pom.xml
index 0496f5b2e8..fd9523c224 100644
--- a/guava-modules/guava-utilities/pom.xml
+++ b/guava-modules/guava-utilities/pom.xml
@@ -52,14 +52,6 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
-            </plugin>
-        </plugins>
     </build>
 
     <properties>
diff --git a/guava-modules/pom.xml b/guava-modules/pom.xml
index b625f9fd0f..4b84f616f3 100644
--- a/guava-modules/pom.xml
+++ b/guava-modules/pom.xml
@@ -46,17 +46,8 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
-            </plugin>
-        </plugins>
-    </build>
-
     <properties>
+        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
         <junit-jupiter.version>5.6.2</junit-jupiter.version>
         <guava.version>29.0-jre</guava.version>
     </properties>
diff --git a/jackson-modules/pom.xml b/jackson-modules/pom.xml
index 70b10e9554..819f11c110 100644
--- a/jackson-modules/pom.xml
+++ b/jackson-modules/pom.xml
@@ -50,16 +50,6 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
-            </plugin>
-        </plugins>
-    </build>
-
     <properties>
         <junit-jupiter.version>5.6.2</junit-jupiter.version>
     </properties>
diff --git a/jackson-simple/pom.xml b/jackson-simple/pom.xml
index 761dca6afa..8dfd949166 100644
--- a/jackson-simple/pom.xml
+++ b/jackson-simple/pom.xml
@@ -51,14 +51,6 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
-            </plugin>
-        </plugins>
     </build>
 
     <properties>
diff --git a/logging-modules/log-mdc/pom.xml b/logging-modules/log-mdc/pom.xml
index 5e2155fde9..a7cfd3faa8 100644
--- a/logging-modules/log-mdc/pom.xml
+++ b/logging-modules/log-mdc/pom.xml
@@ -95,14 +95,6 @@
                 </plugin>
             </plugins>
         </pluginManagement>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
-            </plugin>
-        </plugins>
     </build>
 
     <properties>
diff --git a/logging-modules/pom.xml b/logging-modules/pom.xml
index b5354c7c23..85d5c18219 100644
--- a/logging-modules/pom.xml
+++ b/logging-modules/pom.xml
@@ -21,16 +21,6 @@
         <module>flogger</module>
     </modules>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
-            </plugin>
-        </plugins>
-    </build>
-
     <properties>
         <junit-jupiter.version>5.6.2</junit-jupiter.version>
     </properties>
diff --git a/persistence-modules/hibernate-libraries/pom.xml b/persistence-modules/hibernate-libraries/pom.xml
index f67309cf43..053ad05167 100644
--- a/persistence-modules/hibernate-libraries/pom.xml
+++ b/persistence-modules/hibernate-libraries/pom.xml
@@ -175,7 +175,6 @@
         <log4jdbc.version>2.0.0</log4jdbc.version>
         <logback.version>1.2.3</logback.version>
         <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
-        <maven.surefire.version>2.22.2</maven.surefire.version>
         <maven.compiler.version>3.8.1</maven.compiler.version>
         <maven.version>3.8.1</maven.version>
         <mysql.version>8.0.19</mysql.version>
diff --git a/quarkus/pom.xml b/quarkus/pom.xml
index 9c14afca3c..9826fd1034 100644
--- a/quarkus/pom.xml
+++ b/quarkus/pom.xml
@@ -97,7 +97,6 @@
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire-plugin.version}</version>
                 <configuration>
                     <forkCount>1</forkCount>
                     <reuseForks>true</reuseForks>
@@ -136,7 +135,6 @@
                     </plugin>
                     <plugin>
                         <artifactId>maven-failsafe-plugin</artifactId>
-                        <version>${surefire-plugin.version}</version>
                         <executions>
                             <execution>
                                 <goals>
@@ -157,7 +155,6 @@
     </profiles>
 
     <properties>
-        <surefire-plugin.version>2.22.0</surefire-plugin.version>
         <quarkus.version>1.7.0.Final</quarkus.version>
         <junit-jupiter.version>5.6.0</junit-jupiter.version>
     </properties>
diff --git a/spring-5/pom.xml b/spring-5/pom.xml
index e368bcacba..082b1f8a87 100644
--- a/spring-5/pom.xml
+++ b/spring-5/pom.xml
@@ -142,7 +142,6 @@
         <asciidoctor-plugin.version>1.5.6</asciidoctor-plugin.version>
         <commons-collections4.version>4.1</commons-collections4.version>
         <snippetsDirectory>${project.build.directory}/generated-snippets</snippetsDirectory>
-        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
     </properties>
 
 </project>
diff --git a/spring-core-3/pom.xml b/spring-core-3/pom.xml
index 205259e8e4..618800529c 100644
--- a/spring-core-3/pom.xml
+++ b/spring-core-3/pom.xml
@@ -69,18 +69,7 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven.surefire.version}</version>
-            </plugin>
-        </plugins>
-    </build>
-
     <properties>
-        <maven.surefire.version>2.22.1</maven.surefire.version>
         <annotation-api.version>1.3.2</annotation-api.version>
         <spring.boot.version>2.2.2.RELEASE</spring.boot.version>
     </properties>
diff --git a/spring-core-4/pom.xml b/spring-core-4/pom.xml
index df0b90fef2..d2e948c475 100644
--- a/spring-core-4/pom.xml
+++ b/spring-core-4/pom.xml
@@ -87,18 +87,7 @@
 
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven.surefire.version}</version>
-            </plugin>
-        </plugins>
-    </build>
-
     <properties>
-        <maven.surefire.version>2.22.1</maven.surefire.version>
         <annotation-api.version>1.3.2</annotation-api.version>
         <spring.boot.version>2.2.2.RELEASE</spring.boot.version>
         <guava.version>28.2-jre</guava.version>
diff --git a/spring-web-modules/spring-mvc-basics-2/pom.xml b/spring-web-modules/spring-mvc-basics-2/pom.xml
index 0b4515994b..adc42d8db8 100644
--- a/spring-web-modules/spring-mvc-basics-2/pom.xml
+++ b/spring-web-modules/spring-mvc-basics-2/pom.xml
@@ -131,14 +131,6 @@
             <artifactId>json</artifactId>
             <version>${json.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.maven.surefire</groupId>
-            <artifactId>surefire-logger-api</artifactId>
-            <version>${maven-surefire-plugin.version}</version>
-            <!-- to get around bug https://github.com/junit-team/junit5/issues/1367 -->
-            <scope>test</scope>
-            <optional>true</optional>
-        </dependency>
     </dependencies>
 
     <build>
@@ -163,7 +155,6 @@
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
         <javax.servlet.jsp-api.version>2.3.2-b02</javax.servlet.jsp-api.version>
         <javax.servlet-api.version>4.0.0</javax.servlet-api.version>
         <hibernate-validator.version>6.0.10.Final</hibernate-validator.version>