Sync from SUSE:SLFO:Main maven-surefire revision a76d6ca8f97be11a2694dec2a1646248

2024-05-31 14:52:42 +02:00 · 2024-05-31 14:52:42 +02:00 · ca7facfa0f
commit ca7facfa0f
parent c9da47a6c6
19 changed files with 2912 additions and 2184 deletions
--- 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-7.4.0.patch
+++ b/0001-Port-to-TestNG-7.4.0.patch
@ -0,0 +1,66 @@
+From 2506b32ba90ef0e336f088e7aa8c12d3273ba242 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/4] Port to TestNG 7.4.0
+
+---
+ pom.xml                                                         | 2 +-
+ surefire-providers/surefire-testng/pom.xml                      | 1 -
+ .../maven/surefire/testng/conf/AbstractDirectConfigurator.java  | 2 +-
+ .../maven/surefire/testng/conf/TestNGMapConfigurator.java       | 2 +-
+ 4 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index cb15de8f7..2f9a061e7 100644
+--- a/pom.xml
+++ b/pom.xml
+@@ -97,7 +97,7 @@
+     <mavenSharedUtilsVersion>3.3.4</mavenSharedUtilsVersion>
+     <powermockVersion>2.0.9</powermockVersion>
+     <jacocoVersion>0.8.11</jacocoVersion>
+-    <testngVersion>5.11</testngVersion>
+    <testngVersion>7.4.0</testngVersion>
+     <surefire-shared-utils.version>${project.version}</surefire-shared-utils.version>
+     <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>
+diff --git a/surefire-providers/surefire-testng/pom.xml b/surefire-providers/surefire-testng/pom.xml
+index c7633d60c..00f22400c 100644
+--- a/surefire-providers/surefire-testng/pom.xml
+++ b/surefire-providers/surefire-testng/pom.xml
+@@ -56,7 +56,6 @@
+       <groupId>org.testng</groupId>
+       <artifactId>testng</artifactId>
+       <version>${testngVersion}</version>
+-      <classifier>jdk15</classifier>
+       <scope>provided</scope>
+     </dependency>
+     <dependency>
+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 b73b9bacd..ab187b6d5 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
+@@ -57,7 +57,7 @@ public void configure(TestNG testng, Map<String, String> options) throws TestSet
+         testng.setUseDefaultListeners(false);
+         configureInstance(testng, options);
+         // TODO: we should have the Profile so that we can decide if this is needed or not
+-        testng.setListenerClasses(loadListenerClasses(listeners));
+        testng.setListenerClasses((List)loadListenerClasses(listeners));
+     }
+ 
+     @Override
+diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
+index d91e76afc..06dbd2316 100755
+--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
+@@ -71,7 +71,7 @@ protected void configureThreadCount(XmlSuite suite, Map<String, String> options)
+     protected void configureParallel(XmlSuite suite, Map<String, String> options) throws TestSetFailedException {
+         String parallel = options.get(PARALLEL_PROP);
+         if (parallel != null) {
+-            suite.setParallel(parallel);
+            suite.setParallel(XmlSuite.ParallelMode.getValidParallel(parallel));
+         }
+     }
+ 
+-- 
+2.44.0
+
--- 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/0003-Port-to-TestNG-7.4.0.patch
+++ b/0003-Port-to-TestNG-7.4.0.patch
@ -1,34 +0,0 @@
--- a/surefire-providers/surefire-testng/pom.xml
-+++ b/surefire-providers/surefire-testng/pom.xml
-@@ -51,8 +51,7 @@
-     <dependency>
-       <groupId>org.testng</groupId>
-       <artifactId>testng</artifactId>
-      <version>5.10</version>
-      <classifier>jdk15</classifier>
-+      <version>7.4.0</version>
-       <scope>provided</scope>
-     </dependency>
-   </dependencies>
--- 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 )
-         testng.setUseDefaultListeners( false );
-         configureInstance( testng, options );
-         // TODO: we should have the Profile so that we can decide if this is needed or not
-        testng.setListenerClasses( loadListenerClasses( listeners ) );
-+        testng.setListenerClasses( ( List ) loadListenerClasses( listeners ) );
-     }
- 
-     @Override
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
-+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
-@@ -68,7 +68,7 @@ public void configure( XmlSuite suite, Map<String, String> options )
-         String parallel = options.get( PARALLEL_PROP );
-         if ( parallel != null )
-         {
-            suite.setParallel( parallel );
-+            suite.setParallel( XmlSuite.ParallelMode.getValidParallel( parallel ) );
-         }
-     }
- 
--- a/0004-Port-to-current-maven-shared-utils.patch
+++ b/0004-Port-to-current-maven-shared-utils.patch
@ -1,109 +0,0 @@
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java	2022-04-26 11:44:38.061316377 +0200
-+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java	2022-04-26 11:50:27.427430853 +0200
-@@ -130,14 +130,24 @@
-         String jvmArgLine = newJvmArgLine( forkNumber );
-         if ( !jvmArgLine.isEmpty() )
-         {
-            cli.createArg()
-                    .setLine( jvmArgLine );
-+            try
-+            {
-+                cli.createArg().setLine( jvmArgLine );
-+            }
-+            catch (Exception e)
-+            {
-+            }
-         }
- 
-         if ( getDebugLine() != null && !getDebugLine().isEmpty() )
-         {
-            cli.createArg()
-                    .setLine( getDebugLine() );
-+            try
-+            {
-+                cli.createArg().setLine( getDebugLine() );
-+            }
-+            catch (Exception e)
-+            {
-+            }
-         }
- 
-         resolveClasspath( cli, findStartClass( config ), config );
--- 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() )
--- 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.3.3</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>
--- a/LICENSE-2.0.txt
+++ b/LICENSE-2.0.txt
@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) 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. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
--- a/17
+++ b/17
@ -0,0 +1,17 @@
+<services>
+	<service name="tar_scm" mode="disabled">
+		<param name="scm">git</param>
+		<param name="url">https://github.com/apache/maven-surefire.git</param>
+		<param name="revision">surefire-3.2.5</param>
+		<param name="match-tag">surefire-*</param>
+		<param name="versionformat">@PARENT_TAG@</param>
+		<param name="versionrewrite-pattern">surefire-(.*)</param>
+        <param name="exclude">**/*.jar</param>
+        <param name="exclude">**/*.class</param>
+	</service>
+	<service name="recompress" mode="disabled">
+		<param name="file">*.tar</param>
+		<param name="compression">xz</param>
+	</service>
+	<service name="set_version" mode="disabled"/>
+</services>
--- a/cpl-v10.html
+++ b/cpl-v10.html
@ -2,13 +2,19 @@
 <HTML>
 <HEAD>
 <TITLE>Common Public License - v 1.0</TITLE>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<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><FONT SIZE="2"><B>Updated 16 Apr 2009</B></FONT>
