.gitignore

@@ -1 +1 @@
-SOURCES/maven-surefire-3.2.2.tar.gz
+SOURCES/maven-surefire-3.0.0~M4.tar.gz

.maven-surefire.metadata

@@ -1 +1 @@
-2d7ace5a359d5f72fbfc3c7689ee6820ee9d961e SOURCES/maven-surefire-3.2.2.tar.gz
+a9e95fafb958c17118687d8d6b088325abb6dc25 SOURCES/maven-surefire-3.0.0~M4.tar.gz

SOURCES/0001-Port-to-TestNG-6.11.patch

@@ -0,0 +1,40 @@
+From 85887dc85709e8719db0becc17adacd905dcd579 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/3] Port to TestNG 6.11
+
+---
+ surefire-providers/surefire-testng/pom.xml                     | 3 +--
+ .../maven/surefire/testng/conf/AbstractDirectConfigurator.java | 2 +-
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/surefire-providers/surefire-testng/pom.xml b/surefire-providers/surefire-testng/pom.xml
+index 1ce2888..bf93114 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>6.11</version>
+       <scope>provided</scope>
+     </dependency>
+   </dependencies>
+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 e966731..7021ef5 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 abstract class AbstractDirectConfigurator
+         testng.setUseDefaultListeners( false );
+         configureInstance( testng, options );
+         // TODO: we should have the Profile so that we can decide if this is needed or not
+-        testng.setListenerClasses( loadListenerClasses( listeners ) );
++        testng.setListenerClasses( ( List ) loadListenerClasses( listeners ) );
+     }
+ 
+     @Override
+-- 
+2.30.2
+

SOURCES/0001-Port-to-TestNG-7.4.0.patch

@@ -1,54 +0,0 @@
-From 749b5ec6d04904d82747b60f209945a917ec479e 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
-
----
- surefire-providers/surefire-testng/pom.xml                     | 3 +--
- .../maven/surefire/testng/conf/AbstractDirectConfigurator.java | 2 +-
- .../maven/surefire/testng/conf/TestNGMapConfigurator.java      | 2 +-
- 3 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/surefire-providers/surefire-testng/pom.xml b/surefire-providers/surefire-testng/pom.xml
-index 5cf9b2e..d23b123 100644
---- a/surefire-providers/surefire-testng/pom.xml
-+++ b/surefire-providers/surefire-testng/pom.xml
-@@ -54,8 +54,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>
-     <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 b73b9ba..ab187b6 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
-@@ -57,7 +57,7 @@ public void configure(TestNG testng, Map<String, String> options) throws TestSet
-         testng.setUseDefaultListeners(false);
-         configureInstance(testng, options);
-         // TODO: we should have the Profile so that we can decide if this is needed or not
--        testng.setListenerClasses(loadListenerClasses(listeners));
-+        testng.setListenerClasses((List)loadListenerClasses(listeners));
-     }
- 
-     @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 d91e76a..06dbd23 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
-@@ -71,7 +71,7 @@ protected void configureThreadCount(XmlSuite suite, Map<String, String> options)
-     protected void configureParallel(XmlSuite suite, Map<String, String> options) throws TestSetFailedException {
-         String parallel = options.get(PARALLEL_PROP);
-         if (parallel != null) {
--            suite.setParallel(parallel);
-+            suite.setParallel(XmlSuite.ParallelMode.getValidParallel(parallel));
-         }
-     }
- 
--- 
-2.43.0
-

SOURCES/0002-Disable-JUnit-4.8-test-grouping.patch

@@ -1,111 +1,118 @@
-From e953698dd68a09467fcaa4a390b61c580caefa96 Mon Sep 17 00:00:00 2001
+From 61a123e7dd146933570a252f147fa83666363de3 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Mon, 27 Apr 2020 10:45:30 +0200
-Subject: [PATCH 2/4] Disable JUnit 4.8 test grouping
+Subject: [PATCH 2/3] Disable JUnit 4.8 test grouping
 
 ---
- .../surefire/junitcore/JUnitCoreProvider.java | 21 +++------------
+ .../surefire/junitcore/JUnitCoreProvider.java | 25 +++--------------
- .../maven/surefire/testng/TestNGExecutor.java | 27 +------------------
+ .../maven/surefire/testng/TestNGExecutor.java | 27 -------------------
- 2 files changed, 4 insertions(+), 44 deletions(-)
+ 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 f2f58fe..c09c51e 100644
+index 7c74e8b..c86bb27 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
-@@ -39,7 +39,6 @@
+@@ -25,7 +25,6 @@ import org.apache.maven.surefire.booter.CommandReader;
  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.junit.runner.Description;
