diff --git a/.gitignore b/.gitignore index 9c8864a..f509f6c 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,9 @@ /commons-parent-61.tar.gz /commons-parent-65.tar.gz /commons-parent-66.tar.gz +/commons-parent-67.tar.gz +/commons-parent-69.tar.gz +/commons-parent-71.tar.gz +/commons-parent-73.tar.gz +/commons-parent-85.tar.gz +/commons-parent-89.tar.gz diff --git a/apache-commons-parent.spec b/apache-commons-parent.spec index 020527c..494c973 100644 --- a/apache-commons-parent.spec +++ b/apache-commons-parent.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: apache-commons-parent -Version: 66 -Release: 1%{?dist} +Version: 89 +Release: %autorelease Summary: Apache Commons Parent Pom License: Apache-2.0 URL: https://commons.apache.org/commons-parent-pom.html @@ -14,7 +14,7 @@ Source0: https://github.com/apache/commons-parent/archive/rel/commons-par %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 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) @@ -24,7 +24,6 @@ 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) @@ -32,7 +31,7 @@ Requires: mvn(org.moditect:moditect-maven-plugin) The Project Object Model files for the apache-commons packages. %prep -%setup -q -n commons-parent-rel-commons-parent-%{version} +%autosetup -p1 -C # Plugin is not in fedora %pom_remove_plugin org.apache.commons:commons-build-plugin @@ -47,16 +46,17 @@ The Project Object Model files for the apache-commons packages. %pom_remove_plugin :maven-source-plugin %pom_remove_plugin :versions-maven-plugin %pom_remove_plugin :maven-artifact-plugin +%pom_remove_plugin :maven-changes-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; do +for profile in animal-sniffer japicmp jacoco; do %pom_xpath_remove "pom:profile[pom:id='${profile}']" done %build -%mvn_build +%mvn_build -j %install %mvn_install @@ -66,216 +66,4 @@ done %license LICENSE.txt NOTICE.txt %changelog -* 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 - -* Fri May 03 2019 Marian Koncek - 48-1 -- Update to upstream version 48 - -* Thu Jan 31 2019 Fedora Release Engineering - 47-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Oct 12 2018 Marian Koncek - 47-1 -- Update to upstream version 47 - -* Thu Jul 12 2018 Fedora Release Engineering - 43-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 43-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Fri Jan 26 2018 Mikolaj Izdebski - 43-1 -- Update to upstream version 43 - -* Wed Jul 26 2017 Fedora Release Engineering - 42-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon Feb 06 2017 Michael Simacek - 42-3 -- Remove more useless plugins - -* Thu Jan 05 2017 Michael Simacek - 42-2 -- Remove profiles for plugins that are useless in package builds - -* Mon Jan 02 2017 Michael Simacek - 42-1 -- Update to upstream version 42 - -* Tue Jun 14 2016 Mikolaj Izdebski - 40-2 -- Add missing dependency - -* Wed May 11 2016 Mikolaj Izdebski - 40-1 -- Update to upstream version 40 - -* Wed Feb 03 2016 Fedora Release Engineering - 39-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Sep 8 2015 Mikolaj Izdebski - 39-1 -- Update to upstream version 39 - -* Thu Jun 25 2015 Mikolaj Izdebski - 38-1 -- Update to upstream version 38 - -* Wed Jun 17 2015 Fedora Release Engineering - 37-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue Feb 3 2015 Mikolaj Izdebski - 37-2 -- Remove animal-sniffer profile - -* Mon Feb 2 2015 Mikolaj Izdebski - 37-1 -- Update to upstream version 37 - -* Mon Oct 27 2014 Mikolaj Izdebski - 35-1 -- Update to upstream version 35 - -* Wed Jul 30 2014 Mikolaj Izdebski - 34-4 -- Fix build-requires on apache-parent - -* Sat Jun 07 2014 Fedora Release Engineering - 34-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed May 28 2014 Mikolaj Izdebski - 34-2 -- Rebuild to regenerate Maven auto-requires - -* Thu Apr 17 2014 Mikolaj Izdebski - 34-1 -- Update to upstream version 34 - -* Tue Mar 04 2014 Stanislav Ochotnicky - 33-2 -- Remove maven 3 profile - -* Wed Feb 12 2014 Mikolaj Izdebski - 33-1 -- Update to upstream version 33 - -* Tue Aug 06 2013 Mat Booth - 32-2 -- Remove use of maven-scm-publish-plugin plugin - -* Tue Aug 06 2013 Mat Booth - 32-1 -- Updated to latest upstream, rhbz #904731 - -* Tue Aug 06 2013 Mat Booth - 26-7 -- Use pom macros instead of patching -- Update spec for latest guidelines rhbz #991975 - -* Sat Aug 03 2013 Fedora Release Engineering - 26-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon Apr 15 2013 Mikolaj Izdebski - 26-5 -- Add buildnumber-maven-plugin to R/BR - -* Wed Apr 10 2013 Mikolaj Izdebski - 26-4 -- Fix Requires and BuildRequires - -* Wed Feb 13 2013 Fedora Release Engineering - 26-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 26-2 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Fri Oct 19 2012 Chris Spike 22-4 -- Updated to 26 - -* Wed Jul 18 2012 Fedora Release Engineering - 22-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jan 12 2012 Fedora Release Engineering - 22-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Dec 14 2011 Alexander Kurtakov 22-2 -- Add missing BR/R on buildbumber-maven-plugin. - -* Wed Dec 7 2011 Alexander Kurtakov 22-1 -- Update to latest upstream. - -* Fri Apr 15 2011 Chris Spike 20-1 -- Updated to 20 -- Fixed Rs for maven 3 - -* Sat Nov 6 2010 Chris Spike 15-2 -- Added patch to remove commons-build-plugin from pom file - -* Wed Oct 20 2010 Chris Spike 15-1 -- Initial version of the package +%autochangelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..2bab4dd --- /dev/null +++ b/changelog @@ -0,0 +1,225 @@ +* 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 + +* Fri May 03 2019 Marian Koncek - 48-1 +- Update to upstream version 48 + +* Thu Jan 31 2019 Fedora Release Engineering - 47-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Oct 12 2018 Marian Koncek - 47-1 +- Update to upstream version 47 + +* Thu Jul 12 2018 Fedora Release Engineering - 43-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 43-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Fri Jan 26 2018 Mikolaj Izdebski - 43-1 +- Update to upstream version 43 + +* Wed Jul 26 2017 Fedora Release Engineering - 42-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Mon Feb 06 2017 Michael Simacek - 42-3 +- Remove more useless plugins + +* Thu Jan 05 2017 Michael Simacek - 42-2 +- Remove profiles for plugins that are useless in package builds + +* Mon Jan 02 2017 Michael Simacek - 42-1 +- Update to upstream version 42 + +* Tue Jun 14 2016 Mikolaj Izdebski - 40-2 +- Add missing dependency + +* Wed May 11 2016 Mikolaj Izdebski - 40-1 +- Update to upstream version 40 + +* Wed Feb 03 2016 Fedora Release Engineering - 39-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Sep 8 2015 Mikolaj Izdebski - 39-1 +- Update to upstream version 39 + +* Thu Jun 25 2015 Mikolaj Izdebski - 38-1 +- Update to upstream version 38 + +* Wed Jun 17 2015 Fedora Release Engineering - 37-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Feb 3 2015 Mikolaj Izdebski - 37-2 +- Remove animal-sniffer profile + +* Mon Feb 2 2015 Mikolaj Izdebski - 37-1 +- Update to upstream version 37 + +* Mon Oct 27 2014 Mikolaj Izdebski - 35-1 +- Update to upstream version 35 + +* Wed Jul 30 2014 Mikolaj Izdebski - 34-4 +- Fix build-requires on apache-parent + +* Sat Jun 07 2014 Fedora Release Engineering - 34-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed May 28 2014 Mikolaj Izdebski - 34-2 +- Rebuild to regenerate Maven auto-requires + +* Thu Apr 17 2014 Mikolaj Izdebski - 34-1 +- Update to upstream version 34 + +* Tue Mar 04 2014 Stanislav Ochotnicky - 33-2 +- Remove maven 3 profile + +* Wed Feb 12 2014 Mikolaj Izdebski - 33-1 +- Update to upstream version 33 + +* Tue Aug 06 2013 Mat Booth - 32-2 +- Remove use of maven-scm-publish-plugin plugin + +* Tue Aug 06 2013 Mat Booth - 32-1 +- Updated to latest upstream, rhbz #904731 + +* Tue Aug 06 2013 Mat Booth - 26-7 +- Use pom macros instead of patching +- Update spec for latest guidelines rhbz #991975 + +* Sat Aug 03 2013 Fedora Release Engineering - 26-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Apr 15 2013 Mikolaj Izdebski - 26-5 +- Add buildnumber-maven-plugin to R/BR + +* Wed Apr 10 2013 Mikolaj Izdebski - 26-4 +- Fix Requires and BuildRequires + +* Wed Feb 13 2013 Fedora Release Engineering - 26-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 26-2 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Fri Oct 19 2012 Chris Spike 22-4 +- Updated to 26 + +* Wed Jul 18 2012 Fedora Release Engineering - 22-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jan 12 2012 Fedora Release Engineering - 22-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Dec 14 2011 Alexander Kurtakov 22-2 +- Add missing BR/R on buildbumber-maven-plugin. + +* Wed Dec 7 2011 Alexander Kurtakov 22-1 +- Update to latest upstream. + +* Fri Apr 15 2011 Chris Spike 20-1 +- Updated to 20 +- Fixed Rs for maven 3 + +* Sat Nov 6 2010 Chris Spike 15-2 +- Added patch to remove commons-build-plugin from pom file + +* Wed Oct 20 2010 Chris Spike 15-1 +- Initial version of the package diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index a2cdaba..ae17c0c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,7 +1,7 @@ summary: Run javapackages-specific tests discover: how: fmf - url: https://src.fedoraproject.org/tests/javapackages - ref: f40 + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git + ref: f43 execute: how: tmt diff --git a/sources b/sources index 13b1a7a..56cbc11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-parent-66.tar.gz) = 0f2987c949efd0768120e6beb21c72482e28c0275ad2856b686a97241a718b47f71d390de063f6ab48e84f8ba38bcb7f323a63ba0c1eb980ddd7c5667850e4fe +SHA512 (commons-parent-89.tar.gz) = e6f89e9a28eb10165dd2f32f3f0a96207b90a9a4aeec9ed1716631e9a42dc2ada89033ad227b7ee73cf45283a3a8c715939505b963db73457c9dc665a857af6a