From a24ec8833c00c225bd4b6fa923d8cb2c0de7505f Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 23 Feb 2024 14:16:02 +0100 Subject: [PATCH 01/21] bump of release for for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 We are sorry, we messed a bit, and we have to bump release in this package --- apache-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index d46c21c..67d547b 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -2,7 +2,7 @@ Name: apache-parent Version: 31 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Parent POM file for Apache projects License: Apache-2.0 URL: https://apache.org/ @@ -42,6 +42,9 @@ This package contains the parent pom file for apache projects. %license LICENSE NOTICE %changelog +* Fri Feb 23 2024 Jiri Vanek - 31-4 +- bump of release for for java-21-openjdk as system jdk + * Mon Jan 22 2024 Fedora Release Engineering - 31-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 673e242faf3ab7333d54902bfd984f7234120d9c Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 14:51:18 +0100 Subject: [PATCH 02/21] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- apache-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 67d547b..941b7a4 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -2,7 +2,7 @@ Name: apache-parent Version: 31 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Parent POM file for Apache projects License: Apache-2.0 URL: https://apache.org/ @@ -42,6 +42,9 @@ This package contains the parent pom file for apache projects. %license LICENSE NOTICE %changelog +* Tue Feb 27 2024 Jiri Vanek - 31-5 +- Rebuilt for java-21-openjdk as system jdk + * Fri Feb 23 2024 Jiri Vanek - 31-4 - bump of release for for java-21-openjdk as system jdk From 5567e8f55bd08fd1c5ee10dd465c86eb173c11d3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 17:13:30 +0000 Subject: [PATCH 03/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- apache-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 941b7a4..b4e0ca1 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -2,7 +2,7 @@ Name: apache-parent Version: 31 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Parent POM file for Apache projects License: Apache-2.0 URL: https://apache.org/ @@ -42,6 +42,9 @@ This package contains the parent pom file for apache projects. %license LICENSE NOTICE %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 31-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Feb 27 2024 Jiri Vanek - 31-5 - Rebuilt for java-21-openjdk as system jdk From cbdbb48545f06474359d663a3a8eb0c384fff764 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:29 +0200 Subject: [PATCH 04/21] Switch javapackages tests to f41 branch --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index a2cdaba..17c6113 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f40 + ref: f41 execute: how: tmt From b53392072db64678fe96c4eaab94b42a209c9de9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:56 +0200 Subject: [PATCH 05/21] Switch from %setup to %autosetup --- apache-parent.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index b4e0ca1..43ee400 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -28,7 +28,7 @@ Requires: mvn(org.apache.apache.resources:apache-jar-resource-bundle) This package contains the parent pom file for apache projects. %prep -%setup -q -n apache-%{version} +%autosetup -p1 -n apache-%{version} %pom_remove_plugin :maven-site-plugin From f1c16fe6fbbe5e37148dd98faa16ff7f295dd89f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:01 +0200 Subject: [PATCH 06/21] Convert to %autorelease and %autochangelog --- apache-parent.spec | 183 +-------------------------------------------- changelog | 180 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 182 insertions(+), 181 deletions(-) create mode 100644 changelog diff --git a/apache-parent.spec b/apache-parent.spec index 43ee400..e353304 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -2,7 +2,7 @@ Name: apache-parent Version: 31 -Release: 6%{?dist} +Release: %autorelease Summary: Parent POM file for Apache projects License: Apache-2.0 URL: https://apache.org/ @@ -42,183 +42,4 @@ This package contains the parent pom file for apache projects. %license LICENSE NOTICE %changelog -* Wed Jul 17 2024 Fedora Release Engineering - 31-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Feb 27 2024 Jiri Vanek - 31-5 -- Rebuilt for java-21-openjdk as system jdk - -* Fri Feb 23 2024 Jiri Vanek - 31-4 -- bump of release for for java-21-openjdk as system jdk - -* Mon Jan 22 2024 Fedora Release Engineering - 31-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 31-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Dec 08 2023 Marian Koncek - 31-1 -- Update to upstream version 31 - -* Fri Sep 01 2023 Mikolaj Izdebski - 30-2 -- Rebuild - -* Fri Aug 11 2023 Marian Koncek - 30-1 -- Update to upstream version 30 - -* Wed Jul 19 2023 Fedora Release Engineering - 27-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jan 18 2023 Fedora Release Engineering - 27-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Tue Sep 06 2022 Marian Koncek - 27-1 -- Update to upstream version 27 - -* Wed Jul 20 2022 Fedora Release Engineering - 26-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Apr 27 2022 Mikolaj Izdebski - 26-2 -- Workaround build issue with RPM 4.18 - -* Thu Apr 21 2022 Mikolaj Izdebski - 26-1 -- Update to upstream version 26 - -* Sat Feb 05 2022 Jiri Vanek - 23-8 -- Rebuilt for java-17-openjdk as system jdk - -* Wed Jan 19 2022 Fedora Release Engineering - 23-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 23-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 17 2021 Mikolaj Izdebski - 23-5 -- Bootstrap build -- Non-bootstrap build - -* Tue Jan 26 2021 Fedora Release Engineering - 23-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 23-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 10 2020 Jiri Vanek - 23-2 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Mon Mar 02 2020 Fabio Valentini - 23-1 -- Update to version 23. - -* Wed Jan 29 2020 Marian Koncek - 23-1 -- Update to upstream version 23 - -* Tue Jan 28 2020 Fedora Release Engineering - 22-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jan 17 2020 Fabio Valentini - 22-1 -- Update to version 22. - -* Tue Nov 05 2019 Mikolaj Izdebski - 21-3 -- Mass rebuild for javapackages-tools 201902 - -* Wed Jul 24 2019 Fedora Release Engineering - 21-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri May 24 2019 Mikolaj Izdebski - 21-2 -- Mass rebuild for javapackages-tools 201901 - -* Tue May 14 2019 Mikolaj Izdebski - 21-1 -- Update to upstream version 21 - -* Thu Jan 31 2019 Fedora Release Engineering - 19-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 19-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 19-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jan 25 2018 Mikolaj Izdebski - 19-1 -- Update to upstream version 19 -- Add missing BR on apache-resource-bundles - -* Wed Jul 26 2017 Fedora Release Engineering - 18-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 18-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue May 17 2016 Mikolaj Izdebski - 18-1 -- Update to upstream version 18 - -* Wed Feb 03 2016 Fedora Release Engineering - 17-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 17-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Apr 27 2015 Mikolaj Izdebski - 17-1 -- Update to upstream version 17 - -* Mon Nov 17 2014 Mikolaj Izdebski - 16-1 -- Update to upstream version 16 - -* Mon Sep 29 2014 Mikolaj Izdebski - 15-1 -- Update to upstream version 15 - -* Sat Jun 07 2014 Fedora Release Engineering - 14-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed May 28 2014 Mikolaj Izdebski - 14-2 -- Rebuild to regenerate Maven auto-requires - -* Mon Mar 10 2014 Mikolaj Izdebski - 14-1 -- Update to upstream version 14 - -* Tue Mar 04 2014 Stanislav Ochotnicky - 10-15 -- Remove maven-site-plugin from dependencies - -* Fri Sep 20 2013 Mikolaj Izdebski - 10-14 -- Rebuild to regenerate Maven provides - -* Thu Aug 29 2013 Mikolaj Izdebski - 10-13 -- Add missing R: apache-resource-bundles - -* Mon Aug 26 2013 Michal Srb - 10-12 -- Migrate away from mvn-rpmbuild - -* Sat Aug 03 2013 Fedora Release Engineering - 10-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Feb 13 2013 Fedora Release Engineering - 10-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 10-9 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Tue Dec 18 2012 Michal Srb - 10-8 -- Added license (Resolves: #888287) - -* Wed Nov 21 2012 Stanislav Ochotnicky - 10-7 -- Install patched pom not the original - -* Fri Nov 2 2012 Mikolaj Izdebski - 10-6 -- Add missing R: maven-remote-resources-plugin, apache-resource-bundles -- Add %%check to verify dependencies during build - -* Thu Jul 26 2012 Stanislav Ochotnicky - 10-5 -- Make sure we generate 1.5 version bytecode - -* Wed Jul 18 2012 Fedora Release Engineering - 10-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jan 12 2012 Fedora Release Engineering - 10-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Sep 13 2011 Andy Grimm 10-2 -- Follow suggestions in BZ #736069 - -* Mon Aug 29 2011 Andy Grimm 10-1 -- Initial Build +%autochangelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..22a9adc --- /dev/null +++ b/changelog @@ -0,0 +1,180 @@ +* Wed Jul 17 2024 Fedora Release Engineering - 31-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 31-5 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 31-4 +- bump of release for for java-21-openjdk as system jdk + +* Mon Jan 22 2024 Fedora Release Engineering - 31-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 31-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Dec 08 2023 Marian Koncek - 31-1 +- Update to upstream version 31 + +* Fri Sep 01 2023 Mikolaj Izdebski - 30-2 +- Rebuild + +* Fri Aug 11 2023 Marian Koncek - 30-1 +- Update to upstream version 30 + +* Wed Jul 19 2023 Fedora Release Engineering - 27-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jan 18 2023 Fedora Release Engineering - 27-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Sep 06 2022 Marian Koncek - 27-1 +- Update to upstream version 27 + +* Wed Jul 20 2022 Fedora Release Engineering - 26-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Apr 27 2022 Mikolaj Izdebski - 26-2 +- Workaround build issue with RPM 4.18 + +* Thu Apr 21 2022 Mikolaj Izdebski - 26-1 +- Update to upstream version 26 + +* Sat Feb 05 2022 Jiri Vanek - 23-8 +- Rebuilt for java-17-openjdk as system jdk + +* Wed Jan 19 2022 Fedora Release Engineering - 23-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 23-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 23-5 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 23-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 23-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 23-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Mon Mar 02 2020 Fabio Valentini - 23-1 +- Update to version 23. + +* Wed Jan 29 2020 Marian Koncek - 23-1 +- Update to upstream version 23 + +* Tue Jan 28 2020 Fedora Release Engineering - 22-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jan 17 2020 Fabio Valentini - 22-1 +- Update to version 22. + +* Tue Nov 05 2019 Mikolaj Izdebski - 21-3 +- Mass rebuild for javapackages-tools 201902 + +* Wed Jul 24 2019 Fedora Release Engineering - 21-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 24 2019 Mikolaj Izdebski - 21-2 +- Mass rebuild for javapackages-tools 201901 + +* Tue May 14 2019 Mikolaj Izdebski - 21-1 +- Update to upstream version 21 + +* Thu Jan 31 2019 Fedora Release Engineering - 19-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 19-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 19-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jan 25 2018 Mikolaj Izdebski - 19-1 +- Update to upstream version 19 +- Add missing BR on apache-resource-bundles + +* Wed Jul 26 2017 Fedora Release Engineering - 18-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue May 17 2016 Mikolaj Izdebski - 18-1 +- Update to upstream version 18 + +* Wed Feb 03 2016 Fedora Release Engineering - 17-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 17-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Apr 27 2015 Mikolaj Izdebski - 17-1 +- Update to upstream version 17 + +* Mon Nov 17 2014 Mikolaj Izdebski - 16-1 +- Update to upstream version 16 + +* Mon Sep 29 2014 Mikolaj Izdebski - 15-1 +- Update to upstream version 15 + +* Sat Jun 07 2014 Fedora Release Engineering - 14-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed May 28 2014 Mikolaj Izdebski - 14-2 +- Rebuild to regenerate Maven auto-requires + +* Mon Mar 10 2014 Mikolaj Izdebski - 14-1 +- Update to upstream version 14 + +* Tue Mar 04 2014 Stanislav Ochotnicky - 10-15 +- Remove maven-site-plugin from dependencies + +* Fri Sep 20 2013 Mikolaj Izdebski - 10-14 +- Rebuild to regenerate Maven provides + +* Thu Aug 29 2013 Mikolaj Izdebski - 10-13 +- Add missing R: apache-resource-bundles + +* Mon Aug 26 2013 Michal Srb - 10-12 +- Migrate away from mvn-rpmbuild + +* Sat Aug 03 2013 Fedora Release Engineering - 10-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Feb 13 2013 Fedora Release Engineering - 10-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 10-9 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Tue Dec 18 2012 Michal Srb - 10-8 +- Added license (Resolves: #888287) + +* Wed Nov 21 2012 Stanislav Ochotnicky - 10-7 +- Install patched pom not the original + +* Fri Nov 2 2012 Mikolaj Izdebski - 10-6 +- Add missing R: maven-remote-resources-plugin, apache-resource-bundles +- Add %%check to verify dependencies during build + +* Thu Jul 26 2012 Stanislav Ochotnicky - 10-5 +- Make sure we generate 1.5 version bytecode + +* Wed Jul 18 2012 Fedora Release Engineering - 10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jan 12 2012 Fedora Release Engineering - 10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Sep 13 2011 Andy Grimm 10-2 +- Follow suggestions in BZ #736069 + +* Mon Aug 29 2011 Andy Grimm 10-1 +- Initial Build From 7fc80046ea4e5d142a5ab25b36f69f792456a211 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 02:31:09 +0200 Subject: [PATCH 07/21] Update to upstream version 33 - Resolves: rhbz#2296782 --- .gitignore | 1 + apache-parent.spec | 4 +++- sources | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e1839a5..431bc7c 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /apache-27-source-release.zip /apache-30-source-release.zip /apache-31-source-release.zip +/apache-33-source-release.zip diff --git a/apache-parent.spec b/apache-parent.spec index e353304..2322235 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: apache-parent -Version: 31 +Version: 33 Release: %autorelease Summary: Parent POM file for Apache projects License: Apache-2.0 @@ -31,6 +31,8 @@ This package contains the parent pom file for apache projects. %autosetup -p1 -n apache-%{version} %pom_remove_plugin :maven-site-plugin +%pom_remove_plugin :maven-site-plugin docs +%pom_remove_plugin :maven-scm-publish-plugin docs %build %mvn_build diff --git a/sources b/sources index e9afd37..9ec533f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-31-source-release.zip) = b60e0ef1899ab77a44b9afe5af50087d353fc67bda991fca11815abc18514f4fea6e90c452a503d56bb342a2a1854f9b4a7f655ce48bda90c5dab67468a06316 +SHA512 (apache-33-source-release.zip) = a819eb75f147baa19661ebb7794d4d711f760bb7fc04f66cfefd0f8c57fa24aa8cf4f4d597c4c665ce8604e6941fa519540ccabd3647134390e023cbd671eabe From 5cc88a926a7785f4d470361b98e48c061d85e8aa Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 29 Nov 2024 08:28:38 +0100 Subject: [PATCH 08/21] Update javapackages test plan to f42 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 17c6113..86bfcea 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f41 + ref: f42 execute: how: tmt From df7aecd511380769465874f73505aa6a5c50df05 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:56 +0200 Subject: [PATCH 09/21] Use %autosetup -C --- apache-parent.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 2322235..245d6be 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -28,7 +28,7 @@ Requires: mvn(org.apache.apache.resources:apache-jar-resource-bundle) This package contains the parent pom file for apache projects. %prep -%autosetup -p1 -n apache-%{version} +%autosetup -p1 -C %pom_remove_plugin :maven-site-plugin %pom_remove_plugin :maven-site-plugin docs From b62085363bdceed317076d0112c729ea6d516a9c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 16:01:18 +0100 Subject: [PATCH 10/21] Unify spec style with the rest of Java/Maven packages [skip changelog] --- apache-parent.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apache-parent.spec b/apache-parent.spec index 245d6be..f033c38 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -6,6 +6,7 @@ Release: %autorelease Summary: Parent POM file for Apache projects License: Apache-2.0 URL: https://apache.org/ + Source0: https://repo1.maven.org/maven2/org/apache/apache/%{version}/apache-%{version}-source-release.zip BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -17,9 +18,8 @@ BuildRequires: maven-local BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) %endif - -# Not generated automatically %if %{without bootstrap} +# Not generated automatically BuildRequires: mvn(org.apache.apache.resources:apache-jar-resource-bundle) %endif Requires: mvn(org.apache.apache.resources:apache-jar-resource-bundle) From 2d61f922f6006982973dbff589dc4ad04185c4ac Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 16:40:57 +0100 Subject: [PATCH 11/21] Reorder spec file tags [skip changelog] --- apache-parent.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apache-parent.spec b/apache-parent.spec index f033c38..71a0eb7 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -6,11 +6,11 @@ Release: %autorelease Summary: Parent POM file for Apache projects License: Apache-2.0 URL: https://apache.org/ - -Source0: https://repo1.maven.org/maven2/org/apache/apache/%{version}/apache-%{version}-source-release.zip BuildArch: noarch ExclusiveArch: %{java_arches} noarch +Source0: https://repo1.maven.org/maven2/org/apache/apache/%{version}/apache-%{version}-source-release.zip + %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else From 6b756fd93ad95e39524a55be7cbe9f5a743d69d6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 11:18:34 +0000 Subject: [PATCH 12/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 0e207c0b74f71a76dac1799c0e5d6e2e1958d8ea Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 Mar 2025 10:48:56 +0100 Subject: [PATCH 13/21] Disable XMvn javadoc MOJO --- apache-parent.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 71a0eb7..262a4b2 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -35,7 +35,7 @@ This package contains the parent pom file for apache projects. %pom_remove_plugin :maven-scm-publish-plugin docs %build -%mvn_build +%mvn_build -j %install %mvn_install From c561443c18843f0a71e75d3a2d348325cb4b0968 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:18 +0100 Subject: [PATCH 14/21] Switch to javapackages tests from CentOS Stream GitLab --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 86bfcea..e39d47c 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 + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git ref: f42 execute: how: tmt From 8ab6d1ebfad90fced551af47d588f0a68748674a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:31 +0200 Subject: [PATCH 15/21] Switch javapackages test plan to f43 ref --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index e39d47c..ae17c0c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f42 + ref: f43 execute: how: tmt From 8daa180799ffd84116a42061a3c07afcef72e7ac Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:51 +0200 Subject: [PATCH 16/21] Build with OpenJDK 25 --- apache-parent.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 262a4b2..1d9cc22 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -14,7 +14,7 @@ Source0: https://repo1.maven.org/maven2/org/apache/apache/%{version}/apac %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) %endif From 833c7f3ad194d49edabac9160875369ddf82dc4a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 16 Jul 2025 21:01:35 +0200 Subject: [PATCH 17/21] Update to upstream version 35 --- .gitignore | 1 + apache-parent.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 431bc7c..9d5548f 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /apache-30-source-release.zip /apache-31-source-release.zip /apache-33-source-release.zip +/apache-35-source-release.zip diff --git a/apache-parent.spec b/apache-parent.spec index 1d9cc22..27d3283 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: apache-parent -Version: 33 +Version: 35 Release: %autorelease Summary: Parent POM file for Apache projects License: Apache-2.0 diff --git a/sources b/sources index 9ec533f..e50d149 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-33-source-release.zip) = a819eb75f147baa19661ebb7794d4d711f760bb7fc04f66cfefd0f8c57fa24aa8cf4f4d597c4c665ce8604e6941fa519540ccabd3647134390e023cbd671eabe +SHA512 (apache-35-source-release.zip) = 7dcbfa0eacd43e66da1c12274bf558fb2618d3fae0831de6b0309e8df539afc07080eb1963174a0a6cc4d0d81ae8d2a01f147780f7ca44a3caa94d3ffd364b61 From fee32a6b1d585da641c465fd69dd9b95eca65fb2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:07:08 +0000 Subject: [PATCH 18/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 03953bfbadec538ba609cd1dc77dce4470601fd9 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 29 Jul 2025 19:42:25 +0200 Subject: [PATCH 19/21] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. From d0bf0ba470f9b20a16dd55b590252f9d8b10403f Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 8 Sep 2025 19:04:08 -0400 Subject: [PATCH 20/21] Remove maven-enforcer-plugin --- apache-parent.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 27d3283..dbb56e7 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -15,7 +15,6 @@ Source0: https://repo1.maven.org/maven2/org/apache/apache/%{version}/apac BuildRequires: javapackages-bootstrap %else BuildRequires: maven-local-openjdk25 -BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) %endif %if %{without bootstrap} @@ -30,6 +29,7 @@ This package contains the parent pom file for apache projects. %prep %autosetup -p1 -C +%pom_remove_plugin :maven-enforcer-plugin %pom_remove_plugin :maven-site-plugin %pom_remove_plugin :maven-site-plugin docs %pom_remove_plugin :maven-scm-publish-plugin docs From 36d69706dc5acc07f435dbe8a24a72ffb0169d05 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:48:23 +0000 Subject: [PATCH 21/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild