Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild

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.

.gitignore

@@ -15,3 +15,5 @@
 /apache-27-source-release.zip
 /apache-30-source-release.zip
 /apache-31-source-release.zip
+/apache-33-source-release.zip
+/apache-35-source-release.zip

apache-parent.spec

@@ -1,25 +1,24 @@
 %bcond_with bootstrap
 
 Name:           apache-parent
-Version:        31
-Release:        3%{?dist}
+Version:        35
+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
-BuildRequires:  maven-local
-BuildRequires:  mvn(org.apache.maven.plugins:maven-enforcer-plugin)
+BuildRequires:  maven-local-openjdk25
 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)
@@ -28,12 +27,15 @@ 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 -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
 
 %build
-%mvn_build
+%mvn_build -j
 
 %install
 %mvn_install
@@ -42,174 +44,4 @@ This package contains the parent pom file for apache projects.
 %license LICENSE NOTICE
 
 %changelog
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 31-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 31-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Dec 08 2023 Marian Koncek <mkoncek@redhat.com> - 31-1
-- Update to upstream version 31
-
-* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 30-2
-- Rebuild
-
-* Fri Aug 11 2023 Marian Koncek <mkoncek@redhat.com> - 30-1
-- Update to upstream version 30
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 27-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 27-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Tue Sep 06 2022 Marian Koncek <mkoncek@redhat.com> - 27-1
-- Update to upstream version 27
-
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 26-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Wed Apr 27 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 26-2
-- Workaround build issue with RPM 4.18
-
-* Thu Apr 21 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 26-1
-- Update to upstream version 26
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 23-8
-- Rebuilt for java-17-openjdk as system jdk
-
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 23-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 23-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 23-5
-- Bootstrap build
-- Non-bootstrap build
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 23-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 23-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 23-2
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Mon Mar 02 2020 Fabio Valentini <decathorpe@gmail.com> - 23-1
-- Update to version 23.
-
-* Wed Jan 29 2020 Marian Koncek <mkoncek@redhat.com> - 23-1
-- Update to upstream version 23
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 22-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Jan 17 2020 Fabio Valentini <decathorpe@gmail.com> - 22-1
-- Update to version 22.
-
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 21-3
-- Mass rebuild for javapackages-tools 201902
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 21-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 21-2
-- Mass rebuild for javapackages-tools 201901
-
-* Tue May 14 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 21-1
-- Update to upstream version 21
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 19-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 19-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 19-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Jan 25 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 19-1
-- Update to upstream version 19
-- Add missing BR on apache-resource-bundles
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 18-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 18-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Tue May 17 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 18-1
-- Update to upstream version 18
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 17-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 17-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Mon Apr 27 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 17-1
-- Update to upstream version 17
-
-* Mon Nov 17 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 16-1
-- Update to upstream version 16
-
-* Mon Sep 29 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 15-1
-- Update to upstream version 15
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 14-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Wed May 28 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 14-2
-- Rebuild to regenerate Maven auto-requires
-
-* Mon Mar 10 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 14-1
-- Update to upstream version 14
-
-* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 10-15
-- Remove maven-site-plugin from dependencies
-
-* Fri Sep 20 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 10-14
-- Rebuild to regenerate Maven provides
-
-* Thu Aug 29 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 10-13
-- Add missing R: apache-resource-bundles
-
-* Mon Aug 26 2013 Michal Srb <msrb@redhat.com> - 10-12
-- Migrate away from mvn-rpmbuild
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 10-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 10-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 10-9
-- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
-- Replace maven BuildRequires with maven-local
-
-* Tue Dec 18 2012 Michal Srb <msrb@redhat.com> - 10-8
-- Added license (Resolves: #888287)
-
-* Wed Nov 21 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 10-7
-- Install patched pom not the original
-
-* Fri Nov  2 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 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 <sochotnicky@redhat.com> - 10-5
-- Make sure we generate 1.5 version bytecode
-
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 10-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 10-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Sep 13 2011 Andy Grimm <agrimm@gmail.com> 10-2
-- Follow suggestions in BZ #736069
-
-* Mon Aug 29 2011 Andy Grimm <agrimm@gmail.com> 10-1
-- Initial Build
+%autochangelog

changelog

@@ -0,0 +1,180 @@
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 31-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 31-5
+- Rebuilt for java-21-openjdk as system jdk
+
+* Fri Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 31-4
+- bump of release for for java-21-openjdk as system jdk
+
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 31-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 31-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Dec 08 2023 Marian Koncek <mkoncek@redhat.com> - 31-1
+- Update to upstream version 31
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 30-2
+- Rebuild
+
+* Fri Aug 11 2023 Marian Koncek <mkoncek@redhat.com> - 30-1
+- Update to upstream version 30
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 27-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 27-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Tue Sep 06 2022 Marian Koncek <mkoncek@redhat.com> - 27-1
+- Update to upstream version 27
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 26-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Apr 27 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 26-2
+- Workaround build issue with RPM 4.18
+
+* Thu Apr 21 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 26-1
+- Update to upstream version 26
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 23-8
+- Rebuilt for java-17-openjdk as system jdk
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 23-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 23-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 23-5
+- Bootstrap build
+- Non-bootstrap build
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 23-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 23-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 23-2
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Mon Mar 02 2020 Fabio Valentini <decathorpe@gmail.com> - 23-1
+- Update to version 23.
+
+* Wed Jan 29 2020 Marian Koncek <mkoncek@redhat.com> - 23-1
+- Update to upstream version 23
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 22-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Jan 17 2020 Fabio Valentini <decathorpe@gmail.com> - 22-1
+- Update to version 22.
+
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 21-3
+- Mass rebuild for javapackages-tools 201902
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 21-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 21-2
+- Mass rebuild for javapackages-tools 201901
+
+* Tue May 14 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 21-1
+- Update to upstream version 21
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 19-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 19-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 19-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Jan 25 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 19-1
+- Update to upstream version 19
+- Add missing BR on apache-resource-bundles
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 18-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 18-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Tue May 17 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 18-1
+- Update to upstream version 18
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 17-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 17-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Mon Apr 27 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 17-1
+- Update to upstream version 17
+
+* Mon Nov 17 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 16-1
+- Update to upstream version 16
+
+* Mon Sep 29 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 15-1
+- Update to upstream version 15
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 14-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Wed May 28 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 14-2
+- Rebuild to regenerate Maven auto-requires
+
+* Mon Mar 10 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 14-1
+- Update to upstream version 14
+
+* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 10-15
+- Remove maven-site-plugin from dependencies
+
+* Fri Sep 20 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 10-14
+- Rebuild to regenerate Maven provides
+
+* Thu Aug 29 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 10-13
+- Add missing R: apache-resource-bundles
+
+* Mon Aug 26 2013 Michal Srb <msrb@redhat.com> - 10-12
+- Migrate away from mvn-rpmbuild
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 10-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 10-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 10-9
+- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
+- Replace maven BuildRequires with maven-local
+
+* Tue Dec 18 2012 Michal Srb <msrb@redhat.com> - 10-8
+- Added license (Resolves: #888287)
+
+* Wed Nov 21 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 10-7
+- Install patched pom not the original
+
+* Fri Nov  2 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 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 <sochotnicky@redhat.com> - 10-5
+- Make sure we generate 1.5 version bytecode
+
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 10-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 10-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Sep 13 2011 Andy Grimm <agrimm@gmail.com> 10-2
+- Follow suggestions in BZ #736069
+
+* Mon Aug 29 2011 Andy Grimm <agrimm@gmail.com> 10-1
+- Initial Build

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

sources

@@ -1 +1 @@
-SHA512 (apache-31-source-release.zip) = b60e0ef1899ab77a44b9afe5af50087d353fc67bda991fca11815abc18514f4fea6e90c452a503d56bb342a2a1854f9b4a7f655ce48bda90c5dab67468a06316
+SHA512 (apache-35-source-release.zip) = 7dcbfa0eacd43e66da1c12274bf558fb2618d3fae0831de6b0309e8df539afc07080eb1963174a0a6cc4d0d81ae8d2a01f147780f7ca44a3caa94d3ffd364b61