From aa864f4532282100667bf3d81dc7cbd460845408 Mon Sep 17 00:00:00 2001
From: Michael Osipov <michaelo@apache.org>
Date: Thu, 23 Nov 2023 14:41:11 +0100
Subject: [PATCH] [SUREFIRE-2216] Upgrade plugins and components (in ITs)

This closes #690
---
 maven-failsafe-plugin/pom.xml                 |  2 +-
 maven-surefire-common/pom.xml                 |  2 +-
 maven-surefire-plugin/pom.xml                 |  2 +-
 maven-surefire-report-plugin/pom.xml          |  2 +-
 pom.xml                                       | 20 +++++++++----------
 surefire-api/pom.xml                          |  2 +-
 surefire-booter/pom.xml                       |  2 +-
 surefire-extensions-api/pom.xml               |  2 +-
 surefire-grouper/pom.xml                      |  2 +-
 surefire-its/pom.xml                          |  8 ++++----
 surefire-logger-api/pom.xml                   |  2 +-
 surefire-providers/common-java5/pom.xml       |  2 +-
 surefire-providers/common-junit3/pom.xml      |  2 +-
 surefire-providers/common-junit4/pom.xml      |  2 +-
 surefire-providers/common-junit48/pom.xml     |  2 +-
 surefire-providers/pom.xml                    |  2 +-
 surefire-providers/surefire-junit3/pom.xml    |  2 +-
 surefire-providers/surefire-junit4/pom.xml    |  2 +-
 surefire-providers/surefire-junit47/pom.xml   |  2 +-
 .../surefire-testng-utils/pom.xml             |  2 +-
 surefire-providers/surefire-testng/pom.xml    |  2 +-
 surefire-report-parser/pom.xml                |  2 +-
 22 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml
index 526dde350e..64c8a3b5be 100644
--- a/maven-failsafe-plugin/pom.xml
+++ b/maven-failsafe-plugin/pom.xml
@@ -114,7 +114,7 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shadefire</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.2</version>
             <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
           </dependency>
         </dependencies>
diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml
index 07aaf4617a..4535df14bc 100644
--- a/maven-surefire-common/pom.xml
+++ b/maven-surefire-common/pom.xml
@@ -154,7 +154,7 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shadefire</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.2</version>
             <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
           </dependency>
         </dependencies>
diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml
index 958f6099ed..de5d0e80c5 100644
--- a/maven-surefire-plugin/pom.xml
+++ b/maven-surefire-plugin/pom.xml
@@ -86,7 +86,7 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shadefire</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.2</version>
             <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
           </dependency>
         </dependencies>
diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml
index 087d860e72..2f80d1851b 100644
--- a/maven-surefire-report-plugin/pom.xml
+++ b/maven-surefire-report-plugin/pom.xml
@@ -187,7 +187,7 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shadefire</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.2</version>
             <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
           </dependency>
         </dependencies>
diff --git a/pom.xml b/pom.xml
index 6b957a44ec..a0377c5842 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,11 +89,11 @@
   <properties>
     <javaVersion>8</javaVersion>
     <mavenVersion>3.2.5</mavenVersion>
-    <commonsLang3Version>3.12.0</commonsLang3Version>
-    <commonsCompress>1.23.0</commonsCompress>
-    <commonsIoVersion>2.12.0</commonsIoVersion>
+    <commonsLang3Version>3.14.0</commonsLang3Version>
+    <commonsCompress>1.25.0</commonsCompress>
+    <commonsIoVersion>2.15.0</commonsIoVersion>
     <plexus-java-version>1.2.0</plexus-java-version>
-    <!-- maven-shared-utils:3.3.4 uses org.fusesource.jansi:jansi:2.2.0 -->
+    <!-- Do not upgrade, leads to test failures, MSHARED-1014 -->
     <mavenSharedUtilsVersion>3.3.4</mavenSharedUtilsVersion>
     <powermockVersion>2.0.9</powermockVersion>
     <jacocoVersion>0.8.8</jacocoVersion>
@@ -183,6 +183,7 @@
         </exclusions>
       </dependency>
       <dependency>
