update to version 3.0.0-M4

2020-08-26 21:55:53 +02:00 · 2020-08-26 21:55:53 +02:00 · 99d8deada2
commit 99d8deada2
parent d7baecb31b
10 changed files with 197 additions and 214 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,13 +1,16 @@
-maven-surefire-1.5.3.tar.gz
-maven-surefire-booter-1.5.3.tar.gz
-maven-surefire-2.3-src.tar.gz
+/results_*
+/*.src.rpm
+
+/maven-surefire-1.5.3.tar.gz
+/maven-surefire-booter-1.5.3.tar.gz
+/maven-surefire-2.3-src.tar.gz
 /maven-surefire-2.6-src.tar.xz
-surefire-2.7.1-source-release.zip
+/surefire-2.7.1-source-release.zip
 /surefire-2.7.2-source-release.zip
 /surefire-2.8-source-release.zip
 /surefire-2.8.1-source-release.zip
 /surefire-2.9-source-release.zip
-surefire-2.10-source-release.zip
+/surefire-2.10-source-release.zip
 /surefire-2.12-source-release.zip
 /surefire-2.12.1-source-release.zip
 /surefire-2.13-source-release.zip
@ -25,3 +28,5 @@ surefire-2.10-source-release.zip
 /surefire-2.21.0-source-release.zip
 /surefire-2.22.0-source-release.zip
 /maven-surefire-2.22.0.tar.gz
+/maven-surefire-3.0.0-M3.tar.gz
+/maven-surefire-3.0.0-M4.tar.gz
--- a/0001-Maven-3.patch
+++ b/0001-Maven-3.patch
@ -1,34 +0,0 @@
-From 3bb1ab3a99b7db611b5d265701e1ba293413b027 Mon Sep 17 00:00:00 2001
-From: Michael Simacek <msimacek@redhat.com>
-Date: Thu, 5 May 2016 11:20:48 +0200
-Subject: [PATCH 1/4] Maven 3
-
---
- .../apache/maven/plugin/surefire/SurefireHelper.java  | 11 +----------
- 1 file changed, 1 insertion(+), 10 deletions(-)
-
-diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java
-index dd29cb4..dc7915c 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java
-+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java
-@@ -204,16 +204,7 @@ public final class SurefireHelper
-     private static String getFailureBehavior( MavenExecutionRequest request )
-         throws NoSuchMethodException, InvocationTargetException, IllegalAccessException
-     {
-        try
-        {
-            return request.getFailureBehavior();
-        }
-        catch ( NoSuchMethodError e )
-        {
-            return (String) request.getClass()
-                .getMethod( "getReactorFailureBehavior" )
-                .invoke( request );
-        }
-+        return request.getReactorFailureBehavior();
-     }
- 
-     private static boolean failIfNoTests( SurefireReportParameters reportParameters )
-- 
-2.17.1
-
--- a/0001-Port-to-TestNG-6.11.patch
+++ b/0001-Port-to-TestNG-6.11.patch
@ -1,7 +1,7 @@
-From 73cbf7936466f7e32483b871813a82f214d44b30 Mon Sep 17 00:00:00 2001
+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 3/4] Port to TestNG 6.11
+Subject: [PATCH 1/2] Port to TestNG 6.11

 ---
 surefire-providers/surefire-testng/pom.xml                     | 3 +--
@ -9,7 +9,7 @@ Subject: [PATCH 3/4] 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 8aee308..e1b37ea 100644
+index 49e75b6e..a9db4a8d 100644
 --- a/surefire-providers/surefire-testng/pom.xml
 +++ b/surefire-providers/surefire-testng/pom.xml
@@ -51,8 +51,7 @@
@ -23,10 +23,10 @@ index 8aee308..e1b37ea 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 c639ce9..3f05eed 100644
+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 abstract class AbstractDirectConfigurator
+@@ -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
@ -36,5 +36,5 @@ index c639ce9..3f05eed 100644
 
     @Override
 -- 
-2.17.1
+2.20.1

--- a/0002-Port-to-current-doxia.patch
+++ b/0002-Port-to-current-doxia.patch
@ -1,25 +0,0 @@
-From 16e1a53ff612f4a9a777e09cdc45988e9abbe2e2 Mon Sep 17 00:00:00 2001
-From: Michael Simacek <msimacek@redhat.com>
-Date: Fri, 29 Jun 2018 12:44:37 +0200
-Subject: [PATCH 2/4] Port to current doxia
-
---
- .../maven/plugins/surefire/report/SurefireReportGenerator.java  | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
-index f9b9480..f142c8d 100644
--- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
-+++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
-@@ -26,7 +26,7 @@ import java.util.Locale;
- import java.util.Map;
- import org.apache.maven.doxia.markup.HtmlMarkup;
- import org.apache.maven.doxia.sink.Sink;
-import org.apache.maven.doxia.sink.SinkEventAttributeSet;
-+import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet;
- import org.apache.maven.doxia.util.DoxiaUtils;
- import org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
- import org.apache.maven.reporting.MavenReportException;
-- 
-2.17.1
-
--- a/0002-Port-to-current-maven-shared-utils.patch
+++ b/0002-Port-to-current-maven-shared-utils.patch
@ -0,0 +1,94 @@
+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 ) )
--- a/0003-Fix-broken-Javadocs.patch
+++ b/0003-Fix-broken-Javadocs.patch
@ -0,0 +1,32 @@
+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 &lt;include&gt; 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>
--- a/0004-Port-to-current-maven-shared-utils.patch
+++ b/0004-Port-to-current-maven-shared-utils.patch
@ -1,95 +0,0 @@
-From 6f1e595890521c0c3448457f112c1598d8b9c7f9 Mon Sep 17 00:00:00 2001
-From: Michael Simacek <msimacek@redhat.com>
-Date: Fri, 16 Mar 2018 13:45:01 +0100
-Subject: [PATCH 4/4] Port to current maven-shared-utils
-
---
- .../surefire/report/StatelessXmlReporter.java    | 16 ++++++++++------
- pom.xml                                          |  2 +-
- 2 files changed, 11 insertions(+), 7 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 dad9808..111b92b 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
-@@ -237,6 +237,10 @@ public class StatelessXmlReporter
-             }
-             ppw.endElement(); // TestSuite
-         }
-+        catch (IOException e)
-+        {
-+            throw new RuntimeException(e);
-+        }
-         finally
-         {
-             closeQuietly( fw );
-@@ -323,7 +327,7 @@ public class StatelessXmlReporter
-     }
- 
-     private static void startTestElement( XMLWriter ppw, WrappedReportEntry report, String reportNameSuffix,
-                                          String timeAsString )
-+                                          String timeAsString ) throws IOException
-     {
-         ppw.startElement( "testcase" );
-         ppw.addAttribute( "name", report.getReportName() );
-@@ -346,7 +350,7 @@ public class StatelessXmlReporter
-     }
- 
-     private void createTestSuiteElement( XMLWriter ppw, WrappedReportEntry report, TestSetStats testSetStats,
-                                         String timeAsString )
-+                                         String timeAsString ) throws IOException
-     {
-         ppw.startElement( "testsuite" );
- 
-@@ -373,7 +377,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 );
- 
-@@ -418,7 +422,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" );
-@@ -428,7 +432,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 )
-         {
-@@ -458,7 +462,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() )
-diff --git a/pom.xml b/pom.xml
-index efc9342..6492689 100644
--- a/pom.xml
-+++ b/pom.xml
-@@ -91,7 +91,7 @@
-     <mavenPluginPluginVersion>3.5</mavenPluginPluginVersion>
-     <commonsLang3Version>3.5</commonsLang3Version>
-     <commonsIoVersion>2.5</commonsIoVersion>
-    <mavenSharedUtilsVersion>0.9</mavenSharedUtilsVersion>
-+    <mavenSharedUtilsVersion>3.2.1</mavenSharedUtilsVersion>
-     <powermockVersion>2.0.0-beta.5</powermockVersion>
-     <maven.surefire.scm.devConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-surefire.git</maven.surefire.scm.devConnection>
-     <maven.site.path>surefire-archives/surefire-LATEST</maven.site.path>
-- 
-2.17.1
-
--- a/generate-tarball.sh
+++ b/generate-tarball.sh
@ -2,10 +2,14 @@
 set -e

 name=maven-surefire
-version="$(sed -n 's/Version:\s*//p' *.spec)"
+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"
+wget "https://repo1.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
@ -16,6 +20,6 @@ unzip "../${name}-${version}.orig.zip"
 find -name '*.jar' -delete
 find -name '*.class' -delete

