Bootstrap Maven as non-modular packages

Resolves: rhbz#1951482

.gitignore

@@ -30,3 +30,4 @@
 /maven-surefire-2.22.0.tar.gz
 /maven-surefire-3.0.0-M3.tar.gz
 /maven-surefire-3.0.0-M4.tar.gz
+/maven-surefire-3.0.0~M4.tar.gz

0001-Port-to-TestNG-6.11.patch

@@ -1,7 +1,7 @@
-From 69c97f47a7bbec601b407cd2cd81aee64507e562 Mon Sep 17 00:00:00 2001
+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/2] Port to TestNG 6.11
+Subject: [PATCH 1/3] Port to TestNG 6.11
 
 ---
  surefire-providers/surefire-testng/pom.xml                     | 3 +--
@@ -9,7 +9,7 @@ Subject: [PATCH 1/2] Port to TestNG 6.11
  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
+index 1ce2888..bf93114 100644
 --- a/surefire-providers/surefire-testng/pom.xml
 +++ b/surefire-providers/surefire-testng/pom.xml
 @@ -51,8 +51,7 @@
@@ -23,10 +23,10 @@ index 49e75b6e..a9db4a8d 100644
      </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
+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 void configure( TestNG testng, Map<String, String> options )
+@@ -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
@@ -36,5 +36,5 @@ index e9667316..7021ef56 100644
  
      @Override
 -- 
-2.20.1
+2.30.2
 

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

@@ -0,0 +1,118 @@
+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/3] 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 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
+@@ -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.apache.maven.surefire.providerapi.AbstractProvider;
+@@ -47,6 +46,7 @@ import java.util.Set;
+ import java.util.concurrent.ConcurrentHashMap;
+ 
+ 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;
+@@ -126,7 +126,7 @@ public class JUnitCoreProvider
+             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 )
+         {
+@@ -168,8 +168,7 @@ public class JUnitCoreProvider
+                 {
+                     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 );
+                 }
+             }
+@@ -270,24 +269,6 @@ public class JUnitCoreProvider
+         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 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
+@@ -237,36 +237,9 @@ final class TestNGExecutor
+     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.30.2
+

0003-Fix-broken-Javadocs.patch

@@ -1,32 +0,0 @@
-diff --git a/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java b/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
-index 4bc3b6d..bb17474 100644
---- a/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
-+++ b/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
-@@ -65,7 +65,6 @@ public class SurefirePlugin
-     @Parameter( defaultValue = "${project.build.directory}/surefire-reports" )
-     private File reportsDirectory;
- 
--    @SuppressWarnings( "checkstyle:linelength" )
-     /**
-      * Specify this parameter to run individual tests by file name, overriding the parameter {@code includes} and
-      * {@code excludes}. Each pattern you specify here will be used to create an include pattern formatted like
-@@ -179,7 +178,6 @@ public class SurefirePlugin
-     @Parameter( property = "surefire.parallel.forcedTimeout" )
-     private double parallelTestsTimeoutForcedInSeconds;
- 
--    @SuppressWarnings( "checkstyle:linelength" )
-     /**
-      * A list of <include> elements specifying the tests (by pattern) that should be included in testing. When not
-      * specified and when the {@code test} parameter is not specified, the default includes will be
-@@ -195,10 +193,9 @@ public class SurefirePlugin
-      * &nbsp;&lt;include&gt; entries.<br>
-      * Since 2.19 a complex syntax is supported in one parameter (JUnit 4, JUnit 4.7+, TestNG):
-      * <pre><code>
--     *
--     * </code></pre>
-      * {@literal <include>}%regex[.*[Cat|Dog].*], Basic????, !Unstable*{@literal </include>}
-      * {@literal <include>}%regex[.*[Cat|Dog].*], !%regex[pkg.*Slow.*.class], pkg{@literal /}**{@literal /}*Fast*.java{@literal </include>}
-+     * </code></pre>
-      * <br>
-      * This parameter is ignored if the TestNG {@code suiteXmlFiles} parameter is specified.<br>
-      * <br>

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

@@ -1,3 +1,58 @@
+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
@@ -92,3 +147,6 @@ index fcb066e..bfe894e 100644
      {
          // Someday convert to xml 1.1 which handles everything but 0 inside string
          if ( containsEscapesIllegalXml10( message ) )
+-- 
+2.30.2
+

generate-tarball.sh

@@ -2,14 +2,11 @@
 set -e
 
 name=maven-surefire
-if [[ -n "$1" ]]; then
+version="$(sed -n 's/Version:\s*//p' *.spec)"
-    version="$1"
+upstream_version="${version/'~'/'-'}"
-else
-    version="$(sed -n 's/Version:\s*//p' *.spec)"
-fi
 
 # RETRIEVE