+
+<P><FONT SIZE="2"><B>As of 25 Feb 2009, IBM has assigned the Agreement Steward role for the CPL to the Eclipse Foundation. 
+Eclipse has designated the Eclipse Public License (EPL) as the follow-on version of the CPL.</B></FONT>
+
 <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>
--- a/generate-tarball.sh
+++ b/generate-tarball.sh
@ -1,21 +0,0 @@
-#!/bin/bash
-set -e
-
-name=maven-surefire
-version="$(sed -n 's/Version:\s*//p' ${name}.spec)"
-
-# RETRIEVE
-wget "https://archive.apache.org/dist/maven/surefire/surefire-${version}-source-release.zip" -O "${name}-${version}.orig.zip"
-
-rm -rf tarball-tmp
-mkdir tarball-tmp
-cd tarball-tmp
-unzip "../${name}-${version}.orig.zip"
-
-# CLEAN TARBALL
-find -name '*.jar' -delete
-find -name '*.class' -delete
-
-tar czf "../${name}-${version}.tar.gz" *
-cd ..
-rm -r tarball-tmp "${name}-${version}.orig.zip"
--- a/maven-surefire-2.22.0.tar.gz
+++ b/maven-surefire-2.22.0.tar.gz
--- a/maven-surefire-3.2.5.tar.xz
+++ b/maven-surefire-3.2.5.tar.xz
--- a/maven-surefire-bootstrap-resources.patch
+++ b/maven-surefire-bootstrap-resources.patch
--- a/maven-surefire-build.tar.xz
+++ b/maven-surefire-build.tar.xz
--- a/maven-surefire-plugins.changes
+++ b/maven-surefire-plugins.changes
@ -1,3 +1,154 @@
+-------------------------------------------------------------------
+Wed Apr 10 10:54:02 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to 3.2.5
+  * Bug
+    + SUREFIRE-2223: Surefire evaluates parameter jvm before skip
+    + SUREFIRE-2224: StatelessXmlReporter#getTestProblems() does
+      not properly reflect report schema structure
+    + SUREFIRE-2225: Surefire ITs fail when project directory
+      contains space
+    + SUREFIRE-2229: + REGRESSION] SUREFIRE-2224 causes stack trace
+      to be omitted for errors and failures
+    + SUREFIRE-2231: JaCoCo 0.8.11 fails with old TestNG releases on
+      Java 17+
+  * Improvement
+    + SUREFIRE-1345: Support flakyFailure and flakyError in
+      TestSuiteXmlParser
+    + SUREFIRE-2221: Document minimum supported Java version for
+      Toolchains
+- Upgrade to 3.2.3
+  * Bug
+    + SUREFIRE-2210: Additional class path ordering broken since
+      3.2.0
+    + SUREFIRE-2211: additionalClasspathElement with UNC path not
+      working with Maven Failsafe Plugin
+    + SUREFIRE-2212: OutOfMemoryError raised when parsing files with
+      huge stderr/stdout output in surefire-report-parser
+    + SUREFIRE-2220:
+      SurefireForkChannel#getForkNodeConnectionString() returns
+      invalid URI string if localHost resolves to IPv6 address
+  * Dependency upgrade
+    + SUREFIRE-2214: Upgrade to HtmlUnit 3.8.0
+    + SUREFIRE-2215: Upgrade to Parent 41
+    + SUREFIRE-2216: Upgrade plugins and components (in ITs)
+- Upgrade to 3.2.2
+  * Bug Fixes
+    + SUREFIRE-2205: Use maven-plugin-report-plugin only in plugins
+      modules
+    + SUREFIRE-2206: Downgrade plexus-xml to 3.0.0
+  * Dependency updates
+    + SUREFIRE-2208: Bump org.codehaus.plexus:plexus-java from 1.1.2
+      to 1.2.0
+- Upgrade to 3.2.1
+  * New features and improvements
+    + SUREFIRE-1124: Support forkNumber in environment variables
+    + SUREFIRE-2177: Use junit-bom instead of single JUnit 5
+      versions
+    + SUREFIRE-2179: Support adding additional Maven dependencies to
+      the test runtime classpath
+    + SUREFIRE-2178: clarify classpathDependencyExcludes
+    + SUREFIRE-2182: Log starter implementation on DEBUG level
+  * Bug Fixes
+    + SUREFIRE-2190: Fix module dependencies for compile only
+      dependencies
+  * Documentation updates
+    + Fix TestNG web site URL (#671) @sabi0
+- Upgrade to 3.1.2
+  * Changes
+    + SUREFIRE-2166: Use ChoiceFormat to selective render percentage
+      and elapsed time in SurefireReportRenderer
+    + Simplify serialization/deserialization of elapsed time
+      (SUREFIRE-2164 + SUREFIRE-2167)
+    + SUREFIRE-2169: Potential NPE in WrappedReportEntry when
+      #getElapsed() is called
+    + MNG-6829: Replace StringUtils#isEmpty(String) and
+      #isNotEmpty(String)
+- Upgrade to 3.1.0
+  * Sub-task
+    + SUREFIRE-2162: Document upcoming mojo and file names change
+  * Bug
+    + SUREFIRE-2140: Cannot release Surefire on Windows
+  * Improvement
+    + SUREFIRE-2153: Replace SurefireReportGenerator with a new
+      SurefireReportRenderer
+    + SUREFIRE-2160: Replace LocalizedProperties with (Custom)I18N
+      approach from MPIR
+  * Task
+    + SUREFIRE-2130: Rewrite several test classes in report
+      plugin for upcoming Doxia 2.0.0 stack
+- Upgrade to 3.0.0
+  * New features and improvements
+    + SUREFIRE-2154: Get rid of localRepository from surefire
+      mojo parameter, use Resolver API
+  * Bug Fixes
+    + SUREFIRE-2119: Sanitize failIfNoSpecifiedTests prefix in
+      failsafe
+    + SUREFIRE-2143: Fix reporting of skipped parameterized test
+  * Documentation updates
+    + SUREFIRE-2156: Refresh download page
+- Modifed patch:
+  * 0003-Port-to-TestNG-7.4.0.patch -> 0001-Port-to-TestNG-7.4.0.patch
+    + regenerate
+  * maven-surefire-bootstrap-resources.patch
+    + regenerate from maven build
+- Removed patches:
+  * 0001-Maven-3.patch
+  * 0002-Port-to-current-doxia.patch
+  * 0004-Port-to-current-maven-shared-utils.patch
+    + not needed with this version
+
+-------------------------------------------------------------------
+Thu Feb 22 07:58:37 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to 2.22.2
+  * Bugs:
+    + SUREFIRE-1614: JUnit Runner that writes to System.out
+      corrupts Surefire’s STDOUT when using JUnit’s Vintage Engine
+- Upgrade to 2.22.1
+  * Bugs:
+    + SUREFIRE-1532: MIME type for javascript is now officially
+      application/javascript
+    + SUREFIRE-1535: Surefire unable to run testng suites in
+      parallel
+    + SUREFIRE-1538: Git considers PNG files as changed although
+      there is no change
+    + SUREFIRE-1550: The surefire XSD published on maven site lacks
+      of some rerun element
+    + SUREFIRE-1559: XML Report elements rerunError, rerunFailure,
+      flakyFailure, flakyError should contain element stackTrace and
+      should not be simpleContent.
+    + SUREFIRE-1561: Logs in Parallel Tests are mixed up when
+      forkMode=never or forkCount=0
+    + SUREFIRE-1564: Can’t override platform version through
+      project/plugin dependencies
+    + SUREFIRE-1579: Forks mixed up characters in standard output
+  * Improvements:
+    + SUREFIRE-1552: Nil element “failureMessage” in
+      failsafe-summary.xml should have self closed tag
+    + SUREFIRE-1554: Fix old test resources TEST-*.xml in favor of
+      continuing with SUREFIRE-1550
+    + SUREFIRE-1555: Elapsed time in XML Report should satisfy
+      pattern in XSD.
+    + SUREFIRE-1562: Support Java 11
+    + SUREFIRE-1565: Surefire should support parameterized
+      reportsDirectory
+  * Tasks:
+    + SUREFIRE-1569: m-invoker-p:3.1.0 attempts to resolve
+      maven-surefire-common:jar:2.22.1-SNAPSHOT from remote repo
+      'apache.snapshots'
+    + SUREFIRE-1578: Remove obsolete module
+      surefire-setup-integration-tests
+  * Dependency upgrades:
+    + SUREFIRE-1540: Upgrade maven-plugins parent to version 32
+    + SUREFIRE-1571: Upgrade maven-plugins parent to version 33
+- Fetch sources using source service to avoid bundling binaries in
+  sources
+- Fix broken links in the spec file
+- Modified patch:
+  * 0004-Port-to-current-maven-shared-utils.patch
+    + rediff to changed context
+
 -------------------------------------------------------------------
 Thu May  5 10:46:11 UTC 2022 - Fridrich Strba <fstrba@suse.com>

--- a/maven-surefire-plugins.spec
+++ b/maven-surefire-plugins.spec
@ -1,7 +1,7 @@
 #
-# spec file
+# spec file for package maven-surefire-plugins
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -18,42 +18,35 @@

 %global base_name maven-surefire
 Name:           %{base_name}-plugins
-Version:        2.22.0
+Version:        3.2.5
 Release:        0
 Summary:        Test framework project
 License:        Apache-2.0 AND CPL-1.0
 Group:          Development/Libraries/Java
 URL:            https://maven.apache.org/surefire/
-# ./generate-tarball.sh
-Source0:        %{base_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
-Patch0:         0001-Maven-3.patch
-Patch1:         0002-Port-to-current-doxia.patch
-Patch2:         0003-Port-to-TestNG-7.4.0.patch
-Patch3:         0004-Port-to-current-maven-shared-utils.patch
+Source0:        %{base_name}-%{version}.tar.xz
+Source1:        https://www.apache.org/licenses/LICENSE-2.0.txt
+Source2:        https://www.eclipse.org/legal/cpl-v10.html
+Patch0:         0001-Port-to-TestNG-7.4.0.patch
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
 BuildRequires:  maven-local
-BuildRequires:  mvn(commons-io:commons-io)
-BuildRequires:  mvn(org.apache.commons:commons-lang3)
-BuildRequires:  mvn(org.apache.maven.doxia:doxia-site-renderer)
+BuildRequires:  mvn(org.apache.maven.doxia:doxia-core)
+BuildRequires:  mvn(org.apache.maven.doxia:doxia-sink-api)
 BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-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-shared-utils)
 BuildRequires:  mvn(org.apache.maven.surefire:maven-surefire-common)
-BuildRequires:  mvn(org.apache.maven.surefire:surefire-logger-api)
 BuildRequires:  mvn(org.apache.maven.surefire:surefire-report-parser)
+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.codehaus.plexus:plexus-utils)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-xml)
 BuildRequires:  mvn(org.fusesource.jansi:jansi)
 #!BuildRequires: maven-compiler-plugin-bootstrap
 #!BuildRequires: maven-jar-plugin-bootstrap
