.gitignore

@@ -1 +1 @@
-SOURCES/maven-surefire-3.0.0-M3.tar.gz
+SOURCES/maven-surefire-2.22.0.tar.gz

.maven-surefire.metadata

@@ -1 +1 @@
-aa431c17c3667c58c9895ae845aa566f6336c7ba SOURCES/maven-surefire-3.0.0-M3.tar.gz
+581f8dc5df8eeab7bb62ec60b21c3d0c12bcbe3b SOURCES/maven-surefire-2.22.0.tar.gz

SOURCES/0001-Maven-3.patch

@@ -0,0 +1,34 @@
+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
+

SOURCES/0002-Port-to-current-doxia.patch

@@ -0,0 +1,25 @@
+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
+

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

@@ -1,7 +1,7 @@
-From 69c97f47a7bbec601b407cd2cd81aee64507e562 Mon Sep 17 00:00:00 2001
+From 73cbf7936466f7e32483b871813a82f214d44b30 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 3/4] 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 8aee308..e1b37ea 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 c639ce9..3f05eed 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.17.1
 

SOURCES/0004-Port-to-current-maven-shared-utils.patch

@@ -1,17 +1,29 @@
-From a96b8f5dd6d7fc51d9056c93bd08635e06957ea5 Mon Sep 17 00:00:00 2001
+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 2/2] Port to current maven-shared-utils
+Subject: [PATCH 4/4] Port to current maven-shared-utils
 
 ---
