Update to upstream version 2.20.1

.gitignore

@@ -21,3 +21,4 @@ surefire-2.10-source-release.zip
 /surefire-2.19-source-release.zip
 /surefire-2.19.1-source-release.zip
 /surefire-2.20-source-release.zip
+/surefire-2.20.1-source-release.zip

0001-Maven-3.patch

@@ -1,4 +1,4 @@
-From ac649e31f3cbe4e63a83222deb8aacce833108cf Mon Sep 17 00:00:00 2001
+From 27a15fa7bea3e974521094f3e2c9cd0311c07b59 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/3] Maven 3
@@ -8,10 +8,10 @@ Subject: [PATCH 1/3] Maven 3
  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 8bdf75e..3a21009 100644
+index 7a26c27..8de0d32 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
-@@ -168,16 +168,7 @@ public final class SurefireHelper
+@@ -204,16 +204,7 @@ public final class SurefireHelper
      private static String getFailureBehavior( MavenExecutionRequest request )
          throws NoSuchMethodException, InvocationTargetException, IllegalAccessException
      {

0002-Fix-test-with-doxia-1.7.patch

@@ -1,4 +1,4 @@
-From 1a9c200e7069f82f0bb31b7037748fca24be0b60 Mon Sep 17 00:00:00 2001
+From 6a19c8e2f0759b14220110c281af6d9e0c894332 Mon Sep 17 00:00:00 2001
 From: Michael Simacek <msimacek@redhat.com>
 Date: Thu, 5 May 2016 11:19:09 +0200
 Subject: [PATCH 2/3] Fix test with doxia-1.7
@@ -8,7 +8,7 @@ Subject: [PATCH 2/3] Fix test with doxia-1.7
  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 7cebfe7..ee0e16f 100644
+index 90328cf..7342791 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
 @@ -27,8 +27,8 @@ import java.util.Map;

0003-Port-to-TestNG-6.11.patch

@@ -1,4 +1,4 @@
-From 144f8b0a9ec2bb312c6d35775269d1d75508e128 Mon Sep 17 00:00:00 2001
+From 14b4e309d3e843148917d5bbb37f8b0eecd7b6b2 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/3] Port to TestNG 6.11
@@ -9,7 +9,7 @@ Subject: [PATCH 3/3] 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 72082f7..9b969b7 100644
+index 97978c6..2d244c5 100644
 --- a/surefire-providers/surefire-testng/pom.xml
 +++ b/surefire-providers/surefire-testng/pom.xml
 @@ -51,8 +51,7 @@
@@ -23,10 +23,10 @@ index 72082f7..9b969b7 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 a471f0d..f2409eb 100644
+index 73ccdb7..03afb72 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
-@@ -62,7 +62,7 @@ public abstract class AbstractDirectConfigurator
+@@ -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
@@ -34,7 +34,7 @@ index a471f0d..f2409eb 100644
 +        testng.setListenerClasses( ( List ) loadListenerClasses( listeners ) );
      }
  
-     public void configure( XmlSuite suite, Map<String, String> options )
+     @Override
 -- 
 2.13.5
 

maven-surefire.spec

@@ -1,5 +1,5 @@
 Name:           maven-surefire
-Version:        2.20
+Version:        2.20.1
 Release:        1%{?dist}
 Epoch:          0
 Summary:        Test framework project
@@ -112,6 +112,9 @@ cp -p %{SOURCE2} .
 %patch1 -p1
 %patch2 -p1
 
+# Disable strict doclint
+sed -i /-Xdoclint:all/d pom.xml
+
 %pom_disable_module surefire-shadefire
 
 %pom_remove_dep -r org.apache.maven.surefire:surefire-shadefire
@@ -133,7 +136,6 @@ cp -p %{SOURCE2} .
 %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_remove_dep :maven-toolchain maven-surefire-plugin
 
 %pom_xpath_remove -r "pom:execution[pom:id='shared-logging-generated-sources']"
 
@@ -166,6 +168,9 @@ cp -p %{SOURCE2} .
 %doc LICENSE NOTICE cpl-v10.html
 
 %changelog
+* Mon Sep 18 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.20.1-1
+- Update to upstream version 2.20.1
+
 * Tue Sep 12 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.20-1
 - Update to upstream version 2.20
 

sources

@@ -1,2 +1 @@
-SHA512 (surefire-2.20-source-release.zip) = 0a05e77e921e8cc44ccfa0f24d58cb89a89133415e09f0d544456bcd9d64c7d7f5ec086963d9cb1539839f3e68585edc9b77dd40f590f58c0bae29427b247a26
-SHA512 (cpl-v10.html) = f7aa86fafb6a7831b1a5302099fbfe95361bcb5c49a2bc7aac0f5d53cea6c92fc3adbba897a54ab5b0cf32771cdc933fc5bb233461fbd48254a250d0d59109c9
+SHA512 (surefire-2.20.1-source-release.zip) = 25a8e5cadae1e76531eb8636be9d27817ba9ee9289bd05b66c176d39c259d148f7fbd5d256c114a2931f53f92adca7ff16947cedaf410b17dba072e22282d827