.gitignore

@@ -1,27 +1 @@
-maven-surefire-1.5.3.tar.gz
+SOURCES/maven-surefire-3.0.0-M3.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.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.12-source-release.zip
-/surefire-2.12.1-source-release.zip
-/surefire-2.13-source-release.zip
-/cpl-v10.html
-/surefire-2.14-source-release.zip
-/surefire-2.14.1-source-release.zip
-/surefire-2.15-source-release.zip
-/surefire-2.16-source-release.zip
-/surefire-2.17-source-release.zip
-/surefire-2.18.1-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
-/surefire-2.21.0-source-release.zip
-/surefire-2.22.0-source-release.zip
-/maven-surefire-2.22.0.tar.gz

.maven-surefire.metadata

@@ -0,0 +1 @@
+aa431c17c3667c58c9895ae845aa566f6336c7ba SOURCES/maven-surefire-3.0.0-M3.tar.gz

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
-

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
-

SOURCES/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
 

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

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

SOURCES/cpl-v10.html

@@ -0,0 +1,125 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<HTML>
+<HEAD>
+<TITLE>Common Public License - v 1.0</TITLE>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</HEAD>
+
+<BODY BGCOLOR="#FFFFFF" VLINK="#800000">
+
+
+<P ALIGN="CENTER"><B>Common Public License - v 1.0</B>
+<P><B></B><FONT SIZE="3"></FONT>
+<P><FONT SIZE="3"></FONT><FONT SIZE="2">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT").  ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.</FONT>
+<P><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2"><B>1.  DEFINITIONS</B></FONT>
+<P><FONT SIZE="2">"Contribution" means:</FONT>
+
+<UL><FONT SIZE="2">a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and<BR CLEAR="LEFT">
+b) in the case of each subsequent Contributor:</FONT></UL>
+
+
+<UL><FONT SIZE="2">i)	 	changes to the Program, and</FONT></UL>
+
+
+<UL><FONT SIZE="2">ii)		additions to the Program;</FONT></UL>
+
+
+<UL><FONT SIZE="2">where such changes and/or additions to the Program originate from and are distributed by that particular Contributor.  </FONT><FONT SIZE="2">A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf.  </FONT><FONT SIZE="2">Contributions do not include additions to the Program which:  (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.  </FONT></UL>
+
+<P><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2">"Contributor" means any person or entity that distributes the Program.</FONT>
+<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2">"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.  </FONT>
+<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2"></FONT><FONT SIZE="2">"Program" means the Contributions distributed in accordance with this Agreement.</FONT>
+<P><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2">"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.</FONT>
+<P><FONT SIZE="2"><B></B></FONT>
+<P><FONT SIZE="2"><B>2.  GRANT OF RIGHTS</B></FONT>
+
+<UL><FONT SIZE="2"></FONT><FONT SIZE="2">a)	</FONT><FONT SIZE="2">Subject to the terms of this Agreement, each Contributor hereby grants</FONT><FONT SIZE="2"> Recipient a non-exclusive, worldwide, royalty-free copyright license to</FONT><FONT SIZE="2" COLOR="#FF0000"> </FONT><FONT SIZE="2">reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.</FONT></UL>
+
+
+<UL><FONT SIZE="2"></FONT></UL>
+
+
+<UL><FONT SIZE="2"></FONT><FONT SIZE="2">b) 	Subject to the terms of this Agreement, each Contributor hereby grants </FONT><FONT SIZE="2">Recipient a non-exclusive, worldwide,</FONT><FONT SIZE="2" COLOR="#008000"> </FONT><FONT SIZE="2">royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form.  This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents.  The patent license shall not apply to any other combinations which include the Contribution.  No hardware per se is licensed hereunder.   </FONT></UL>
+
+
+<UL><FONT SIZE="2"></FONT></UL>
+
+
+<UL><FONT SIZE="2">c)	Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity.  Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise.  As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any.  For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.</FONT></UL>
+
+
+<UL><FONT SIZE="2"></FONT></UL>
+
+
+<UL><FONT SIZE="2">d)	Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. </FONT></UL>
+
+
+<UL><FONT SIZE="2"></FONT></UL>
+
+<P><FONT SIZE="2"><B>3.  REQUIREMENTS</B></FONT>
+<P><FONT SIZE="2"><B></B>A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:</FONT>
+
+<UL><FONT SIZE="2">a)	it complies with the terms and conditions of this Agreement; and</FONT></UL>
+
+
+<UL><FONT SIZE="2">b)	its license agreement:</FONT></UL>
+
+
+<UL><FONT SIZE="2">i)	effectively disclaims</FONT><FONT SIZE="2"> on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; </FONT></UL>
+
+
+<UL><FONT SIZE="2">ii) 	effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; </FONT></UL>
+
+
+<UL><FONT SIZE="2">iii)</FONT><FONT SIZE="2">	states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and</FONT></UL>
+
+
+<UL><FONT SIZE="2">iv)	states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.</FONT><FONT SIZE="2" COLOR="#0000FF"> </FONT><FONT SIZE="2" COLOR="#FF0000"></FONT></UL>
+
+
+<UL><FONT SIZE="2" COLOR="#FF0000"></FONT><FONT SIZE="2"></FONT></UL>
+
+<P><FONT SIZE="2">When the Program is made available in source code form:</FONT>
+
+<UL><FONT SIZE="2">a)	it must be made available under this Agreement; and </FONT></UL>
+
+
+<UL><FONT SIZE="2">b)	a copy of this Agreement must be included with each copy of the Program.  </FONT></UL>
+
+<P><FONT SIZE="2"></FONT><FONT SIZE="2" COLOR="#0000FF"><STRIKE></STRIKE></FONT>
+<P><FONT SIZE="2" COLOR="#0000FF"><STRIKE></STRIKE></FONT><FONT SIZE="2">Contributors may not remove or alter any copyright notices contained within the Program.  </FONT>
+<P><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2">Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.  </FONT>
+<P><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2"><B>4.  COMMERCIAL DISTRIBUTION</B></FONT>
+<P><FONT SIZE="2">Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like.  While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors.   Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering.  The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement.  In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations.  The Indemnified Contributor may participate in any such claim at its own expense.</FONT>
+<P><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2">For example, a Contributor might include the Program in a commercial product offering, Product X.  That Contributor is then a Commercial Contributor.  If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone.  Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.</FONT>
+<P><FONT SIZE="2"></FONT><FONT SIZE="2" COLOR="#0000FF"></FONT>
+<P><FONT SIZE="2" COLOR="#0000FF"></FONT><FONT SIZE="2"><B>5.  NO WARRANTY</B></FONT>
+<P><FONT SIZE="2">EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is</FONT><FONT SIZE="2"> solely responsible for determining the appropriateness of using and distributing </FONT><FONT SIZE="2">the Program</FONT><FONT SIZE="2"> and assumes all risks associated with its exercise of rights under this Agreement</FONT><FONT SIZE="2">, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, </FONT><FONT SIZE="2">programs or equipment, and unavailability or interruption of operations</FONT><FONT SIZE="2">.  </FONT><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2"></FONT><FONT SIZE="2"><B>6.  DISCLAIMER OF LIABILITY</B></FONT>
+<P><FONT SIZE="2"></FONT><FONT SIZE="2">EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES </FONT><FONT SIZE="2">(INCLUDING WITHOUT LIMITATION LOST PROFITS),</FONT><FONT SIZE="2"> HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</FONT>
+<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2"><B>7.  GENERAL</B></FONT>
+<P><FONT SIZE="2"></FONT><FONT SIZE="2">If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.</FONT>
+<P><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2">If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed.  In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. </FONT><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2">All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance.  If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable.  However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.  </FONT><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2"></FONT><FONT SIZE="2">Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted  and may only be modified in the following manner. The Agreement Steward reserves the right to </FONT><FONT SIZE="2">publish new versions (including revisions) of this Agreement from time to </FONT><FONT SIZE="2">time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward.   IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity.  </FONT><FONT SIZE="2">Each new version of the Agreement will be given a distinguishing version number.  The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new </FONT><FONT SIZE="2">version.  </FONT><FONT SIZE="2">Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, </FONT><FONT SIZE="2">by implication, estoppel or otherwise</FONT><FONT SIZE="2">.</FONT><FONT SIZE="2">  All rights in the Program not expressly granted under this Agreement are reserved.</FONT>
+<P><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2">This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose.  Each party waives its rights to a jury trial in any resulting litigation.</FONT>
+<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2"></FONT>
+
+</BODY>
+
+</HTML>