-tar cf "../${name}-${version}.tar.gz" *
+tar czf "../${name}-${version}.tar.gz" *
 cd ..
 rm -r tarball-tmp "${name}-${version}.orig.zip"
--- a/maven-surefire.spec
+++ b/maven-surefire.spec
@ -1,51 +1,60 @@
 %bcond_without  junit5

 Name:           maven-surefire
-Version:        2.22.0
-Release:        11%{?dist}
 Epoch:          0
+Version:        3.0.0~M4
+Release:        1%{?dist}
 Summary:        Test framework project
 License:        ASL 2.0 and CPL
-URL:            http://maven.apache.org/surefire/
-BuildArch:      noarch

-# ./generate-tarball.sh
-Source0:        %{name}-%{version}.tar.gz
+%global upstream_version %(echo '%{version}' | tr '~' '-')
+
+URL:            http://maven.apache.org/surefire/
+
+# ./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

-Patch0:         0001-Maven-3.patch
-Patch1:         0002-Port-to-current-doxia.patch
-Patch2:         0003-Port-to-TestNG-6.11.patch
-Patch3:         0004-Port-to-current-maven-shared-utils.patch
+Patch1:         0001-Port-to-TestNG-6.11.patch
+Patch2:         0002-Port-to-current-maven-shared-utils.patch
+Patch3:         0003-Fix-broken-Javadocs.patch
+
+BuildArch:      noarch

 BuildRequires:  maven-local
 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: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.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-invoker-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-shade-plugin)
-BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
 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.shared:maven-verifier)
+BuildRequires:  mvn(org.apache.maven:maven-compat)
+BuildRequires:  mvn(org.apache.maven:maven-core)
+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.codehaus.plexus:plexus-utils)
 BuildRequires:  mvn(org.fusesource.jansi:jansi)
 BuildRequires:  mvn(org.testng:testng)
 BuildRequires:  mvn(org.testng:testng::jdk15:)
@ -61,7 +70,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 = %{epoch}:%{version}-%{release} if junit)
 Requires:       (%{name}-provider-testng = %{epoch}:%{version}-%{release} if testng)
 %if %{with junit5}
@ -72,39 +81,39 @@ Requires:       (%{name}-provider-junit5 = %{epoch}:%{version}-%{release} if jun
 Maven surefire plugin for running tests via the surefire framework.

 %package report-plugin
-Summary:                Surefire reports plugin for maven
+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
+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
+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
+Summary:        TestNG provider for Maven Surefire

 %description provider-testng
 TestNG provider for Maven Surefire.

 %package report-parser
-Summary:                Parses report output files from surefire
+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
+Summary:        Maven plugin for running integration tests

 %description -n maven-failsafe-plugin
 The Failsafe Plugin is designed to run integration tests while the
@ -124,16 +133,15 @@ 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-%{version}
+%setup -q -n surefire-%{upstream_version}
 cp -p %{SOURCE2} .

-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@ -151,46 +159,37 @@ sed -i /-Xdoclint:all/d pom.xml

 # Help plugin is needed only to evaluate effective Maven settings.
 # For building RPM package default settings will suffice.
-%pom_remove_plugin :maven-help-plugin surefire-setup-integration-tests
+%pom_remove_plugin :maven-help-plugin surefire-its

 # QA plugin useful only for upstream
 %pom_remove_plugin -r :jacoco-maven-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

-%pom_xpath_set pom:mavenVersion 3.3.3
-%pom_remove_dep :maven-project maven-surefire-report-plugin
-%pom_remove_dep :maven-project maven-surefire-common
-%pom_remove_dep :maven-plugin-descriptor maven-surefire-common
-%pom_remove_dep :maven-toolchain maven-surefire-common
-
-%pom_xpath_remove -r "pom:execution[pom:id='shared-logging-generated-sources']"
-
-%pom_add_dep com.google.code.findbugs:jsr305 surefire-api
-
 # This package needs maven compat for ArtifactResolver class
 %pom_add_dep org.apache.maven:maven-compat maven-surefire-common

-%build
 %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
-# tests turned off because they need jmock
-# use xmvn-javadoc because maven-javadoc-plugin crashes JVM
-%mvn_build -f -j -G org.fedoraproject.xmvn:xmvn-mojo:javadoc
+
+%build
+# tests are disabled because of unpackaged dependencies (fest-assert, etc.)
+%mvn_build -f

 %install
 %mvn_install

-
 %files -f .mfiles
 %doc README.md
 %license LICENSE NOTICE cpl-v10.html
@ -209,6 +208,9 @@ sed -i /-Xdoclint:all/d pom.xml
 %license LICENSE NOTICE cpl-v10.html

 %changelog
+* 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

--- a/2
+++ b/2
@ -1,2 +1,2 @@
-SHA512 (maven-surefire-2.22.0.tar.gz) = 339d76ef07280e72dea3217c545de1b36b02fdfa31258f3e9cb7ac9169c6826dbde5a2d39088482b3069054e957a27860547b09a6933c04ca7039fc9a0175d35
+SHA512 (maven-surefire-3.0.0-M4.tar.gz) = fb20bdaadc9a034bf2ce3d79fc866c5c54b2e4a13869294c02d2ee99741b5cb30d7b0040326e28e1c34fc7a51f20f693e5c7b4ab5ca0cd72dd9aa984a1df5aa7
 SHA512 (cpl-v10.html) = f7aa86fafb6a7831b1a5302099fbfe95361bcb5c49a2bc7aac0f5d53cea6c92fc3adbba897a54ab5b0cf32771cdc933fc5bb233461fbd48254a250d0d59109c9