Update maven-surefire to version 3.0.0~M6

Author: mizdebsk

mbi/dist/metadata.txt

@@ -615,6 +615,7 @@ MOD maven-surefire
     DEP org.apache.maven.surefire surefire-api
   ART org.apache.maven.surefire surefire-junit3
     DEP org.apache.maven.surefire common-junit3
+    DEP org.apache.maven.surefire common-java5
     DEP org.apache.maven.surefire surefire-api
   ART org.apache.maven.surefire surefire-junit4
     DEP org.apache.maven.surefire common-junit4
@@ -632,33 +633,40 @@ MOD maven-surefire
     DEP org.apache.maven.surefire common-java5
     DEP org.apache.maven.surefire surefire-testng-utils
     DEP org.apache.maven.surefire surefire-api
+  ART org.apache.maven.surefire surefire-shared-utils
+    DEP org.apache.maven.shared maven-shared-utils
+    DEP commons-io commons-io
+    DEP org.apache.commons commons-lang3
+    DEP org.apache.commons commons-compress
   ART org.apache.maven.surefire surefire-logger-api
   ART org.apache.maven.surefire surefire-api
     DEP org.apache.maven.surefire surefire-logger-api
-    DEP org.apache.maven.shared maven-shared-utils
+    DEP org.apache.maven.surefire surefire-shared-utils
+  ART org.apache.maven.surefire surefire-extensions-api
+    DEP org.apache.maven.surefire surefire-shared-utils
+  ART org.apache.maven.surefire surefire-extensions-spi
+    DEP org.apache.maven.surefire surefire-api
   ART org.apache.maven.surefire surefire-booter
     DEP org.apache.maven.surefire surefire-api
-    DEP org.apache.commons commons-lang3
-    DEP commons-io commons-io
+    DEP org.apache.maven.surefire surefire-extensions-spi
   ART org.apache.maven.surefire common-java5
-    DEP org.apache.maven.shared maven-shared-utils
+    DEP org.apache.maven.surefire surefire-shared-utils
     DEP org.apache.maven.surefire surefire-api
 MOD maven-surefire-plugin
   ART org.apache.maven.plugins maven-surefire-plugin
     DEP org.apache.maven.surefire maven-surefire-common
   ART org.apache.maven.plugins maven-failsafe-plugin
     DEP org.apache.maven.surefire maven-surefire-common
-    DEP org.apache.maven.shared maven-shared-utils
-    DEP org.apache.commons commons-lang3
-    DEP commons-io commons-io
   ART org.apache.maven.surefire maven-surefire-common
     DEP org.apache.maven.surefire surefire-api
+    DEP org.apache.maven.surefire surefire-extensions-api
     DEP org.apache.maven.surefire surefire-booter
     DEP org.apache.maven.shared maven-common-artifact-filters
-    DEP org.codehaus.plexus plexus-java
     DEP org.apache.maven.shared maven-shared-utils
-    DEP commons-io commons-io
-    DEP org.apache.commons commons-lang3
+    DEP org.apache.maven maven-model
+    DEP org.eclipse.sisu org.eclipse.sisu.plexus
+    DEP org.codehaus.plexus plexus-java
+    DEP org.apache.maven.surefire surefire-shared-utils
 MOD maven-verifier
   ART org.apache.maven.shared maven-verifier
     DEP org.apache.maven.shared maven-shared-utils

…-surefire/0001-Port-to-TestNG-6.11.patch …surefire/0001-Port-to-TestNG-7.4.0.patchpatches/maven-surefire/0001-Port-to-TestNG-6.11.patch renamed to patches/maven-surefire/0001-Port-to-TestNG-7.4.0.patch patches/maven-surefire/0001-Port-to-TestNG-6.11.patch renamed to patches/maven-surefire/0001-Port-to-TestNG-7.4.0.patch

@@ -1,4 +1,4 @@
-From 14196b58bc1d96d76636914b575dc22b7cc94b1a Mon Sep 17 00:00:00 2001
+From 219edb700ee76f167a329e5bab64feceee5b6b8f Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Mon, 10 Jul 2017 10:37:50 +0200
 Subject: [PATCH 1/4] Port to TestNG 7.4.0
@@ -11,21 +11,21 @@ Forwarded: no
  3 files changed, 3 insertions(+), 4 deletions(-)
 
 diff --git a/surefire-providers/surefire-testng/pom.xml b/surefire-providers/surefire-testng/pom.xml
-index 49e75b6ea..a9db4a8d9 100644
+index ece647d6a..682f296e6 100644
 --- a/surefire-providers/surefire-testng/pom.xml
 +++ b/surefire-providers/surefire-testng/pom.xml
 @@ -51,8 +51,7 @@
