OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-surefire?expand=0&rev=29

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

@@ -99,7 +99,7 @@
 --- a/pom.xml
 +++ b/pom.xml
 @@ -91,7 +91,7 @@
-     <mavenPluginPluginVersion>3.5</mavenPluginPluginVersion>
+     <!-- <shadedVersion>2.12.4</shadedVersion> commented out due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
      <commonsLang3Version>3.5</commonsLang3Version>
      <commonsIoVersion>2.5</commonsIoVersion>
 -    <mavenSharedUtilsVersion>0.9</mavenSharedUtilsVersion>

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.

_service

@@ -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-2.22.2</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>

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>

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"

maven-surefire-2.22.2.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a39d9fed069540a62a0be2ad546aec91104df541122821f8ed7d40a7418948fe
+size 703876

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,17 +18,15 @@
 
 %global base_name maven-surefire
 Name:           %{base_name}-plugins
-Version:        2.22.0
+Version:        2.22.2
 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.xz
-Source0:        %{base_name}-%{version}.tar.gz
+Source1:        https://www.apache.org/licenses/LICENSE-2.0.txt
-# Remove bundled binaries which cannot be easily verified for licensing
+Source2:        https://www.eclipse.org/legal/cpl-v10.html
-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
@@ -105,23 +103,19 @@ Group:          Development/Libraries/Java
 Javadoc for %{name}.
 
 %prep
-%setup -q -n surefire-%{version}
+%setup -q -n %{base_name}-%{version}
-cp -p %{SOURCE2} .
+cp -p %{SOURCE1} %{SOURCE2} .
 
-%patch0 -p1
+%patch -P 0 -p1
-%patch1 -p1
+%patch -P 1 -p1
-%patch2 -p1
+%patch -P 2 -p1
-%patch3 -p1
+%patch -P 3 -p1
 
 # Disable strict doclint
 sed -i /-Xdoclint:all/d pom.xml
 
 %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
-
 # QA plugin useful only for upstream
 %pom_remove_plugin -r :jacoco-maven-plugin
 
@@ -151,6 +145,9 @@ 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
 
+%pom_xpath_inject pom:project/pom:properties "
+    <mavenPluginToolsVersion>3.5.2</mavenPluginToolsVersion>"
+
 # Disable all modules besides the 3 plugins
 for module in \
     surefire-logger-api \
@@ -161,7 +158,6 @@ for module in \
     surefire-providers \
     maven-surefire-common \
     surefire-report-parser \
-    surefire-setup-integration-tests \
     surefire-its; do
   %pom_disable_module ${module}
 done
@@ -190,6 +186,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

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,17 +18,15 @@
 
 %global base_name maven-surefire
 Name:           %{base_name}-provider-junit5
-Version:        2.22.0
+Version:        2.22.2
 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.xz
-Source0:        %{base_name}-%{version}.tar.gz
+Source1:        https://www.apache.org/licenses/LICENSE-2.0.txt
-# Remove bundled binaries which cannot be easily verified for licensing
+Source2:        https://www.eclipse.org/legal/cpl-v10.html
-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
@@ -55,13 +53,13 @@ Group:          Documentation/HTML
 Javadoc for %{name}.
 
 %prep
-%setup -q -n surefire-%{version}
+%setup -q -n %{base_name}-%{version}
-cp -p %{SOURCE2} .
+cp -p %{SOURCE1} %{SOURCE2} .
 
-%patch0 -p1
+%patch -P 0 -p1
-%patch1 -p1
+%patch -P 1 -p1
-%patch2 -p1
+%patch -P 2 -p1
-%patch3 -p1
+%patch -P 3 -p1
 
 # Disable strict doclint
 sed -i /-Xdoclint:all/d pom.xml
@@ -72,10 +70,6 @@ sed -i /-Xdoclint:all/d pom.xml
 
 %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
-
 # QA plugin useful only for upstream
 %pom_remove_plugin -r :jacoco-maven-plugin
 
@@ -122,9 +116,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

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,17 +17,15 @@
 
 
 Name:           maven-surefire
-Version:        2.22.0
+Version:        2.22.2
 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.xz
-Source0:        %{name}-%{version}.tar.gz
+Source1:        https://www.apache.org/licenses/LICENSE-2.0.txt
-# Remove bundled binaries which cannot be easily verified for licensing
+Source2:        https://www.eclipse.org/legal/cpl-v10.html
-Source1:        generate-tarball.sh
-Source2:        http://junit.sourceforge.net/cpl-v10.html
 Source10:       %{name}-build.tar.xz
 Patch0:         0001-Maven-3.patch
 Patch1:         0002-Port-to-current-doxia.patch
@@ -131,14 +129,14 @@ Group:          Documentation/HTML
 Javadoc for %{name}.
 
 %prep
-%setup -q -n surefire-%{version} -a10
+%setup -q -a10
-cp -p %{SOURCE2} .
+cp -p %{SOURCE1} %{SOURCE2} .
 
-%patch0 -p1
+%patch -P 0 -p1
-%patch1 -p1
+%patch -P 1 -p1
-%patch2 -p1
+%patch -P 2 -p1
-%patch3 -p1
+%patch -P 3 -p1
-%patch10 -p1
+%patch -P 10 -p1
 
 # Disable strict doclint
 sed -i /-Xdoclint:all/d pom.xml
@@ -149,10 +147,6 @@ sed -i /-Xdoclint:all/d pom.xml
 
 %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
-
 # QA plugin useful only for upstream
 %pom_remove_plugin -r :jacoco-maven-plugin
 
@@ -261,7 +255,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 +270,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