-wget "https://repo1.maven.org/maven2/org/apache/maven/surefire/surefire/${version}/surefire-${version}-source-release.zip" -O "${name}-${version}.orig.zip"
+wget "https://repo1.maven.org/maven2/org/apache/maven/surefire/surefire/${upstream_version}/surefire-${upstream_version}-source-release.zip" -O "${name}-${version}.orig.zip"
 
 rm -rf tarball-tmp
 mkdir tarball-tmp

maven-surefire.spec

@@ -1,68 +1,57 @@
-%bcond_without  junit5
+# Workaround for rhbz#1969370: __bootstrap macro is not defined in
+# CentOS Stream, See https://bugzilla.redhat.com/1969370
+%global __bootstrap ~bootstrap
+
+%bcond_without bootstrap
 
 Name:           maven-surefire
-Epoch:          0
 Version:        3.0.0~M4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Test framework project
 License:        ASL 2.0 and CPL
+URL:            https://maven.apache.org/surefire/
+BuildArch:      noarch
 
 %global upstream_version %(echo '%{version}' | tr '~' '-')
 
-URL:            http://maven.apache.org/surefire/
+# ./generate-tarball.sh
-
+Source0:        %{name}-%{version}.tar.gz
-# ./generate-tarball.sh 3.0.0-M4
-Source0:        %{name}-%{upstream_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
+Patch2:         0002-Disable-JUnit-4.8-test-grouping.patch
-Patch3:         0003-Fix-broken-Javadocs.patch
+Patch3:         0003-Port-to-maven-shared-utils-3.3.3.patch
-
-BuildArch:      noarch
 
 BuildRequires:  maven-local
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  mvn(com.google.code.findbugs:jsr305)
-BuildRequires:  mvn(commons-codec:commons-codec)
 BuildRequires:  mvn(commons-io:commons-io)
-BuildRequires:  mvn(commons-lang:commons-lang)
 BuildRequires:  mvn(junit:junit)
-BuildRequires:  mvn(org.apache.commons:commons-compress)
 BuildRequires:  mvn(org.apache.commons:commons-lang3)
-BuildRequires:  mvn(org.apache.maven.doxia:doxia-core)
-BuildRequires:  mvn(org.apache.maven.doxia:doxia-decoration-model)
-BuildRequires:  mvn(org.apache.maven.doxia:doxia-sink-api)
-BuildRequires:  mvn(org.apache.maven.doxia:doxia-site-renderer)
 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.reporting:maven-reporting-api)
-BuildRequires:  mvn(org.apache.maven.reporting:maven-reporting-impl)
-BuildRequires:  mvn(org.apache.maven.shared:maven-artifact-transfer)
 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-compat)
+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:build-helper-maven-plugin)
-BuildRequires:  mvn(org.codehaus.mojo:javacc-maven-plugin)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-component-annotations)
 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:)
-
-%if %{with junit5}
-BuildRequires:  mvn(org.junit.platform:junit-platform-launcher)
 %endif
 
+
 # PpidChecker relies on /usr/bin/ps to check process uptime
 Requires:       procps-ng
 
@@ -71,34 +60,24 @@ Surefire is a test framework project.
 
 %package plugin
 Summary:        Surefire plugin for maven
-Requires:       (%{name}-provider-junit = %{epoch}:%{version}-%{release} if junit)
+Requires:       (%{name}-provider-junit = %{version}-%{release} if junit)
-Requires:       (%{name}-provider-testng = %{epoch}:%{version}-%{release} if testng)
+Requires:       (%{name}-provider-junit5 = %{version}-%{release} if junit5)
-%if %{with junit5}
+Requires:       (%{name}-provider-testng = %{version}-%{release} if testng)
-Requires:       (%{name}-provider-junit5 = %{epoch}:%{version}-%{release} if junit5)
-%endif
 
 %description plugin
 Maven surefire plugin for running tests via the surefire framework.
 
-%package report-plugin
-Summary:        Surefire reports plugin for maven
-
-%description report-plugin
-Plugin for generating reports from surefire test runs.
-
 %package provider-junit
 Summary:        JUnit provider for Maven Surefire
 
 %description provider-junit
 JUnit provider for Maven Surefire.
 
-%if %{with junit5}
 %package provider-junit5
 Summary:        JUnit 5 provider for Maven Surefire
 
 %description provider-junit5
 JUnit 5 provider for Maven Surefire.
-%endif
 
 %package provider-testng
 Summary:        TestNG provider for Maven Surefire
@@ -106,12 +85,6 @@ Summary:        TestNG provider for Maven Surefire
 %description provider-testng
 TestNG provider for Maven Surefire.
 
-%package report-parser
-Summary:        Parses report output files from surefire
-
-%description report-parser
-Plugin for parsing report output files from surefire.
-
 %package -n maven-failsafe-plugin
 Summary:        Maven plugin for running integration tests
 
@@ -149,11 +122,17 @@ cp -p %{SOURCE2} .
 # Disable strict doclint
 sed -i /-Xdoclint:all/d pom.xml
 
+%pom_disable_module maven-surefire-report-plugin
+%pom_disable_module surefire-report-parser
 %pom_disable_module surefire-shadefire
 
-%if %{without junit5}
+%pom_remove_dep :maven-toolchain maven-surefire-common
-%pom_disable_module surefire-junit-platform surefire-providers
+
-%endif
+%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
 
@@ -163,29 +142,24 @@ 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
 # 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
 
-# This package needs maven compat for ArtifactResolver class
-%pom_add_dep org.apache.maven:maven-compat maven-surefire-common
-
-%mvn_package ":*{surefire-plugin,report-plugin}*" @1
-%mvn_package ":*junit-platform*" junit5
-%mvn_package ":*{junit,testng,failsafe-plugin,report-parser}*"  @1
-%mvn_package ":*tests*" __noinstall
-
 %build
-# tests are disabled because of unpackaged dependencies (fest-assert, etc.)
+%mvn_package ":*{surefire-plugin}*" @1
-%mvn_build -f
+%mvn_package ":*junit-platform*" junit5
+%mvn_package ":*{junit,testng,failsafe-plugin}*"  @1
+%mvn_package ":*tests*" __noinstall
+# tests turned off because they need jmock
+%mvn_build -f -- -DcommonsIoVersion=2.8.0 -DcommonsLang3Version=3.11
 
 %install
 %mvn_install
@@ -195,21 +169,24 @@ sed -i /-Xdoclint:all/d pom.xml
 %license LICENSE NOTICE cpl-v10.html
 
 %files plugin -f .mfiles-surefire-plugin
-%files report-plugin -f .mfiles-report-plugin
-%files report-parser -f .mfiles-report-parser
 %files provider-junit -f .mfiles-junit
+%files provider-junit5 -f .mfiles-junit5
 %files provider-testng -f .mfiles-testng
 %files -n maven-failsafe-plugin -f .mfiles-failsafe-plugin
-%if %{with junit5}
-%files provider-junit5 -f .mfiles-junit5
-%endif
 
 %files javadoc -f .mfiles-javadoc
 %license LICENSE NOTICE cpl-v10.html
 
 %changelog
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0:3.0.0~M4-2
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0~M4-3
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Bootstrap Maven for CentOS Stream 9
+
+* 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.
@@ -233,9 +210,24 @@ sed -i /-Xdoclint:all/d pom.xml
 * 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
+
+* Mon May 13 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0~M3-1
+- Switch to tilde versioning
+
+* 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
 

sources

@@ -1,2 +1,2 @@
-SHA512 (maven-surefire-3.0.0-M4.tar.gz) = fb20bdaadc9a034bf2ce3d79fc866c5c54b2e4a13869294c02d2ee99741b5cb30d7b0040326e28e1c34fc7a51f20f693e5c7b4ab5ca0cd72dd9aa984a1df5aa7
+SHA512 (maven-surefire-3.0.0~M4.tar.gz) = 68ec305ff9bc56ef99af45098705d507ddc0944067fbb1411fceeb7bec8af2399f28ffb6fa722aba0ad65ec7089c76d6093e31eacb61c19c8975b37b06a56406
 SHA512 (cpl-v10.html) = f7aa86fafb6a7831b1a5302099fbfe95361bcb5c49a2bc7aac0f5d53cea6c92fc3adbba897a54ab5b0cf32771cdc933fc5bb233461fbd48254a250d0d59109c9