9 changed files with 339 additions and 163 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +0,0 @@
-SOURCES/maven-surefire-3.0.0-M3.tar.gz
--- a/.maven-surefire.metadata
+++ b/.maven-surefire.metadata
@ -1 +1,2 @@
-aa431c17c3667c58c9895ae845aa566f6336c7ba SOURCES/maven-surefire-3.0.0-M3.tar.gz
+6eb84a0adf63101afb8ea09af866c5c4bc484f75 SOURCES/generate-tarball.sh
+9dbfe895fd5dbb4dd337096b6dfb9558021f2fc1 SOURCES/maven-surefire-3.0.0~M6.tar.gz
--- a/SOURCES/0001-Port-to-TestNG-6.11.patch
+++ b/SOURCES/0001-Port-to-TestNG-6.11.patch
@ -1,40 +0,0 @@
-From 69c97f47a7bbec601b407cd2cd81aee64507e562 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/2] 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 49e75b6e..a9db4a8d 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 e9667316..7021ef56 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 )
-         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.20.1
-
--- a/SOURCES/0001-Port-to-TestNG-7.4.0.patch
+++ b/SOURCES/0001-Port-to-TestNG-7.4.0.patch
@ -0,0 +1,54 @@
+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 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>
+         <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 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 )
+         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 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 )
+         String parallel = options.get( PARALLEL_PROP );
+         if ( parallel != null )
+         {
+-            suite.setParallel( parallel );
+            suite.setParallel( XmlSuite.ParallelMode.getValidParallel( parallel ) );
+         }
+     }
+ 
+-- 
+2.35.1
+
--- a/SOURCES/0002-Disable-JUnit-4.8-test-grouping.patch
+++ b/SOURCES/0002-Disable-JUnit-4.8-test-grouping.patch
@ -0,0 +1,118 @@
+From e953698dd68a09467fcaa4a390b61c580caefa96 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
+
+---
+ .../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 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
+@@ -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.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 )
+         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 )
+         {
+@@ -169,8 +169,7 @@ public RunResult invoke( Object forkTestSet )
+                 {
+                     Set<Description> failures = generateFailingTestDescriptions( testFailureListener.getAllFailures() );
+                     testFailureListener.reset();
+-                    FilterFactory filterFactory = new FilterFactory( testClassLoader );
+-                    Filter failureDescriptionFilter = filterFactory.createMatchAnyDescriptionFilter( failures );
+                    Filter failureDescriptionFilter = createMatchAnyDescriptionFilter( failures );
+                     rerunCore.execute( testsToRun, failureDescriptionFilter );
+                 }
+             }
+@@ -271,24 +270,6 @@ private boolean isParallelTypes()
+         return jUnitCoreParameters.isParallelClasses() || jUnitCoreParameters.isParallelSuites();
+     }
+ 
+-    private Filter createJUnit48Filter()
+-    {
+-        final FilterFactory factory = new FilterFactory( testClassLoader );
+-        Map<String, String> props = providerParameters.getProviderProperties();
+-        Filter groupFilter = factory.canCreateGroupFilter( props ) ? factory.createGroupFilter( props ) : null;
+-        TestListResolver methodFilter = optionallyWildcardFilter( testResolver );
+-        boolean onlyGroups = methodFilter.isEmpty() || methodFilter.isWildcard();
+-        if ( onlyGroups )
+-        {
+-            return groupFilter;
+-        }
+-        else
+-        {
+-            Filter jUnitMethodFilter = factory.createMethodFilter( methodFilter );
+-            return groupFilter == null ? jUnitMethodFilter : factory.and( groupFilter, jUnitMethodFilter );
+-        }
+-    }
+-
+     private TestsToRun scanClassPath()
+     {
+         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 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
+@@ -278,36 +278,9 @@ private static XmlMethodSelector createMethodNameFilteringSelector( TestListReso
+     private static XmlMethodSelector createGroupMatchingSelector( Map<String, String> options )
+         throws TestSetFailedException
+     {
+-        final String groups = options.get( ProviderParameterNames.TESTNG_GROUPS_PROP );
+-        final String excludedGroups = options.get( ProviderParameterNames.TESTNG_EXCLUDEDGROUPS_PROP );
+-
+-        if ( groups == null && excludedGroups == null )
+         {
+             return null;
+         }
+-
+-        // the class is available in the testClassPath
+-        final String clazzName = "org.apache.maven.surefire.testng.utils.GroupMatcherMethodSelector";
+-        try
+-        {
+-            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.invoke( null, groups, excludedGroups );
+-        }
+-        catch ( Exception e )
+-        {
+-            throw new TestSetFailedException( e.getMessage(), e );
+-        }
+-
+-        XmlMethodSelector xms = new XmlMethodSelector();
+-
+-        xms.setName( clazzName );
+-        // looks to need a high value
+-        xms.setPriority( 9999 );
+-
+-        return xms;
+     }
+ 
+     static void run( List<String> suiteFiles, String testSourceDirectory,
+-- 
+2.35.1
+
--- a/SOURCES/0002-Port-to-current-maven-shared-utils.patch
+++ b/SOURCES/0002-Port-to-current-maven-shared-utils.patch
@ -1,70 +0,0 @@
-From a96b8f5dd6d7fc51d9056c93bd08635e06957ea5 Mon Sep 17 00:00:00 2001
-From: Michael Simacek <msimacek@redhat.com>
-Date: Fri, 16 Mar 2018 13:45:01 +0100
-Subject: [PATCH 2/2] Port to current maven-shared-utils
-
---
- .../plugin/surefire/report/StatelessXmlReporter.java | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-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 b89c4e9b..8cf0b60c 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
-@@ -326,7 +326,7 @@ private static File getReportFile( ReportEntry report, File reportsDirectory, St
-     }
- 
-     private static void startTestElement( XMLWriter ppw, WrappedReportEntry report, String reportNameSuffix,
-                                          String timeAsString )
-+                                          String timeAsString ) throws IOException
-     {
-         ppw.startElement( "testcase" );
-         ppw.addAttribute( "name", report.getReportName() );
-@@ -349,7 +349,7 @@ private static void startTestElement( XMLWriter ppw, WrappedReportEntry report,
-     }
- 
-     private void createTestSuiteElement( XMLWriter ppw, WrappedReportEntry report, TestSetStats testSetStats,
-                                         String timeAsString )
-+                                         String timeAsString ) throws IOException
-     {
-         ppw.startElement( "testsuite" );
- 
-@@ -377,7 +377,7 @@ private void createTestSuiteElement( XMLWriter ppw, WrappedReportEntry report, T
- 
-     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 );
- 
-@@ -434,7 +434,7 @@ private static void getTestProblems( OutputStreamWriter outputStreamWriter, XMLW
- 
-     // 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" );
-@@ -444,7 +444,7 @@ private static void createOutErrElements( OutputStreamWriter outputStreamWriter,
-     private static void addOutputStreamElement( OutputStreamWriter outputStreamWriter,
-                                          EncodingOutputStream eos, XMLWriter xmlWriter,
-                                          Utf8RecodingDeferredFileOutputStream utf8RecodingDeferredFileOutputStream,
-                                         String name )
-+                                         String name ) throws IOException
-     {
-         if ( utf8RecodingDeferredFileOutputStream != null && utf8RecodingDeferredFileOutputStream.getByteCount() > 0 )
-         {
-@@ -474,7 +474,7 @@ private static void addOutputStreamElement( OutputStreamWriter outputStreamWrite
-      *
-      * @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() )
-- 
-2.20.1
-
--- a/SOURCES/0003-Port-to-JUnit-5.8.1.patch
+++ b/SOURCES/0003-Port-to-JUnit-5.8.1.patch
@ -0,0 +1,70 @@
+From 56f22fd719fe464c8a080e710de847983bb65ac1 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
+
+---
+ 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
+
--- a/SOURCES/generate-tarball.sh
+++ b/SOURCES/generate-tarball.sh
@ -1,25 +0,0 @@
-#!/bin/bash
-set -e
-
-name=maven-surefire
-if [[ -n "$1" ]]; then
-    version="$1"
-else
-    version="$(sed -n 's/Version:\s*//p' *.spec)"
-fi
-
-# RETRIEVE
-wget "http://repo2.maven.org/maven2/org/apache/maven/surefire/surefire/${version}/surefire-${version}-source-release.zip" -O "${name}-${version}.orig.zip"
-
-rm -rf tarball-tmp
-mkdir tarball-tmp
-cd tarball-tmp
-unzip "../${name}-${version}.orig.zip"
-
-# CLEAN TARBALL
-find -name '*.jar' -delete
-find -name '*.class' -delete
-
-tar czf "../${name}-${version}.tar.gz" *
-cd ..
-rm -r tarball-tmp "${name}-${version}.orig.zip"
--- a/SPECS/maven-surefire.spec
+++ b/SPECS/maven-surefire.spec
@ -1,45 +1,50 @@
+%bcond_with bootstrap
+
 Name:           maven-surefire
-Version:        3.0.0~M3
-Release:        4%{?dist}
+Version:        3.0.0~M6
+Release:        3%{?dist}
 Summary:        Test framework project
 License:        ASL 2.0 and CPL
-URL:            http://maven.apache.org/surefire/
+URL:            https://maven.apache.org/surefire/
 BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch

-# ./generate-tarball.sh 3.0.0-M3
-Source0:        %{name}-3.0.0-M3.tar.gz
+%global upstream_version %(echo '%{version}' | tr '~' '-')
+
+# ./generate-tarball.sh
+Source0:        %{name}-%{version}.tar.gz
 # Remove bundled binaries which cannot be easily verified for licensing
 Source1:        generate-tarball.sh
-Source2:        http://junit.sourceforge.net/cpl-v10.html
+Source2:        https://junit.sourceforge.net/cpl-v10.html

-Patch1:         0001-Port-to-TestNG-6.11.patch
-Patch2:         0002-Port-to-current-maven-shared-utils.patch
+Patch1:         0001-Port-to-TestNG-7.4.0.patch
+Patch2:         0002-Disable-JUnit-4.8-test-grouping.patch
+Patch3:         0003-Port-to-JUnit-5.8.1.patch

+%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-failsafe-plugin)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-shade-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin) >= 3.6.4
 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.apache.maven:maven-toolchain)
-BuildRequires:  mvn(org.codehaus.mojo:javacc-maven-plugin)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-java)
 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
@ -49,7 +54,7 @@ Requires:       procps-ng
 Surefire is a test framework project.

 %package plugin
-Summary:                Surefire plugin for maven
+Summary:        Surefire plugin for maven
 Requires:       (%{name}-provider-junit = %{version}-%{release} if junit)
 Requires:       (%{name}-provider-junit5 = %{version}-%{release} if junit5)
 Requires:       (%{name}-provider-testng = %{version}-%{release} if testng)
@ -58,25 +63,25 @@ Requires:       (%{name}-provider-testng = %{version}-%{release} if testng)
 Maven surefire plugin for running tests via the surefire framework.

 %package provider-junit
-Summary:                JUnit provider for Maven Surefire
+Summary:        JUnit provider for Maven Surefire

 %description provider-junit
 JUnit provider for Maven Surefire.

 %package provider-junit5
-Summary:                JUnit 5 provider for Maven Surefire
+Summary:        JUnit 5 provider for Maven Surefire

 %description provider-junit5
 JUnit 5 provider for Maven Surefire.

 %package provider-testng
-Summary:                TestNG provider for Maven Surefire
+Summary:        TestNG provider for Maven Surefire

 %description provider-testng
 TestNG provider for Maven Surefire.

 %package -n maven-failsafe-plugin
-Summary:                Maven plugin for running integration tests
+Summary:        Maven plugin for running integration tests

 %description -n maven-failsafe-plugin
 The Failsafe Plugin is designed to run integration tests while the
@ -96,17 +101,18 @@ integration-test phase thus enabling the post-integration-test phase
 to execute.

 %package javadoc
-Summary:          Javadoc for %{name}
+Summary:        Javadoc for %{name}

 %description javadoc
 Javadoc for %{name}.

 %prep
-%setup -q -n surefire-3.0.0-M3
+%setup -q -n surefire-%{upstream_version}
 cp -p %{SOURCE2} .

 %patch1 -p1
 %patch2 -p1
+%patch3 -p1

 # Disable strict doclint
 sed -i /-Xdoclint:all/d pom.xml
@ -115,6 +121,12 @@ sed -i /-Xdoclint:all/d pom.xml
 %pom_disable_module surefire-report-parser
 %pom_disable_module surefire-shadefire

+%pom_disable_module surefire-grouper
+%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
+rm surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java
+
 %pom_remove_dep -r org.apache.maven.surefire:surefire-shadefire

 # Help plugin is needed only to evaluate effective Maven settings.
@ -123,17 +135,19 @@ sed -i /-Xdoclint:all/d pom.xml

 # QA plugin useful only for upstream
 %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

-
 %build
 %mvn_package ":*{surefire-plugin}*" @1
 %mvn_package ":*junit-platform*" junit5
@ -145,7 +159,6 @@ sed -i /-Xdoclint:all/d pom.xml
 %install
 %mvn_install

-
 %files -f .mfiles
 %doc README.md
 %license LICENSE NOTICE cpl-v10.html
@ -160,12 +173,65 @@ sed -i /-Xdoclint:all/d pom.xml
 %license LICENSE NOTICE cpl-v10.html

 %changelog
+* 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
+- Port to TestNG 7.4.0
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0~M4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0~M4-2
+- Bootstrap build
+- Non-bootstrap build
+
+* Fri May 14 2021 Marian Koncek <mkoncek@redhat.com> - 3.0.0~M4-1
+- Update to upstream version 3.0.0~M4
+
+* Fri Feb 05 2021 Fabio Valentini <decathorpe@gmail.com> - 0:3.0.0~M4-1
+- Update to version 3.0.0-M4.
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.22.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Dec 15 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.22.0-10
+- Add boolean dependencies between plugin and provider subpackages
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.22.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 0:2.22.0-8
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Wed Mar 25 2020 Severin Gehwolf <sgehwolf@redhat.com> - 0:2.22.0-7
+- Add maven-compat dependency in maven-surefire-common for ArtifactResolver
+  class.
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.22.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0~M3-4
 - Mass rebuild for javapackages-tools 201902

 * Mon Oct 28 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0~M3-3
 - Enable JUnit 5 provider

+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.22.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0~M3-2
 - Mass rebuild for javapackages-tools 201901

@ -175,6 +241,9 @@ sed -i /-Xdoclint:all/d pom.xml
 * Sat Apr 13 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0-0.1.M3
 - Update to upstream 3.0.0-M3 milestone snapshot

+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.22.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Tue Jul 31 2018 Michael Simacek <msimacek@redhat.com> - 0:2.22.0-3
 - Repack the tarball without binaries