-#!BuildRequires: maven-javadoc-plugin-bootstrap
 #!BuildRequires: maven-plugin-plugin-bootstrap
 #!BuildRequires: maven-resources-plugin-bootstrap
 #!BuildRequires: maven-surefire-plugin-bootstrap
@ -105,64 +98,52 @@ Group:          Development/Libraries/Java
 Javadoc for %{name}.

 %prep
-%setup -q -n surefire-%{version}
-cp -p %{SOURCE2} .
+%setup -q -n %{base_name}-%{version}
+cp -p %{SOURCE1} %{SOURCE2} .

-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch -P 0 -p1
+#patch -P 1 -p1

 # Disable strict doclint
 sed -i /-Xdoclint:all/d pom.xml

+%pom_remove_dep org.junit:junit-bom
+
+%pom_disable_module surefire-shadefire
 %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
+# Not wanted
+%pom_remove_plugin -r :maven-shade-plugin

-# Not in Fedora
+find -name *.java -exec sed -i -e s/org.apache.maven.surefire.shared.utils/org.apache.maven.shared.utils/ -e s/org.apache.maven.surefire.shared.io/org.apache.commons.io/ -e s/org.apache.maven.surefire.shared.lang3/org.apache.commons.lang3/ -e s/org.apache.maven.surefire.shared.compress/org.apache.commons.compress/ {} \;
+
+# Not packaged
 %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
