From 2d1ba7a8754458a8654915b21b64c681e6feff23 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 13 Mar 2025 13:48:49 +0000 Subject: [PATCH] import CS apache-commons-parent-73-3.module_el9+1171+eb38a622 --- .apache-commons-parent.metadata | 2 +- .gitignore | 2 +- SPECS/apache-commons-parent.spec | 134 ++++++++++++++++++++++++++++--- 3 files changed, 125 insertions(+), 13 deletions(-) diff --git a/.apache-commons-parent.metadata b/.apache-commons-parent.metadata index b290814..132f07c 100644 --- a/.apache-commons-parent.metadata +++ b/.apache-commons-parent.metadata @@ -1 +1 @@ -76ca92cc36e00950f6701bb566f3a8f3a323a2f6 SOURCES/commons-parent-49.tar.gz +736641a0aea66f8a33e7cfe578ae3f12bdd0411a SOURCES/commons-parent-73.tar.gz diff --git a/.gitignore b/.gitignore index 145b169..a73adb6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/commons-parent-49.tar.gz +SOURCES/commons-parent-73.tar.gz diff --git a/SPECS/apache-commons-parent.spec b/SPECS/apache-commons-parent.spec index 843036c..de9187c 100644 --- a/SPECS/apache-commons-parent.spec +++ b/SPECS/apache-commons-parent.spec @@ -1,43 +1,57 @@ +%bcond_with bootstrap + Name: apache-commons-parent -Version: 49 -Release: 2%{?dist} +Version: 73 +Release: 3%{?dist} Summary: Apache Commons Parent Pom -License: ASL 2.0 +License: Apache-2.0 URL: https://commons.apache.org/commons-parent-pom.html BuildArch: noarch +ExclusiveArch: %{java_arches} noarch -Source0: https://github.com/apache/commons-parent/archive/commons-parent-%{version}.tar.gz +Source0: https://github.com/apache/commons-parent/archive/rel/commons-parent-%{version}.tar.gz +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: maven-local -BuildRequires: mvn(org.apache:apache:pom:) +BuildRequires: mvn(biz.aQute.bnd:biz.aQute.bndlib) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) +BuildRequires: mvn(org.apache:apache:pom:) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) - +BuildRequires: mvn(org.moditect:moditect-maven-plugin) # Not generated automatically BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) +%endif Requires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +Requires: mvn(org.moditect:moditect-maven-plugin) %description The Project Object Model files for the apache-commons packages. %prep -%setup -q -n commons-parent-commons-parent-%{version} +%autosetup -p1 -n commons-parent-rel-commons-parent-%{version} # Plugin is not in fedora %pom_remove_plugin org.apache.commons:commons-build-plugin %pom_remove_plugin org.apache.maven.plugins:maven-scm-publish-plugin +%pom_remove_plugin org.spdx:spdx-maven-plugin +%pom_remove_plugin org.cyclonedx:cyclonedx-maven-plugin # Plugins useless in package builds %pom_remove_plugin :apache-rat-plugin %pom_remove_plugin :buildnumber-maven-plugin -%pom_remove_plugin :maven-enforcer-plugin %pom_remove_plugin :maven-site-plugin %pom_remove_plugin :maven-source-plugin +%pom_remove_plugin :versions-maven-plugin +%pom_remove_plugin :maven-artifact-plugin + +%pom_remove_dep org.junit:junit-bom # Remove profiles for plugins that are useless in package builds -for profile in animal-sniffer japicmp jacoco cobertura clirr; do - %pom_xpath_remove "pom:profile[pom:id='$profile']" +for profile in animal-sniffer japicmp jacoco cobertura; do + %pom_xpath_remove "pom:profile[pom:id='${profile}']" done %build @@ -47,16 +61,114 @@ done %mvn_install %files -f .mfiles -%doc RELEASE-NOTES.txt +%doc README.md RELEASE-NOTES.txt %license LICENSE.txt NOTICE.txt %changelog +* Fri Nov 29 2024 Mikolaj Izdebski - 73-2 +- Update javapackages test plan to f42 + +* Fri Aug 23 2024 Mikolaj Izdebski - 73-1 +- Update to upstream version 73 +- Resolves: rhbz#2300082 + +* Wed Jul 17 2024 Fedora Release Engineering - 71-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Jun 18 2024 Marian Koncek - 71-1 +- Update to upstream version 71 + +* Tue Feb 27 2024 Jiri Vanek - 66-3 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 66-2 +- bump of release for for java-21-openjdk as system jdk + +* Fri Feb 02 2024 Mikolaj Izdebski - 66-1 +- Update to upstream version 66 + +* Mon Jan 22 2024 Fedora Release Engineering - 65-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 65-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Dec 04 2023 Mikolaj Izdebski - 65-2 +- Enable moditect-maven-plugin + +* Mon Dec 04 2023 Mikolaj Izdebski - 65-1 +- Update to upstream version 65 + +* Fri Sep 01 2023 Mikolaj Izdebski - 61-2 +- Rebuild + +* Wed Aug 30 2023 Mikolaj Izdebski - 61-1 +- Update to upstream version 61 + +* Fri Aug 25 2023 Mikolaj Izdebski - 60-1 +- Update to upstream version 60 + +* Fri Aug 11 2023 Marian Koncek - 59-1 +- Update to upstream version 59 + +* Wed Jul 19 2023 Fedora Release Engineering - 53-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jan 18 2023 Fedora Release Engineering - 53-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jul 20 2022 Fedora Release Engineering - 53-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sun Apr 24 2022 Mikolaj Izdebski - 53-1 +- Update to upstream version 53 + +* Sat Feb 05 2022 Jiri Vanek - 52-6 +- Rebuilt for java-17-openjdk as system jdk + +* Wed Jan 19 2022 Fedora Release Engineering - 52-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 52-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 52-3 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 52-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Sep 01 2020 Fabio Valentini - 52-1 +- Update to version 52. + +* Fri Aug 21 2020 Marian Koncek - 52-1 +- Update to upstream version 52 + +* Tue Jul 28 2020 Marian Koncek - 51-1 +- Update to upstream version 51 + +* Mon Jul 27 2020 Fedora Release Engineering - 47-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 47-5 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Jan 29 2020 Marian Koncek - 50-1 +- Update to upstream version 50 + +* Tue Jan 28 2020 Fedora Release Engineering - 47-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Nov 05 2019 Mikolaj Izdebski - 49-2 - Mass rebuild for javapackages-tools 201902 * Wed Sep 18 2019 Marian Koncek - 49-1 - Update to upstream version 49 +* Wed Jul 24 2019 Fedora Release Engineering - 47-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri May 24 2019 Mikolaj Izdebski - 48-2 - Mass rebuild for javapackages-tools 201901