-     <dependency>
-       <groupId>org.testng</groupId>
-       <artifactId>testng</artifactId>
--      <version>5.10</version>
--      <classifier>jdk15</classifier>
-+      <version>7.4.0</version>
-       <scope>provided</scope>
-     </dependency>
-   </dependencies>
+         <dependency>
+             <groupId>org.testng</groupId>
+             <artifactId>testng</artifactId>
+-            <version>5.10</version>
+-            <classifier>jdk15</classifier>
++            <version>7.4.0</version>
+             <scope>provided</scope>
+         </dependency>
+         <dependency>
 diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
-index e9667316b..7021ef561 100644
+index ed918f538..c4a0cd19d 100644
 --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
 +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
 @@ -63,7 +63,7 @@ public void configure( TestNG testng, Map<String, String> options )
@@ -38,7 +38,7 @@ index e9667316b..7021ef561 100644
 
      @Override
 diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
-index b6bf82e03..8164f4f4d 100755
+index 6caf82459..2d988381f 100755
 --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
 +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
 @@ -68,7 +68,7 @@ public void configure( XmlSuite suite, Map<String, String> options )
@@ -51,5 +51,5 @@ index b6bf82e03..8164f4f4d 100755
      }
 
 -- 
-2.31.1
+2.35.1
 

…03-Disable-JUnit-4.8-test-grouping.patch …02-Disable-JUnit-4.8-test-grouping.patchpatches/maven-surefire/0003-Disable-JUnit-4.8-test-grouping.patch renamed to patches/maven-surefire/0002-Disable-JUnit-4.8-test-grouping.patch patches/maven-surefire/0003-Disable-JUnit-4.8-test-grouping.patch renamed to patches/maven-surefire/0002-Disable-JUnit-4.8-test-grouping.patch

@@ -1,45 +1,44 @@
-From 21890515f3eeba73065b79b6a65678ec1e2a821d Mon Sep 17 00:00:00 2001
+From 68a41813f6fad18f5192932d5c07d89ef090643c Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Mon, 27 Apr 2020 10:45:30 +0200
-Subject: [PATCH 3/3] Disable JUnit 4.8 test grouping
+Subject: [PATCH 2/4] Disable JUnit 4.8 test grouping
 
 Forwarded: not-needed
-
 ---
  .../surefire/junitcore/JUnitCoreProvider.java | 25 +++--------------
  .../maven/surefire/testng/TestNGExecutor.java | 27 -------------------
  2 files changed, 3 insertions(+), 49 deletions(-)
 
 diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
-index 7c74e8b86..c86bb276c 100644
+index 7ed483426..1ffd826db 100644
 --- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
 +++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
-@@ -25,7 +25,6 @@
+@@ -40,7 +40,6 @@
  import org.apache.maven.surefire.common.junit4.JUnit4RunListener;
  import org.apache.maven.surefire.common.junit4.JUnitTestFailureListener;
  import org.apache.maven.surefire.common.junit4.Notifier;
 -import org.apache.maven.surefire.common.junit48.FilterFactory;
  import org.apache.maven.surefire.common.junit48.JUnit48Reflector;
  import org.apache.maven.surefire.common.junit48.JUnit48TestChecker;
- import org.apache.maven.surefire.providerapi.AbstractProvider;
-@@ -47,6 +46,7 @@
- import java.util.concurrent.ConcurrentHashMap;
- 
- import static org.apache.maven.surefire.booter.CommandReader.getReader;
+ import org.junit.runner.Description;
+@@ -51,6 +50,7 @@
+ import static org.apache.maven.surefire.api.report.RunMode.RERUN_TEST_AFTER_FAILURE;
+ import static org.apache.maven.surefire.api.testset.TestListResolver.optionallyWildcardFilter;
+ import static org.apache.maven.surefire.api.util.TestsToRun.fromClass;
 +import static org.apache.maven.surefire.common.junit4.JUnit4ProviderUtil.createMatchAnyDescriptionFilter;
  import static org.apache.maven.surefire.common.junit4.JUnit4ProviderUtil.generateFailingTestDescriptions;
  import static org.apache.maven.surefire.common.junit4.JUnit4RunListenerFactory.createCustomListeners;
  import static org.apache.maven.surefire.common.junit4.Notifier.pureNotifier;
 @@ -126,7 +126,7 @@ public RunResult invoke( Object forkTestSet )