+ import org.apache.maven.surefire.providerapi.AbstractProvider;
-@@ -50,6 +49,7 @@
+@@ -47,6 +46,7 @@ import java.util.Set;
- import static org.apache.maven.surefire.api.report.RunMode.RERUN_TEST_AFTER_FAILURE;
+ import java.util.concurrent.ConcurrentHashMap;
- 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.booter.CommandReader.getReader;
 +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;
-@@ -118,7 +118,7 @@ public RunResult invoke(Object forkTestSet) throws TestSetFailedException {
+@@ -126,7 +126,7 @@ public class JUnitCoreProvider
-         Notifier notifier = new Notifier(listener, getSkipAfterFailureCount());
+             new Notifier( createRunListener( reporterFactory, consoleStream ), getSkipAfterFailureCount() );
          // startCapture() called in createRunListener() in prior to setTestsToRun()
  
 -        Filter filter = jUnit48Reflector.isJUnit48Available() ? createJUnit48Filter() : null;
 +        Filter filter = null;
  
-         if (testsToRun == null) {
+         if ( testsToRun == null )
-             setTestsToRun(forkTestSet);
+         {
-@@ -158,8 +158,7 @@ public RunResult invoke(Object forkTestSet) throws TestSetFailedException {
+@@ -168,8 +168,7 @@ public class JUnitCoreProvider
-                         i++) {
+                 {
-                     Set<Description> failures = generateFailingTestDescriptions(testFailureListener.getAllFailures());
+                     Set<Description> failures = generateFailingTestDescriptions( testFailureListener.getAllFailures() );
                      testFailureListener.reset();
--                    FilterFactory filterFactory = new FilterFactory(testClassLoader);
+-                    FilterFactory filterFactory = new FilterFactory( testClassLoader );
--                    Filter failureDescriptionFilter = filterFactory.createMatchAnyDescriptionFilter(failures);
+-                    Filter failureDescriptionFilter = filterFactory.createMatchAnyDescriptionFilter( failures );
-+                    Filter failureDescriptionFilter = createMatchAnyDescriptionFilter(failures);
++                    Filter failureDescriptionFilter = createMatchAnyDescriptionFilter( failures );
-                     rerunCore.execute(testsToRun, failureDescriptionFilter);
+                     rerunCore.execute( testsToRun, failureDescriptionFilter );
                  }
              }
-@@ -236,20 +235,6 @@ private boolean isParallelTypes() {
+@@ -270,24 +269,6 @@ public class JUnitCoreProvider
          return jUnitCoreParameters.isParallelClasses() || jUnitCoreParameters.isParallelSuites();
      }
  
--    private Filter createJUnit48Filter() {
+-    private Filter createJUnit48Filter()
--        final FilterFactory factory = new FilterFactory(testClassLoader);
+-    {
+-        final FilterFactory factory = new FilterFactory( testClassLoader );
 -        Map<String, String> props = providerParameters.getProviderProperties();
--        Filter groupFilter = factory.canCreateGroupFilter(props) ? factory.createGroupFilter(props) : null;
+-        Filter groupFilter = factory.canCreateGroupFilter( props ) ? factory.createGroupFilter( props ) : null;
--        TestListResolver methodFilter = optionallyWildcardFilter(testResolver);
+-        TestListResolver methodFilter = optionallyWildcardFilter( testResolver );
 -        boolean onlyGroups = methodFilter.isEmpty() || methodFilter.isWildcard();
--        if (onlyGroups) {
+-        if ( onlyGroups )
+-        {
 -            return groupFilter;
--        } else {
+-        }
--            Filter jUnitMethodFilter = factory.createMethodFilter(methodFilter);
+-        else
--            return groupFilter == null ? jUnitMethodFilter : factory.and(groupFilter, jUnitMethodFilter);
+-        {
+-            Filter jUnitMethodFilter = factory.createMethodFilter( methodFilter );
+-            return groupFilter == null ? jUnitMethodFilter : factory.and( groupFilter, jUnitMethodFilter );
 -        }
 -    }
 -
-     private TestsToRun scanClassPath() {
+     private TestsToRun scanClassPath()
-         TestsToRun scanned = scanResult.applyFilter(scannerFilter, testClassLoader);
+     {
-         return runOrderCalculator.orderTestClasses(scanned);
+         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 020212f..299b6bf 100644
+index 6bc30a3..05c55f5 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
-@@ -258,32 +258,7 @@ private static XmlMethodSelector createMethodNameFilteringSelector(TestListResol
+@@ -237,36 +237,9 @@ final class TestNGExecutor
-     @SuppressWarnings("checkstyle:magicnumber")
+     private static XmlMethodSelector createGroupMatchingSelector( Map<String, String> options )
-     private static XmlMethodSelector createGroupMatchingSelector(Map<String, String> options)
+         throws TestSetFailedException
-             throws TestSetFailedException {
+     {
--        final String groups = options.get(ProviderParameterNames.TESTNG_GROUPS_PROP);
+-        final String groups = options.get( ProviderParameterNames.TESTNG_GROUPS_PROP );
--        final String excludedGroups = options.get(ProviderParameterNames.TESTNG_EXCLUDEDGROUPS_PROP);
+-        final String excludedGroups = options.get( ProviderParameterNames.TESTNG_EXCLUDEDGROUPS_PROP );
 -
--        if (groups == null && excludedGroups == null) {
+-        if ( groups == null && excludedGroups == null )
--            return null;
+         {
--        }
+             return null;
+         }
 -
 -        // the class is available in the testClassPath
 -        final String clazzName = "org.apache.maven.surefire.testng.utils.GroupMatcherMethodSelector";
--        try {
+-        try
--            Class<?> clazz = Class.forName(clazzName);
+-        {
+-            Class<?> clazz = Class.forName( clazzName );
 -
 -            // HORRIBLE hack, but TNG doesn't allow us to setup a method selector instance directly.
--            Method method = clazz.getMethod("setGroups", String.class, String.class);
+-            Method method = clazz.getMethod( "setGroups", String.class, String.class );
--            method.invoke(null, groups, excludedGroups);
+-            method.invoke( null, groups, excludedGroups );
--        } catch (Exception e) {
+-        }
--            throw new TestSetFailedException(e.getMessage(), e);
+-        catch ( Exception e )
+-        {
+-            throw new TestSetFailedException( e.getMessage(), e );
 -        }
 -
 -        XmlMethodSelector xms = new XmlMethodSelector();
 -
--        xms.setName(clazzName);
+-        xms.setName( clazzName );
 -        // looks to need a high value
--        xms.setPriority(9999);
+-        xms.setPriority( 9999 );
 -
 -        return xms;
-+        return null;
      }
  
-     static void run(
+     static void run( List<String> suiteFiles, String testSourceDirectory,
 -- 
-2.43.0
+2.30.2
 

SOURCES/0003-Port-to-maven-shared-utils-3.3.3.patch

@@ -0,0 +1,152 @@
+From bc4f6405bb6ca0a5c0313edf878c51d5d5af9ffa Mon Sep 17 00:00:00 2001
+From: Marian Koncek <mkoncek@redhat.com>
+Date: Fri, 11 Sep 2020 12:17:15 +0200
+Subject: [PATCH 3/3] Port to maven-shared-utils 3.3.3
+
+---
+ .../DefaultForkConfiguration.java             | 26 ++++++++++++-------
+ .../surefire/report/StatelessXmlReporter.java | 20 +++++++-------
+ 2 files changed, 26 insertions(+), 20 deletions(-)
+
+diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java
+index 4ab4435..1ce348b 100644
+--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java
++++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java
+@@ -42,6 +42,8 @@ import static org.apache.maven.plugin.surefire.util.Relocator.relocate;
+ import static org.apache.maven.plugin.surefire.SurefireHelper.replaceThreadNumberPlaceholders;
+ import static org.apache.maven.surefire.booter.Classpath.join;
+ 
++import org.apache.maven.shared.utils.cli.CommandLineException;
++
+ /**
+  * Basic framework which constructs CLI.
+  *
+@@ -135,17 +137,21 @@ public abstract class DefaultForkConfiguration
+ 
+         cli.setExecutable( getJdkForTests().getJvmExecutable() );
+ 
+-        String jvmArgLine = newJvmArgLine( forkNumber );
+-        if ( !jvmArgLine.isEmpty() )
+-        {
+-            cli.createArg()
+-                    .setLine( jvmArgLine );
+-        }
++        try {
++            String jvmArgLine = newJvmArgLine( forkNumber );
++            if ( !jvmArgLine.isEmpty() )
++            {
++                cli.createArg()
++                        .setLine( jvmArgLine );
++            }
+ 
+-        if ( getDebugLine() != null && !getDebugLine().isEmpty() )
+-        {
+-            cli.createArg()
+-                    .setLine( getDebugLine() );
++            if ( getDebugLine() != null && !getDebugLine().isEmpty() )
++            {
++                cli.createArg()
++                        .setLine( getDebugLine() );
++            }
++        } catch (CommandLineException ex) {
++            throw new SurefireBooterForkException("", ex);
+         }
+ 
+         resolveClasspath( cli, findStartClass( config ), config, dumpLogDirectory );
+diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
+index fcb066e..bfe894e 100644
+--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
++++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
+@@ -200,7 +200,7 @@ public class StatelessXmlReporter
+     }
+ 
+     private void serializeTestClass( OutputStream outputStream, OutputStreamWriter fw, XMLWriter ppw,
+-                                     List<WrappedReportEntry> methodEntries )
++                                     List<WrappedReportEntry> methodEntries ) throws IOException
+     {
+         if ( rerunFailingTestsCount > 0 )
+         {
+@@ -215,7 +215,7 @@ public class StatelessXmlReporter
+     }
+ 
+     private void serializeTestClassWithoutRerun( OutputStream outputStream, OutputStreamWriter fw, XMLWriter ppw,
+-                                                 List<WrappedReportEntry> methodEntries )
++                                                 List<WrappedReportEntry> methodEntries ) throws IOException
+     {
+         for ( WrappedReportEntry methodEntry : methodEntries )
+         {
+@@ -231,7 +231,7 @@ public class StatelessXmlReporter
+     }
+ 
+     private void serializeTestClassWithRerun( OutputStream outputStream, OutputStreamWriter fw, XMLWriter ppw,
+-                                              List<WrappedReportEntry> methodEntries )
++                                              List<WrappedReportEntry> methodEntries ) throws IOException
+     {
+         WrappedReportEntry firstMethodEntry = methodEntries.get( 0 );
+         switch ( getTestResultType( methodEntries ) )
+@@ -369,7 +369,7 @@ public class StatelessXmlReporter
+         return new File( reportsDirectory, stripIllegalFilenameChars( customizedReportName + ".xml" ) );
+     }
+ 
+-    private void startTestElement( XMLWriter ppw, WrappedReportEntry report )
++    private void startTestElement( XMLWriter ppw, WrappedReportEntry report ) throws IOException
+     {
+         ppw.startElement( "testcase" );
+         String name = phrasedMethodName ? report.getReportName() : report.getName();
+@@ -390,7 +390,7 @@ public class StatelessXmlReporter
+         ppw.addAttribute( "time", report.elapsedTimeAsString() );
+     }
+ 
+-    private void createTestSuiteElement( XMLWriter ppw, WrappedReportEntry report, TestSetStats testSetStats )
++    private void createTestSuiteElement( XMLWriter ppw, WrappedReportEntry report, TestSetStats testSetStats ) throws IOException
+     {
+         ppw.startElement( "testsuite" );
+ 
+@@ -420,7 +420,7 @@ public class StatelessXmlReporter
+ 
+     private static void getTestProblems( OutputStreamWriter outputStreamWriter, XMLWriter ppw,
+                                          WrappedReportEntry report, boolean trimStackTrace, OutputStream fw,
+-                                         String testErrorType, boolean createOutErrElementsInside )
++                                         String testErrorType, boolean createOutErrElementsInside ) throws IOException
+     {
+         ppw.startElement( testErrorType );
+ 
+@@ -477,7 +477,7 @@ public class StatelessXmlReporter
+ 
+     // Create system-out and system-err elements
+     private static void createOutErrElements( OutputStreamWriter outputStreamWriter, XMLWriter ppw,
+-                                              WrappedReportEntry report, OutputStream fw )
++                                              WrappedReportEntry report, OutputStream fw ) throws IOException
+     {
+         EncodingOutputStream eos = new EncodingOutputStream( fw );
+         addOutputStreamElement( outputStreamWriter, eos, ppw, report.getStdout(), "system-out" );
+@@ -487,7 +487,7 @@ public class StatelessXmlReporter
+     private static void addOutputStreamElement( OutputStreamWriter outputStreamWriter,
+                                          EncodingOutputStream eos, XMLWriter xmlWriter,
+                                          Utf8RecodingDeferredFileOutputStream utf8RecodingDeferredFileOutputStream,
+-                                         String name )
++                                         String name ) throws IOException
+     {
+         if ( utf8RecodingDeferredFileOutputStream != null && utf8RecodingDeferredFileOutputStream.getByteCount() > 0 )
+         {
+@@ -517,7 +517,7 @@ public class StatelessXmlReporter
+      *
+      * @param xmlWriter The test suite to report to
+      */
+-    private static void showProperties( XMLWriter xmlWriter, Map<String, String> systemProperties )
++    private static void showProperties( XMLWriter xmlWriter, Map<String, String> systemProperties ) throws IOException
+     {
+         xmlWriter.startElement( "properties" );
+         for ( final Entry<String, String> entry : systemProperties.entrySet() )
+@@ -559,7 +559,7 @@ public class StatelessXmlReporter
+      * @param message   The string
+      */
+     private static void extraEscapeElementValue( String message, OutputStreamWriter outputStreamWriter,
+-                                                 XMLWriter xmlWriter, OutputStream fw )
++                                                 XMLWriter xmlWriter, OutputStream fw ) throws IOException
+     {
+         // Someday convert to xml 1.1 which handles everything but 0 inside string
+         if ( containsEscapesIllegalXml10( message ) )
+-- 
+2.30.2
+

SPECS/maven-surefire.spec

@@ -1,13 +1,12 @@
 %bcond_with bootstrap
 
 Name:           maven-surefire
-Version:        3.2.2
+Version:        3.0.0~M4
-Release:        6%{?dist}
+Release:        5%{?dist}
 Summary:        Test framework project
-License:        Apache-2.0 AND CPL-1.0
+License:        ASL 2.0 and CPL
 URL:            https://maven.apache.org/surefire/
 BuildArch:      noarch
-ExclusiveArch:  %{java_arches} noarch
 
 %global upstream_version %(echo '%{version}' | tr '~' '-')
 
@@ -17,36 +16,38 @@ Source0:        %{name}-%{version}.tar.gz
 Source1:        generate-tarball.sh
 Source2:        https://junit.sourceforge.net/cpl-v10.html
 
-Patch1:         0001-Port-to-TestNG-7.4.0.patch
+Patch1:         0001-Port-to-TestNG-6.11.patch
 Patch2:         0002-Disable-JUnit-4.8-test-grouping.patch
+Patch3:         0003-Port-to-maven-shared-utils-3.3.3.patch
 
+BuildRequires:  maven-local
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
-BuildRequires:  maven-local
 BuildRequires:  mvn(com.google.code.findbugs:jsr305)
 BuildRequires:  mvn(commons-io:commons-io)
 BuildRequires:  mvn(junit:junit)
-BuildRequires:  mvn(org.apache.commons:commons-compress)
 BuildRequires:  mvn(org.apache.commons:commons-lang3)
 BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-assembly-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-dependency-plugin)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin) >= 3.6.4
+BuildRequires:  mvn(org.apache.maven.plugins:maven-failsafe-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
 BuildRequires:  mvn(org.apache.maven.shared:maven-common-artifact-filters)
 BuildRequires:  mvn(org.apache.maven.shared:maven-shared-utils)
+BuildRequires:  mvn(org.apache.maven:maven-artifact)
 BuildRequires:  mvn(org.apache.maven:maven-core)
+BuildRequires:  mvn(org.apache.maven:maven-model)
 BuildRequires:  mvn(org.apache.maven:maven-parent:pom:)
 BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-java)
-BuildRequires:  mvn(org.eclipse.aether:aether-util)
-BuildRequires:  mvn(org.eclipse.sisu:sisu-maven-plugin)
 BuildRequires:  mvn(org.fusesource.jansi:jansi)
 BuildRequires:  mvn(org.junit.platform:junit-platform-launcher)
 BuildRequires:  mvn(org.testng:testng)
 BuildRequires:  mvn(org.testng:testng::jdk15:)
 %endif
 
+
 # PpidChecker relies on /usr/bin/ps to check process uptime
 Requires:       procps-ng
 
@@ -110,8 +111,9 @@ Javadoc for %{name}.
 %setup -q -n surefire-%{upstream_version}
 cp -p %{SOURCE2} .
 
-%patch 1 -p1
+%patch1 -p1
-%patch 2 -p1
+%patch2 -p1
+%patch3 -p1
 
 # Disable strict doclint
 sed -i /-Xdoclint:all/d pom.xml
@@ -120,8 +122,9 @@ sed -i /-Xdoclint:all/d pom.xml
 %pom_disable_module surefire-report-parser
 %pom_disable_module surefire-shadefire
 
+%pom_remove_dep :maven-toolchain maven-surefire-common
+
 %pom_disable_module surefire-grouper
-%pom_remove_dep org.junit:junit-bom
 %pom_remove_dep :surefire-grouper surefire-providers/common-junit48
 %pom_remove_dep :surefire-grouper surefire-providers/surefire-testng-utils
 rm surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/{FilterFactory,GroupMatcherCategoryFilter}.java
@@ -137,13 +140,11 @@ rm surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/suref
 %pom_remove_plugin -r :jacoco-maven-plugin
 # Not wanted
 %pom_remove_plugin -r :maven-shade-plugin
-
-find -name *.java -exec sed -i -e s/org.apache.maven.surefire.shared.utils/org.apache.maven.shared.utils/ -e s/org.apache.maven.surefire.shared.io/org.apache.commons.io/ -e s/org.apache.maven.surefire.shared.lang3/org.apache.commons.lang3/ -e s/org.apache.maven.surefire.shared.compress/org.apache.commons.compress/ {} \;
-
 # Not in Fedora
 %pom_remove_plugin -r :animal-sniffer-maven-plugin
 # Complains
 %pom_remove_plugin -r :apache-rat-plugin
+%pom_remove_plugin -r :maven-enforcer-plugin
 # We don't need site-source
 %pom_remove_plugin :maven-assembly-plugin maven-surefire-plugin
 %pom_remove_dep -r ::::site-source
@@ -154,7 +155,7 @@ find -name *.java -exec sed -i -e s/org.apache.maven.surefire.shared.utils/org.a
 %mvn_package ":*{junit,testng,failsafe-plugin}*"  @1
 %mvn_package ":*tests*" __noinstall
 # tests turned off because they need jmock
-%mvn_build -f
+%mvn_build -f -- -DcommonsIoVersion=2.8.0 -DcommonsLang3Version=3.11
 
 %install
 %mvn_install
@@ -173,57 +174,15 @@ find -name *.java -exec sed -i -e s/org.apache.maven.surefire.shared.utils/org.a
 %license LICENSE NOTICE cpl-v10.html
 
 %changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.2.2-6
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.0.0~M4-5
-- Bump release for October 2024 mass rebuild:
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Resolves: RHEL-64018
+  Related: rhbz#1991688
-
-* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 3.2.2-5
-- Bump release for Aug 2024 java mass rebuild
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3.2.2-4
-- Bump release for June 2024 mass rebuild
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Dec 13 2023 Marian Koncek <mkoncek@redhat.com> - 3.2.2-1
-- Update to upstream version 3.2.2
-
-* Sat Sep 02 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0~M6-7
-- Rebuild
-
-* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0~M6-6
-- Convert License tag to SPDX format
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0~M6-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0~M6-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0~M6-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Apr 28 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0~M6-2
-- Remove workaround for maven-plugin-tools issue
-
-* Thu Apr 21 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0~M6-1
-- Update to upstream 3.0.0-M6 milestone snapshot
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 3.0.0~M4-6
-- Rebuilt for java-17-openjdk as system jdk
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0~M4-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
-* Tue Nov 09 2021 Marian Koncek <mkoncek@redhat.com> - 3.0.0~M4-4
+* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0~M4-4
-- Port to TestNG 7.4.0
+- Rebuild to workaround DistroBaker issue
 
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0~M4-3
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0~M4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+- Bootstrap Maven for CentOS Stream 9
 
 * Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0~M4-2
 - Bootstrap build