-
-%pom_remove_plugin -r :maven-shade-plugin
-%pom_remove_plugin -r :build-helper-maven-plugin
-find . -name dependency-reduced-pom.xml -delete
-
-%pom_add_dep org.apache.commons:commons-lang3::runtime maven-surefire-plugin
-%pom_add_dep commons-io:commons-io::runtime maven-surefire-plugin
-
 # Disable all modules besides the 3 plugins
 for module in \
-    surefire-logger-api \
-    surefire-api \
-    surefire-shadefire \
-    surefire-booter \
-    surefire-grouper \
-    surefire-providers \
    maven-surefire-common \
-    surefire-report-parser \
-    surefire-setup-integration-tests \
-    surefire-its; do
+    surefire-api \
+    surefire-booter \
+    surefire-extensions-api \
+    surefire-extensions-spi \
+    surefire-grouper \
+    surefire-its \
+    surefire-logger-api \
+    surefire-providers \
+    surefire-shared-utils \
+    surefire-report-parser; do
  %pom_disable_module ${module}
 done

@ -190,6 +171,6 @@ done
 %files -n maven-failsafe-plugin -f .mfiles-failsafe-plugin

 %files javadoc -f .mfiles-javadoc
-%license LICENSE NOTICE cpl-v10.html
+%license LICENSE-2.0.txt cpl-v10.html

 %changelog