- .../plugin/surefire/report/StatelessXmlReporter.java | 12 ++++++------
+ .../surefire/report/StatelessXmlReporter.java    | 16 ++++++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
+ 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 b89c4e9b..8cf0b60c 100644
+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
-@@ -326,7 +326,7 @@ private static File getReportFile( ReportEntry report, File reportsDirectory, St
+@@ -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,
@@ -20,7 +32,7 @@ index b89c4e9b..8cf0b60c 100644
      {
          ppw.startElement( "testcase" );
          ppw.addAttribute( "name", report.getReportName() );
-@@ -349,7 +349,7 @@ private static void startTestElement( XMLWriter ppw, WrappedReportEntry report,
+@@ -346,7 +350,7 @@ public class StatelessXmlReporter
      }
  
      private void createTestSuiteElement( XMLWriter ppw, WrappedReportEntry report, TestSetStats testSetStats,
@@ -29,7 +41,7 @@ index b89c4e9b..8cf0b60c 100644
      {
          ppw.startElement( "testsuite" );
  
-@@ -377,7 +377,7 @@ private void createTestSuiteElement( XMLWriter ppw, WrappedReportEntry report, T
+@@ -373,7 +377,7 @@ public class StatelessXmlReporter
  
      private static void getTestProblems( OutputStreamWriter outputStreamWriter, XMLWriter ppw,
                                           WrappedReportEntry report, boolean trimStackTrace, OutputStream fw,
@@ -38,7 +50,7 @@ index b89c4e9b..8cf0b60c 100644
      {
          ppw.startElement( testErrorType );
  
-@@ -434,7 +434,7 @@ private static void getTestProblems( OutputStreamWriter outputStreamWriter, XMLW
+@@ -418,7 +422,7 @@ public class StatelessXmlReporter
  
      // Create system-out and system-err elements
      private static void createOutErrElements( OutputStreamWriter outputStreamWriter, XMLWriter ppw,
@@ -47,7 +59,7 @@ index b89c4e9b..8cf0b60c 100644
      {
          EncodingOutputStream eos = new EncodingOutputStream( fw );
          addOutputStreamElement( outputStreamWriter, eos, ppw, report.getStdout(), "system-out" );
-@@ -444,7 +444,7 @@ private static void createOutErrElements( OutputStreamWriter outputStreamWriter,
+@@ -428,7 +432,7 @@ public class StatelessXmlReporter
      private static void addOutputStreamElement( OutputStreamWriter outputStreamWriter,
                                           EncodingOutputStream eos, XMLWriter xmlWriter,
                                           Utf8RecodingDeferredFileOutputStream utf8RecodingDeferredFileOutputStream,
@@ -56,7 +68,7 @@ index b89c4e9b..8cf0b60c 100644
      {
          if ( utf8RecodingDeferredFileOutputStream != null && utf8RecodingDeferredFileOutputStream.getByteCount() > 0 )
          {
-@@ -474,7 +474,7 @@ private static void addOutputStreamElement( OutputStreamWriter outputStreamWrite
+@@ -458,7 +462,7 @@ public class StatelessXmlReporter
       *
       * @param xmlWriter The test suite to report to
       */
@@ -65,6 +77,19 @@ index b89c4e9b..8cf0b60c 100644
      {
          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.20.1
+2.17.1
 

SOURCES/generate-tarball.sh

@@ -2,11 +2,7 @@
 set -e
 
 name=maven-surefire
-if [[ -n "$1" ]]; then
+version="$(sed -n 's/Version:\s*//p' *.spec)"
-    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"
@@ -20,6 +16,6 @@ unzip "../${name}-${version}.orig.zip"
 find -name '*.jar' -delete
 find -name '*.class' -delete
 
-tar czf "../${name}-${version}.tar.gz" *
+tar cf "../${name}-${version}.tar.gz" *
 cd ..
 rm -r tarball-tmp "${name}-${version}.orig.zip"

SPECS/maven-surefire.spec

@@ -1,46 +1,58 @@
+%bcond_without  junit5
+
 Name:           maven-surefire
-Version:        3.0.0~M3
+Version:        2.22.0
-Release:        4%{?dist}
+Release:        3%{?dist}
+Epoch:          0
 Summary:        Test framework project
 License:        ASL 2.0 and CPL
 URL:            http://maven.apache.org/surefire/
 BuildArch:      noarch
 
-# ./generate-tarball.sh 3.0.0-M3
+# ./generate-tarball.sh
-Source0:        %{name}-3.0.0-M3.tar.gz
+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
 
-Patch1:         0001-Port-to-TestNG-6.11.patch
+Patch0:         0001-Maven-3.patch
-Patch2:         0002-Port-to-current-maven-shared-utils.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
 
 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-lang3)
-BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
+BuildRequires:  mvn(org.apache.maven.doxia:doxia-site-renderer)
-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.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.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-common-artifact-filters)
+BuildRequires:  mvn(org.apache.maven.shared:maven-shared-utils)
+BuildRequires:  mvn(org.apache.maven.shared:maven-verifier)
+BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
 BuildRequires:  mvn(org.codehaus.mojo:javacc-maven-plugin)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-java)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
 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
@@ -50,24 +62,29 @@ Surefire is a test framework project.
 
 %package plugin
 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)
 
 %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
@@ -75,6 +92,12 @@ 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
 
@@ -102,24 +125,28 @@ Summary:          Javadoc for %{name}
 Javadoc for %{name}.
 
 %prep
-%setup -q -n surefire-3.0.0-M3
+%setup -q -n surefire-%{version}
 cp -p %{SOURCE2} .
 
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # 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_disable_module surefire-junit-platform surefire-providers
+%endif
+
 %pom_remove_dep -r org.apache.maven.surefire:surefire-shadefire
 
 # 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-its
+%pom_remove_plugin :maven-help-plugin surefire-setup-integration-tests
 
 # QA plugin useful only for upstream
 %pom_remove_plugin -r :jacoco-maven-plugin
@@ -133,14 +160,24 @@ sed -i /-Xdoclint:all/d pom.xml
 %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
 
 %build
-%mvn_package ":*{surefire-plugin}*" @1
+%mvn_package ":*{surefire-plugin,report-plugin}*" @1
 %mvn_package ":*junit-platform*" junit5
-%mvn_package ":*{junit,testng,failsafe-plugin}*"  @1
+%mvn_package ":*{junit,testng,failsafe-plugin,report-parser}*"  @1
 %mvn_package ":*tests*" __noinstall
 # tests turned off because they need jmock
-%mvn_build -f
+# use xmvn-javadoc because maven-javadoc-plugin crashes JVM
+%mvn_build -f -j -G org.fedoraproject.xmvn:xmvn-mojo:javadoc
 
 %install
 %mvn_install
@@ -151,30 +188,19 @@ 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
-* 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
-
-* 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
-
 * Tue Jul 31 2018 Michael Simacek <msimacek@redhat.com> - 0:2.22.0-3
 - Repack the tarball without binaries