+        <!-- Do not upgrade, leads to test failures, needs analysis -->
         <groupId>org.apache.maven.shared</groupId>
         <artifactId>maven-common-artifact-filters</artifactId>
         <version>3.1.1</version>
@@ -223,6 +224,7 @@
         <version>2.4.0</version>
       </dependency>
       <dependency>
+        <!-- Do not upgrade, needs code changes -->
         <groupId>org.apache.maven.shared</groupId>
         <artifactId>maven-verifier</artifactId>
         <version>1.8.0</version>
@@ -306,17 +308,13 @@
         <classifier>runtime</classifier>
       </dependency>
       <dependency>
+        <!-- Do not upgrade, leads to test failures, needs analysis -->
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
         <version>5.9.3</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-xml</artifactId>
-        <version>3.0.0</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
   <dependencies>
@@ -367,7 +365,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.1.0</version>
+          <version>3.2.2</version>
           <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
           <configuration>
             <!-- NOTE: Be sure to isolate the Surefire version under test from the version running the tests! -->
@@ -514,7 +512,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.2</version>
         <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
       </plugin>
     </plugins>
diff --git a/surefire-api/pom.xml b/surefire-api/pom.xml
index 069f3f4015..4f9a193cd4 100644
--- a/surefire-api/pom.xml
+++ b/surefire-api/pom.xml
@@ -88,7 +88,7 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shadefire</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.2</version>
             <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
           </dependency>
         </dependencies>
diff --git a/surefire-booter/pom.xml b/surefire-booter/pom.xml
index e76807b4c3..16f35e2921 100644
--- a/surefire-booter/pom.xml
+++ b/surefire-booter/pom.xml
@@ -116,7 +116,7 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shadefire</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.2</version>
             <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
           </dependency>
         </dependencies>
diff --git a/surefire-extensions-api/pom.xml b/surefire-extensions-api/pom.xml
index 45b97919cc..d881654d0f 100644
--- a/surefire-extensions-api/pom.xml
+++ b/surefire-extensions-api/pom.xml
@@ -82,7 +82,7 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shadefire</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.2</version>
             <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
           </dependency>
         </dependencies>
diff --git a/surefire-grouper/pom.xml b/surefire-grouper/pom.xml
index ee12210b00..a2d2f4b614 100644
--- a/surefire-grouper/pom.xml
+++ b/surefire-grouper/pom.xml
@@ -77,7 +77,7 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shadefire</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.2</version>
             <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
           </dependency>
         </dependencies>
diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml
index 8c720c730f..195728da40 100644
--- a/surefire-its/pom.xml
+++ b/surefire-its/pom.xml
@@ -39,7 +39,7 @@
     <dependency>
       <groupId>org.apache.maven.surefire</groupId>
       <artifactId>surefire-report-parser</artifactId>
-      <version>3.1.0</version>
+      <version>3.2.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -128,7 +128,7 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shadefire</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.2</version>
             <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
           </dependency>
         </dependencies>
@@ -176,7 +176,7 @@
         <plugins>
           <plugin>
             <artifactId>maven-failsafe-plugin</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.2</version>
             <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
             <configuration>
               <skipTests>${skipTests}</skipTests>
@@ -205,7 +205,7 @@
               <dependency>
                 <groupId>org.apache.maven.surefire</groupId>
                 <artifactId>surefire-junit47</artifactId>
-                <version>3.1.0</version>
+                <version>3.2.2</version>
                 <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
               </dependency>
             </dependencies>
diff --git a/surefire-logger-api/pom.xml b/surefire-logger-api/pom.xml
index 22346aea93..ed85576ab7 100644
--- a/surefire-logger-api/pom.xml
+++ b/surefire-logger-api/pom.xml
@@ -84,7 +84,7 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shadefire</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.2</version>
             <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
           </dependency>
         </dependencies>
diff --git a/surefire-providers/common-java5/pom.xml b/surefire-providers/common-java5/pom.xml
index b5b38b4489..df5511be6b 100644
--- a/surefire-providers/common-java5/pom.xml
+++ b/surefire-providers/common-java5/pom.xml
@@ -69,7 +69,7 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shadefire</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.2</version>
             <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
           </dependency>
         </dependencies>