SOURCES/generate-tarball.sh

@@ -2,7 +2,11 @@
 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"
@@ -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"

SPECS/maven-surefire.spec

@@ -1,58 +1,46 @@
-%bcond_without  junit5
-
 Name:           maven-surefire
-Version:        2.22.0
+Version:        3.0.0~M3
-Release:        3%{?dist}
+Release:        4%{?dist}
-Epoch:          0
 Summary:        Test framework project
 License:        ASL 2.0 and CPL
 URL:            http://maven.apache.org/surefire/
 BuildArch:      noarch
 
-# ./generate-tarball.sh
+# ./generate-tarball.sh 3.0.0-M3
-Source0:        %{name}-%{version}.tar.gz
+Source0:        %{name}-3.0.0-M3.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:         0001-Port-to-TestNG-6.11.patch
-Patch1:         0002-Port-to-current-doxia.patch
+Patch2:         0002-Port-to-current-maven-shared-utils.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.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.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.plugins:maven-dependency-plugin)
+BuildRequires:  mvn(org.apache.maven:maven-toolchain)
-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
@@ -62,29 +50,24 @@ 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
@@ -92,12 +75,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
 
@@ -125,28 +102,24 @@ Summary:          Javadoc for %{name}
 Javadoc for %{name}.
 
 %prep
-%setup -q -n surefire-%{version}
+%setup -q -n surefire-3.0.0-M3
 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-setup-integration-tests
+%pom_remove_plugin :maven-help-plugin surefire-its
 
 # QA plugin useful only for upstream
 %pom_remove_plugin -r :jacoco-maven-plugin
@@ -160,24 +133,14 @@ 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,report-plugin}*" @1
+%mvn_package ":*{surefire-plugin}*" @1
 %mvn_package ":*junit-platform*" junit5
-%mvn_package ":*{junit,testng,failsafe-plugin,report-parser}*"  @1
+%mvn_package ":*{junit,testng,failsafe-plugin}*"  @1
 %mvn_package ":*tests*" __noinstall
 # tests turned off because they need jmock
-# use xmvn-javadoc because maven-javadoc-plugin crashes JVM
+%mvn_build -f
-%mvn_build -f -j -G org.fedoraproject.xmvn:xmvn-mojo:javadoc
 
 %install
 %mvn_install
@@ -188,19 +151,30 @@ 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
 

sources

@@ -1,2 +0,0 @@
-SHA512 (maven-surefire-2.22.0.tar.gz) = 339d76ef07280e72dea3217c545de1b36b02fdfa31258f3e9cb7ac9169c6826dbde5a2d39088482b3069054e957a27860547b09a6933c04ca7039fc9a0175d35
-SHA512 (cpl-v10.html) = f7aa86fafb6a7831b1a5302099fbfe95361bcb5c49a2bc7aac0f5d53cea6c92fc3adbba897a54ab5b0cf32771cdc933fc5bb233461fbd48254a250d0d59109c9