-             new Notifier( createRunListener( reporterFactory, consoleStream ), getSkipAfterFailureCount() );
+         Notifier notifier = new Notifier( listener, getSkipAfterFailureCount() );
          // startCapture() called in createRunListener() in prior to setTestsToRun()
 
 -        Filter filter = jUnit48Reflector.isJUnit48Available() ? createJUnit48Filter() : null;
 +        Filter filter = null;
 
          if ( testsToRun == null )
          {
-@@ -168,8 +168,7 @@ public RunResult invoke( Object forkTestSet )
+@@ -169,8 +169,7 @@ public RunResult invoke( Object forkTestSet )
                  {
                      Set<Description> failures = generateFailingTestDescriptions( testFailureListener.getAllFailures() );
                      testFailureListener.reset();
@@ -49,7 +48,7 @@ index 7c74e8b86..c86bb276c 100644
                      rerunCore.execute( testsToRun, failureDescriptionFilter );
                  }
              }
-@@ -270,24 +269,6 @@ private boolean isParallelTypes()
+@@ -271,24 +270,6 @@ private boolean isParallelTypes()
          return jUnitCoreParameters.isParallelClasses() || jUnitCoreParameters.isParallelSuites();
      }
 
@@ -75,10 +74,10 @@ index 7c74e8b86..c86bb276c 100644
      {
          TestsToRun scanned = scanResult.applyFilter( scannerFilter, testClassLoader );
 diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
-index 6bc30a300..05c55f55a 100644
+index 7ed1719a8..07d3ad33c 100644
 --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
 +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
-@@ -237,36 +237,9 @@ private static XmlMethodSelector createMethodNameFilteringSelector( TestListReso
+@@ -278,36 +278,9 @@ private static XmlMethodSelector createMethodNameFilteringSelector( TestListReso
      private static XmlMethodSelector createGroupMatchingSelector( Map<String, String> options )
          throws TestSetFailedException
      {
@@ -116,5 +115,5 @@ index 6bc30a300..05c55f55a 100644
 
      static void run( List<String> suiteFiles, String testSourceDirectory,
 -- 
-2.25.2
+2.35.1
 

patches/maven-surefire/0002-Port-to-current-maven-shared-utils.patch

@@ -0,0 +1,71 @@
+From 3d0dad9c32ce059b8f562e3c5bd754f6b3394a74 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Fri, 22 Apr 2022 00:28:31 +0200
+Subject: [PATCH 3/4] Port to JUnit 5.8.1
+
+Forwarded: no
+---
+ pom.xml                                            |  6 +++---
+ .../maven/surefire/junitplatform/LazyLauncher.java | 14 ++++++++++++++
+ 2 files changed, 17 insertions(+), 3 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index c261bf3c2..a75e156ce 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -250,17 +250,17 @@
+       <dependency>
+         <groupId>org.junit.platform</groupId>
+         <artifactId>junit-platform-launcher</artifactId>
+-        <version>1.3.2</version>
++        <version>1.8.1</version>
+       </dependency>
+       <dependency>
+         <groupId>org.junit.jupiter</groupId>
+         <artifactId>junit-jupiter-engine</artifactId>
+-        <version>5.3.2</version>
++        <version>5.8.1</version>
+       </dependency>
+       <dependency>
+         <groupId>org.junit.jupiter</groupId>
+         <artifactId>junit-jupiter-params</artifactId>
+-        <version>5.3.2</version>
++        <version>5.8.1</version>
+       </dependency>
+       <dependency>
+         <groupId>org.mockito</groupId>
+diff --git a/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/LazyLauncher.java b/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/LazyLauncher.java
+index 6a1a3b3b3..dee110e3c 100644
+--- a/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/LazyLauncher.java
++++ b/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/LazyLauncher.java
+@@ -21,6 +21,7 @@
+ 
+ import org.apache.maven.surefire.api.util.ReflectionUtils;
+ import org.junit.platform.launcher.Launcher;
++import org.junit.platform.launcher.LauncherDiscoveryListener;
+ import org.junit.platform.launcher.LauncherDiscoveryRequest;
+ import org.junit.platform.launcher.TestExecutionListener;
+ import org.junit.platform.launcher.TestPlan;
+@@ -55,6 +56,19 @@ public void execute( LauncherDiscoveryRequest launcherDiscoveryRequest,
+         launcher().execute( launcherDiscoveryRequest, testExecutionListeners );
+     }
+ 
++    @Override
++    public void execute( TestPlan testPlan,
++                         TestExecutionListener... testExecutionListeners )
++    {
++        launcher().execute( testPlan, testExecutionListeners );
++    }
++
++    @Override
++    public void registerLauncherDiscoveryListeners( LauncherDiscoveryListener... launcherDiscoveryListeners )
++    {
++        launcher().registerLauncherDiscoveryListeners( launcherDiscoveryListeners );
++    }
++
+     private Launcher launcher()
+     {
+         if ( launcher == null )
+-- 
+2.35.1
+