diff --git a/surefire-providers/common-junit3/pom.xml b/surefire-providers/common-junit3/pom.xml
index fab118251f..70854402b3 100644
--- a/surefire-providers/common-junit3/pom.xml
+++ b/surefire-providers/common-junit3/pom.xml
@@ -70,7 +70,7 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shadefire</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.2</version>
             <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
           </dependency>
         </dependencies>
diff --git a/surefire-providers/common-junit4/pom.xml b/surefire-providers/common-junit4/pom.xml
index c81d8ff0b3..95a95b024b 100644
--- a/surefire-providers/common-junit4/pom.xml
+++ b/surefire-providers/common-junit4/pom.xml
@@ -80,7 +80,7 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shadefire</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.2</version>
             <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
           </dependency>
         </dependencies>
diff --git a/surefire-providers/common-junit48/pom.xml b/surefire-providers/common-junit48/pom.xml
index 0f067639d4..e586441cfb 100644
--- a/surefire-providers/common-junit48/pom.xml
+++ b/surefire-providers/common-junit48/pom.xml
@@ -123,7 +123,7 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shadefire</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.2</version>
             <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
           </dependency>
         </dependencies>
diff --git a/surefire-providers/pom.xml b/surefire-providers/pom.xml
index 44633e47df..8e66306f24 100644
--- a/surefire-providers/pom.xml
+++ b/surefire-providers/pom.xml
@@ -61,7 +61,7 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shadefire</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.2</version>
             <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
           </dependency>
         </dependencies>
diff --git a/surefire-providers/surefire-junit3/pom.xml b/surefire-providers/surefire-junit3/pom.xml
index 9fbb1330e6..294fe4472a 100644
--- a/surefire-providers/surefire-junit3/pom.xml
+++ b/surefire-providers/surefire-junit3/pom.xml
@@ -80,7 +80,7 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shadefire</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.2</version>
             <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
           </dependency>
         </dependencies>
diff --git a/surefire-providers/surefire-junit4/pom.xml b/surefire-providers/surefire-junit4/pom.xml
index db63159508..eba72a7bd5 100644
--- a/surefire-providers/surefire-junit4/pom.xml
+++ b/surefire-providers/surefire-junit4/pom.xml
@@ -78,7 +78,7 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shadefire</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.2</version>
             <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
           </dependency>
         </dependencies>
diff --git a/surefire-providers/surefire-junit47/pom.xml b/surefire-providers/surefire-junit47/pom.xml
index 32f78ccd11..9f0fab91a3 100644
--- a/surefire-providers/surefire-junit47/pom.xml
+++ b/surefire-providers/surefire-junit47/pom.xml
@@ -96,7 +96,7 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shadefire</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.2</version>
             <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
           </dependency>
         </dependencies>
diff --git a/surefire-providers/surefire-testng-utils/pom.xml b/surefire-providers/surefire-testng-utils/pom.xml
index b820e44f47..151640e7c5 100644
--- a/surefire-providers/surefire-testng-utils/pom.xml
+++ b/surefire-providers/surefire-testng-utils/pom.xml
@@ -82,7 +82,7 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shadefire</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.2</version>
             <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
           </dependency>
         </dependencies>
diff --git a/surefire-providers/surefire-testng/pom.xml b/surefire-providers/surefire-testng/pom.xml
index 609a18997f..2f17ad44ad 100644
--- a/surefire-providers/surefire-testng/pom.xml
+++ b/surefire-providers/surefire-testng/pom.xml
@@ -98,7 +98,7 @@
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shadefire</artifactId>
             <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
-            <version>3.1.0</version>
+            <version>3.2.2</version>
           </dependency>
         </dependencies>
       </plugin>
diff --git a/surefire-report-parser/pom.xml b/surefire-report-parser/pom.xml
index 0a1e39fe89..0b62ec4e47 100644
--- a/surefire-report-parser/pom.xml
+++ b/surefire-report-parser/pom.xml
@@ -71,7 +71,7 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shadefire</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.2</version>
             <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
           </dependency>
         </dependencies>