--- a/maven-surefire-provider-junit5.changes
+++ b/maven-surefire-provider-junit5.changes
@ -1,3 +1,154 @@
+-------------------------------------------------------------------
+Wed Apr 10 10:54:02 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to 3.2.5
+  * Bug
+    + SUREFIRE-2223: Surefire evaluates parameter jvm before skip
+    + SUREFIRE-2224: StatelessXmlReporter#getTestProblems() does
+      not properly reflect report schema structure
+    + SUREFIRE-2225: Surefire ITs fail when project directory
+      contains space
+    + SUREFIRE-2229: + REGRESSION] SUREFIRE-2224 causes stack trace
+      to be omitted for errors and failures
+    + SUREFIRE-2231: JaCoCo 0.8.11 fails with old TestNG releases on
+      Java 17+
+  * Improvement
+    + SUREFIRE-1345: Support flakyFailure and flakyError in
+      TestSuiteXmlParser
+    + SUREFIRE-2221: Document minimum supported Java version for
+      Toolchains
+- Upgrade to 3.2.3
+  * Bug
+    + SUREFIRE-2210: Additional class path ordering broken since
+      3.2.0
+    + SUREFIRE-2211: additionalClasspathElement with UNC path not
+      working with Maven Failsafe Plugin
+    + SUREFIRE-2212: OutOfMemoryError raised when parsing files with
+      huge stderr/stdout output in surefire-report-parser
+    + SUREFIRE-2220:
+      SurefireForkChannel#getForkNodeConnectionString() returns
+      invalid URI string if localHost resolves to IPv6 address
+  * Dependency upgrade
+    + SUREFIRE-2214: Upgrade to HtmlUnit 3.8.0
+    + SUREFIRE-2215: Upgrade to Parent 41
+    + SUREFIRE-2216: Upgrade plugins and components (in ITs)
+- Upgrade to 3.2.2
+  * Bug Fixes
+    + SUREFIRE-2205: Use maven-plugin-report-plugin only in plugins
+      modules
+    + SUREFIRE-2206: Downgrade plexus-xml to 3.0.0
+  * Dependency updates
+    + SUREFIRE-2208: Bump org.codehaus.plexus:plexus-java from 1.1.2
+      to 1.2.0
+- Upgrade to 3.2.1
+  * New features and improvements
+    + SUREFIRE-1124: Support forkNumber in environment variables
+    + SUREFIRE-2177: Use junit-bom instead of single JUnit 5
+      versions
+    + SUREFIRE-2179: Support adding additional Maven dependencies to
+      the test runtime classpath
+    + SUREFIRE-2178: clarify classpathDependencyExcludes
+    + SUREFIRE-2182: Log starter implementation on DEBUG level
+  * Bug Fixes
+    + SUREFIRE-2190: Fix module dependencies for compile only
+      dependencies
+  * Documentation updates
+    + Fix TestNG web site URL (#671) @sabi0
+- Upgrade to 3.1.2
+  * Changes
+    + SUREFIRE-2166: Use ChoiceFormat to selective render percentage
+      and elapsed time in SurefireReportRenderer
+    + Simplify serialization/deserialization of elapsed time
+      (SUREFIRE-2164 + SUREFIRE-2167)
+    + SUREFIRE-2169: Potential NPE in WrappedReportEntry when
+      #getElapsed() is called
+    + MNG-6829: Replace StringUtils#isEmpty(String) and
+      #isNotEmpty(String)
+- Upgrade to 3.1.0
+  * Sub-task
+    + SUREFIRE-2162: Document upcoming mojo and file names change
+  * Bug
+    + SUREFIRE-2140: Cannot release Surefire on Windows
+  * Improvement
+    + SUREFIRE-2153: Replace SurefireReportGenerator with a new
+      SurefireReportRenderer
+    + SUREFIRE-2160: Replace LocalizedProperties with (Custom)I18N
+      approach from MPIR
+  * Task
+    + SUREFIRE-2130: Rewrite several test classes in report
+      plugin for upcoming Doxia 2.0.0 stack
+- Upgrade to 3.0.0
+  * New features and improvements
+    + SUREFIRE-2154: Get rid of localRepository from surefire
+      mojo parameter, use Resolver API
+  * Bug Fixes
+    + SUREFIRE-2119: Sanitize failIfNoSpecifiedTests prefix in
+      failsafe
+    + SUREFIRE-2143: Fix reporting of skipped parameterized test
+  * Documentation updates
+    + SUREFIRE-2156: Refresh download page
+- Modifed patch:
+  * 0003-Port-to-TestNG-7.4.0.patch -> 0001-Port-to-TestNG-7.4.0.patch
+    + regenerate
+  * maven-surefire-bootstrap-resources.patch
+    + regenerate from maven build
+- Removed patches:
+  * 0001-Maven-3.patch
+  * 0002-Port-to-current-doxia.patch
+  * 0004-Port-to-current-maven-shared-utils.patch
+    + not needed with this version
+
+-------------------------------------------------------------------
+Thu Feb 22 07:58:37 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to 2.22.2
+  * Bugs:
+    + SUREFIRE-1614: JUnit Runner that writes to System.out
+      corrupts Surefire’s STDOUT when using JUnit’s Vintage Engine
+- Upgrade to 2.22.1
+  * Bugs:
+    + SUREFIRE-1532: MIME type for javascript is now officially
+      application/javascript
+    + SUREFIRE-1535: Surefire unable to run testng suites in
+      parallel
+    + SUREFIRE-1538: Git considers PNG files as changed although
+      there is no change
+    + SUREFIRE-1550: The surefire XSD published on maven site lacks
+      of some rerun element
+    + SUREFIRE-1559: XML Report elements rerunError, rerunFailure,
+      flakyFailure, flakyError should contain element stackTrace and
+      should not be simpleContent.
+    + SUREFIRE-1561: Logs in Parallel Tests are mixed up when
+      forkMode=never or forkCount=0
+    + SUREFIRE-1564: Can’t override platform version through
+      project/plugin dependencies
+    + SUREFIRE-1579: Forks mixed up characters in standard output
+  * Improvements:
+    + SUREFIRE-1552: Nil element “failureMessage” in
+      failsafe-summary.xml should have self closed tag
+    + SUREFIRE-1554: Fix old test resources TEST-*.xml in favor of
+      continuing with SUREFIRE-1550
+    + SUREFIRE-1555: Elapsed time in XML Report should satisfy
+      pattern in XSD.
+    + SUREFIRE-1562: Support Java 11
+    + SUREFIRE-1565: Surefire should support parameterized
+      reportsDirectory
+  * Tasks:
+    + SUREFIRE-1569: m-invoker-p:3.1.0 attempts to resolve
+      maven-surefire-common:jar:2.22.1-SNAPSHOT from remote repo
+      'apache.snapshots'
+    + SUREFIRE-1578: Remove obsolete module
+      surefire-setup-integration-tests
+  * Dependency upgrades:
+    + SUREFIRE-1540: Upgrade maven-plugins parent to version 32
+    + SUREFIRE-1571: Upgrade maven-plugins parent to version 33
+- Fetch sources using source service to avoid bundling binaries in
+  sources
+- Fix broken links in the spec file
+- Modified patch:
+  * 0004-Port-to-current-maven-shared-utils.patch
+    + rediff to changed context
+
 -------------------------------------------------------------------
 Wed Apr 27 13:52:13 UTC 2022 - Fridrich Strba <fstrba@suse.com>

--- a/maven-surefire-provider-junit5.spec
+++ b/maven-surefire-provider-junit5.spec
@ -1,7 +1,7 @@
 #
-# spec file
+# spec file for package maven-surefire-provider-junit5
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -18,27 +18,21 @@

 %global base_name maven-surefire
 Name:           %{base_name}-provider-junit5
-Version:        2.22.0
+Version:        3.2.5
 Release:        0
 Summary:        JUnit 5 provider for Maven Surefire
 License:        Apache-2.0 AND CPL-1.0
 Group:          Development/Libraries/Java
 URL:            https://maven.apache.org/surefire/
-# ./generate-tarball.sh
-Source0:        %{base_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
-Patch0:         0001-Maven-3.patch
-Patch1:         0002-Port-to-current-doxia.patch
-Patch2:         0003-Port-to-TestNG-7.4.0.patch
-Patch3:         0004-Port-to-current-maven-shared-utils.patch
+Source0:        %{base_name}-%{version}.tar.xz
+Source1:        https://www.apache.org/licenses/LICENSE-2.0.txt
+Source2:        https://www.eclipse.org/legal/cpl-v10.html
+Patch0:         0001-Port-to-TestNG-7.4.0.patch
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
 BuildRequires:  maven-local
 BuildRequires:  mvn(org.apache.maven.surefire:common-java5)
 BuildRequires:  mvn(org.apache.maven:maven-parent:pom:)
-BuildRequires:  mvn(org.apiguardian:apiguardian-api)
 BuildRequires:  mvn(org.junit.platform:junit-platform-launcher)
 # PpidChecker relies on /usr/bin/ps to check process uptime
 Requires:       procps
@ -55,55 +49,39 @@ Group:          Documentation/HTML
 Javadoc for %{name}.

 %prep
-%setup -q -n surefire-%{version}
-cp -p %{SOURCE2} .
+%setup -q -n %{base_name}-%{version}
+cp -p %{SOURCE1} %{SOURCE2} .

-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch -P 0 -p1
+#patch -P 1 -p1

 # Disable strict doclint
 sed -i /-Xdoclint:all/d pom.xml

+%pom_remove_dep org.junit:junit-bom
+
 %pom_disable_module surefire-shadefire
-
-%pom_add_dep org.apiguardian:apiguardian-api::provided surefire-providers/surefire-junit-platform
-
 %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
+# Not wanted
+%pom_remove_plugin -r :maven-shade-plugin

-# Not in Fedora
+find -name *.java -exec sed -i -e s/org.apache.maven.surefire.shared.utils/org.apache.maven.shared.utils/ -e s/org.apache.maven.surefire.shared.io/org.apache.commons.io/ -e s/org.apache.maven.surefire.shared.lang3/org.apache.commons.lang3/ -e s/org.apache.maven.surefire.shared.compress/org.apache.commons.compress/ {} \;
+
+# Not packaged
 %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
-
-%pom_remove_plugin -r :maven-shade-plugin
-%pom_remove_plugin -r :build-helper-maven-plugin
-
-%pom_add_dep org.apache.commons:commons-lang3::runtime maven-surefire-plugin
-%pom_add_dep commons-io:commons-io::runtime maven-surefire-plugin
-
 %build
 pushd surefire-providers/surefire-junit-platform
 %{mvn_build} -f -- \
@ -122,9 +100,9 @@ popd

 %files -f surefire-providers/surefire-junit-platform/.mfiles
 %doc README.md
-%license LICENSE NOTICE cpl-v10.html
+%license LICENSE-2.0.txt cpl-v10.html

 %files javadoc -f surefire-providers/surefire-junit-platform/.mfiles-javadoc
-%license LICENSE NOTICE cpl-v10.html
+%license LICENSE-2.0.txt cpl-v10.html

 %changelog
--- a/maven-surefire.changes
+++ b/maven-surefire.changes
@ -1,3 +1,154 @@
+-------------------------------------------------------------------
+Wed Apr 10 10:54:02 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to 3.2.5
+  * Bug
+    + SUREFIRE-2223: Surefire evaluates parameter jvm before skip
+    + SUREFIRE-2224: StatelessXmlReporter#getTestProblems() does
+      not properly reflect report schema structure
+    + SUREFIRE-2225: Surefire ITs fail when project directory
+      contains space
+    + SUREFIRE-2229: + REGRESSION] SUREFIRE-2224 causes stack trace
+      to be omitted for errors and failures
+    + SUREFIRE-2231: JaCoCo 0.8.11 fails with old TestNG releases on
+      Java 17+
+  * Improvement
+    + SUREFIRE-1345: Support flakyFailure and flakyError in
+      TestSuiteXmlParser
+    + SUREFIRE-2221: Document minimum supported Java version for
+      Toolchains
+- Upgrade to 3.2.3
+  * Bug
+    + SUREFIRE-2210: Additional class path ordering broken since
+      3.2.0
+    + SUREFIRE-2211: additionalClasspathElement with UNC path not
+      working with Maven Failsafe Plugin
+    + SUREFIRE-2212: OutOfMemoryError raised when parsing files with
+      huge stderr/stdout output in surefire-report-parser
+    + SUREFIRE-2220:
+      SurefireForkChannel#getForkNodeConnectionString() returns
+      invalid URI string if localHost resolves to IPv6 address
+  * Dependency upgrade
+    + SUREFIRE-2214: Upgrade to HtmlUnit 3.8.0
+    + SUREFIRE-2215: Upgrade to Parent 41
+    + SUREFIRE-2216: Upgrade plugins and components (in ITs)
+- Upgrade to 3.2.2
+  * Bug Fixes
+    + SUREFIRE-2205: Use maven-plugin-report-plugin only in plugins
+      modules
+    + SUREFIRE-2206: Downgrade plexus-xml to 3.0.0
+  * Dependency updates
+    + SUREFIRE-2208: Bump org.codehaus.plexus:plexus-java from 1.1.2
+      to 1.2.0
+- Upgrade to 3.2.1
+  * New features and improvements
+    + SUREFIRE-1124: Support forkNumber in environment variables
+    + SUREFIRE-2177: Use junit-bom instead of single JUnit 5
+      versions
+    + SUREFIRE-2179: Support adding additional Maven dependencies to
+      the test runtime classpath
+    + SUREFIRE-2178: clarify classpathDependencyExcludes
+    + SUREFIRE-2182: Log starter implementation on DEBUG level
+  * Bug Fixes
+    + SUREFIRE-2190: Fix module dependencies for compile only
+      dependencies
+  * Documentation updates
+    + Fix TestNG web site URL (#671) @sabi0
+- Upgrade to 3.1.2
+  * Changes
+    + SUREFIRE-2166: Use ChoiceFormat to selective render percentage
+      and elapsed time in SurefireReportRenderer
+    + Simplify serialization/deserialization of elapsed time
+      (SUREFIRE-2164 + SUREFIRE-2167)
+    + SUREFIRE-2169: Potential NPE in WrappedReportEntry when
+      #getElapsed() is called
+    + MNG-6829: Replace StringUtils#isEmpty(String) and
+      #isNotEmpty(String)
+- Upgrade to 3.1.0
+  * Sub-task
+    + SUREFIRE-2162: Document upcoming mojo and file names change
+  * Bug
+    + SUREFIRE-2140: Cannot release Surefire on Windows
+  * Improvement
+    + SUREFIRE-2153: Replace SurefireReportGenerator with a new
+      SurefireReportRenderer
+    + SUREFIRE-2160: Replace LocalizedProperties with (Custom)I18N
+      approach from MPIR
+  * Task
+    + SUREFIRE-2130: Rewrite several test classes in report
+      plugin for upcoming Doxia 2.0.0 stack
+- Upgrade to 3.0.0
+  * New features and improvements
+    + SUREFIRE-2154: Get rid of localRepository from surefire
+      mojo parameter, use Resolver API
+  * Bug Fixes
+    + SUREFIRE-2119: Sanitize failIfNoSpecifiedTests prefix in
+      failsafe
+    + SUREFIRE-2143: Fix reporting of skipped parameterized test
+  * Documentation updates
+    + SUREFIRE-2156: Refresh download page
+- Modifed patch:
+  * 0003-Port-to-TestNG-7.4.0.patch -> 0001-Port-to-TestNG-7.4.0.patch
+    + regenerate
+  * maven-surefire-bootstrap-resources.patch
+    + regenerate from maven build
+- Removed patches:
+  * 0001-Maven-3.patch
+  * 0002-Port-to-current-doxia.patch
+  * 0004-Port-to-current-maven-shared-utils.patch
+    + not needed with this version
+
+-------------------------------------------------------------------
+Thu Feb 22 07:58:37 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to 2.22.2
+  * Bugs:
+    + SUREFIRE-1614: JUnit Runner that writes to System.out
+      corrupts Surefire’s STDOUT when using JUnit’s Vintage Engine
+- Upgrade to 2.22.1
+  * Bugs:
+    + SUREFIRE-1532: MIME type for javascript is now officially
+      application/javascript
+    + SUREFIRE-1535: Surefire unable to run testng suites in
+      parallel
+    + SUREFIRE-1538: Git considers PNG files as changed although
+      there is no change
+    + SUREFIRE-1550: The surefire XSD published on maven site lacks
+      of some rerun element
+    + SUREFIRE-1559: XML Report elements rerunError, rerunFailure,
+      flakyFailure, flakyError should contain element stackTrace and
+      should not be simpleContent.
+    + SUREFIRE-1561: Logs in Parallel Tests are mixed up when
+      forkMode=never or forkCount=0
+    + SUREFIRE-1564: Can’t override platform version through
+      project/plugin dependencies
+    + SUREFIRE-1579: Forks mixed up characters in standard output
+  * Improvements:
+    + SUREFIRE-1552: Nil element “failureMessage” in
+      failsafe-summary.xml should have self closed tag
+    + SUREFIRE-1554: Fix old test resources TEST-*.xml in favor of
+      continuing with SUREFIRE-1550
+    + SUREFIRE-1555: Elapsed time in XML Report should satisfy
+      pattern in XSD.
+    + SUREFIRE-1562: Support Java 11
+    + SUREFIRE-1565: Surefire should support parameterized
+      reportsDirectory
+  * Tasks:
+    + SUREFIRE-1569: m-invoker-p:3.1.0 attempts to resolve
+      maven-surefire-common:jar:2.22.1-SNAPSHOT from remote repo
+      'apache.snapshots'
+    + SUREFIRE-1578: Remove obsolete module
+      surefire-setup-integration-tests
+  * Dependency upgrades:
+    + SUREFIRE-1540: Upgrade maven-plugins parent to version 32
+    + SUREFIRE-1571: Upgrade maven-plugins parent to version 33
+- Fetch sources using source service to avoid bundling binaries in
+  sources
+- Fix broken links in the spec file
+- Modified patch:
+  * 0004-Port-to-current-maven-shared-utils.patch
+    + rediff to changed context
+
 -------------------------------------------------------------------
 Fri May  5 08:30:46 UTC 2023 - Fridrich Strba <fstrba@suse.com>

--- a/maven-surefire.spec
+++ b/maven-surefire.spec
@ -1,7 +1,7 @@
 #
 # spec file for package maven-surefire
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -17,30 +17,31 @@


 Name:           maven-surefire
-Version:        2.22.0
+Version:        3.2.5
 Release:        0
 Summary:        Test framework project
 License:        Apache-2.0 AND CPL-1.0
 Group:          Development/Libraries/Java
 URL:            https://maven.apache.org/surefire/
-# ./generate-tarball.sh
-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
+Source0:        %{name}-%{version}.tar.xz
+Source1:        https://www.apache.org/licenses/LICENSE-2.0.txt
+Source2:        https://www.eclipse.org/legal/cpl-v10.html
 Source10:       %{name}-build.tar.xz
-Patch0:         0001-Maven-3.patch
-Patch1:         0002-Port-to-current-doxia.patch
-Patch2:         0003-Port-to-TestNG-7.4.0.patch
-Patch3:         0004-Port-to-current-maven-shared-utils.patch
+Patch0:         0001-Port-to-TestNG-7.4.0.patch
 Patch10:        %{name}-bootstrap-resources.patch
 BuildRequires:  ant
+BuildRequires:  apache-commons-cli
+BuildRequires:  apache-commons-compress
 BuildRequires:  apache-commons-io
 BuildRequires:  apache-commons-lang3
+BuildRequires:  atinject
 BuildRequires:  fdupes
+BuildRequires:  google-guice
+BuildRequires:  guava
 BuildRequires:  java-devel >= 1.8
 BuildRequires:  javacc
 BuildRequires:  javapackages-local
+BuildRequires:  jdom
 BuildRequires:  jsr-305
 BuildRequires:  junit
 BuildRequires:  maven-common-artifact-filters
@ -52,9 +53,19 @@ BuildRequires:  maven-lib
 BuildRequires:  maven-plugin-annotations
 BuildRequires:  maven-reporting-api
 BuildRequires:  maven-reporting-impl
+BuildRequires:  maven-resolver
 BuildRequires:  maven-shared-utils
 BuildRequires:  objectweb-asm
+BuildRequires:  plexus-classworlds
+BuildRequires:  plexus-cli
+BuildRequires:  plexus-i18n
+BuildRequires:  plexus-interpolation
 BuildRequires:  plexus-languages
+BuildRequires:  plexus-metadata-generator
+BuildRequires:  plexus-utils
+BuildRequires:  plexus-xml
+BuildRequires:  qdox
+BuildRequires:  sisu-inject
 BuildRequires:  sisu-plexus
 BuildRequires:  testng
 BuildRequires:  xmvn-install
@ -131,56 +142,40 @@ Group:          Documentation/HTML
 Javadoc for %{name}.

 %prep
-%setup -q -n surefire-%{version} -a10
-cp -p %{SOURCE2} .
+%setup -q -a10
+cp -p %{SOURCE1} %{SOURCE2} .

-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch10 -p1
+%patch -P 0 -p1
+#patch -P 1 -p1
+%patch -P 10 -p1

 # Disable strict doclint
 sed -i /-Xdoclint:all/d pom.xml

+%pom_remove_dep org.junit:junit-bom
+
 %pom_disable_module surefire-shadefire
-
-%pom_disable_module surefire-junit-platform surefire-providers
-
 %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
+# Not wanted
+%pom_remove_plugin -r :maven-shade-plugin

-# Not in Fedora
+find -name *.java -exec sed -i -e s/org.apache.maven.surefire.shared.utils/org.apache.maven.shared.utils/ -e s/org.apache.maven.surefire.shared.io/org.apache.commons.io/ -e s/org.apache.maven.surefire.shared.lang3/org.apache.commons.lang3/ -e s/org.apache.maven.surefire.shared.compress/org.apache.commons.compress/ {} \;
+
+# Not packaged
 %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
-
-%pom_remove_plugin -r :maven-shade-plugin
-%pom_remove_plugin -r :build-helper-maven-plugin
-
-%pom_add_dep org.apache.commons:commons-lang3::runtime maven-surefire-plugin
-%pom_add_dep commons-io:commons-io::runtime maven-surefire-plugin
-
 %build
 %{mvn_package} ":*tests*" __noinstall
 %{mvn_package} ":{surefire,surefire-providers}" __noinstall
@ -190,33 +185,52 @@ sed -i /-Xdoclint:all/d pom.xml

 mkdir -p lib
 build-jar-repository -s -p lib \
-	apache-commons-lang3 \
-	commons-io \
-	javacc \
-	jsr-305 \
-	junit \
-	maven-common-artifact-filters/maven-common-artifact-filters \
-	maven-doxia/doxia-core \
-	maven-doxia/doxia-logging-api \
-	maven-doxia/doxia-sink-api \
-	maven-doxia-sitetools/doxia-site-renderer \
-	maven/maven-artifact \
-	maven/maven-compat \
-	maven/maven-core \
-	maven/maven-model \
-	maven/maven-plugin-api \
-	maven-plugin-tools/maven-plugin-annotations \
-	maven-reporting-api/maven-reporting-api \
-	maven-reporting-impl/maven-reporting-impl \
-	maven-shared-utils/maven-shared-utils \
-	objectweb-asm/asm \
-	org.eclipse.sisu.plexus \
-	plexus-languages/plexus-java \
-	testng
+    atinject \
+    apache-commons-lang3 \
+    commons-cli \
+    commons-compress \
+    commons-io \
+    guava/guava \
+    guice/google-guice \
+    javacc \
+    jdom2/jdom2 \
+    jsr-305 \
+    junit \
+    maven-common-artifact-filters/maven-common-artifact-filters \
+    maven-doxia/doxia-core \
+    maven-doxia/doxia-logging-api \
+    maven-doxia/doxia-sink-api \
+    maven-doxia-sitetools/doxia-site-renderer \
+    maven/maven-artifact \
+    maven/maven-compat \
+    maven/maven-core \
+    maven/maven-model \
+    maven/maven-plugin-api \
+    maven/maven-settings \
+    maven-plugin-tools/maven-plugin-annotations \
+    maven-reporting-api/maven-reporting-api \
+    maven-reporting-impl/maven-reporting-impl \
+    maven-resolver/maven-resolver-api \
+    maven-resolver/maven-resolver-util \
+    maven-shared-utils/maven-shared-utils \
+    objectweb-asm/asm \
+    org.eclipse.sisu.plexus \
+    org.eclipse.sisu.inject \
+    plexus-classworlds \
+    plexus/cli \
+    plexus-containers/plexus-component-annotations \
+    plexus-i18n/plexus-i18n \
+    plexus/interpolation \
+    plexus-languages/plexus-java \
+    plexus-metadata-generator \
+    plexus/utils \
+    plexus/xml \
+    qdox \
+    testng

 %{ant} \
-	-Dtest.skip=true \
-	package javadoc
+    -Dtest.skip=true \
+    package javadoc

 %{mvn_artifact} pom.xml
 %{mvn_artifact} surefire-providers/pom.xml
@ -228,6 +242,9 @@ for module in \
    surefire-api \
    surefire-booter \
    surefire-grouper \
+    surefire-extensions-api \
+    surefire-extensions-spi \
+    surefire-shared-utils \
    maven-surefire-common \
    surefire-report-parser \
    maven-surefire-plugin \
@ -261,7 +278,7 @@ done

 %files -f .mfiles
 %doc README.md
-%license LICENSE NOTICE cpl-v10.html
+%license LICENSE-2.0.txt cpl-v10.html

 %files plugin-bootstrap -f .mfiles-surefire-plugin

@ -276,6 +293,6 @@ done
 %files -n maven-failsafe-plugin-bootstrap -f .mfiles-failsafe-plugin

 %files javadoc -f .mfiles-javadoc
-%license LICENSE NOTICE cpl-v10.html
+%license LICENSE-2.0.txt cpl-v10.html

 %changelog