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.

beust-jcommander.spec

@@ -2,10 +2,10 @@
 
 Name:           beust-jcommander
 Version:        1.82
-Release:        3%{?dist}
+Release:        %autorelease
 Summary:        Java framework for parsing command line parameters
-License:        ASL 2.0
-URL:            http://jcommander.org/
+License:        Apache-2.0
+URL:            https://jcommander.org
 BuildArch:      noarch
 ExclusiveArch:  %{java_arches} noarch
 
@@ -15,29 +15,25 @@ Source1:        https://repo1.maven.org/maven2/com/beust/jcommander/%{version}/j
 # Cleaned up bundled jars whose licensing cannot be easily verified
 Source2:        generate-tarball.sh
 
-Patch0:         0001-ParseValues-NullPointerException-patch.patch
+Patch:          0001-ParseValues-NullPointerException-patch.patch
 
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
-BuildRequires:  maven-local
+BuildRequires:  maven-local-openjdk25
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.testng:testng)
 %endif
+# TODO Remove in Fedora 46
+Obsoletes:      %{name}-javadoc < 1.82-23
 
 %description
 JCommander is a very small Java framework that makes it trivial to
 parse command line parameters (with annotations).
 
-%package javadoc
-Summary:        API documentation for %{name}
-
-%description javadoc
-This package contains the %{summary}.
-
 %prep
-%setup -q
-%patch0 -p1
+%autosetup -p1 -C
+chmod -x license.txt
 
 cp -p %SOURCE1 pom.xml
 %pom_xpath_set "pom:project/pom:version" "%{version}"
@@ -48,168 +44,14 @@ cp -p %SOURCE1 pom.xml
 %mvn_file : %{name}
 
 %build
-%mvn_build
+%mvn_build -j
 
 %install
 %mvn_install
 
 %files -f .mfiles
-%attr(0644,root,root) %license license.txt notice.md
+%license license.txt notice.md
 %doc README.markdown
 
-%files javadoc -f .mfiles-javadoc
-%license license.txt notice.md
-
 %changelog
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.82-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.82-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Sep 07 2022 Marian Koncek <mkoncek@redhat.com> - 1.82-1
-- Update to upstream version 1.82
-
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.78-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.78-9
-- Rebuilt for java-17-openjdk as system jdk
-
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.78-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.78-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.78-6
-- Bootstrap build
-- Non-bootstrap build
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.78-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.78-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1.78-3
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Tue Jun 09 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.78-3
-- skipped tests as they require user input with jdk11, changed way of javadoc generation
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.78-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Nov 09 2019 Fabio Valentini <decathorpe@gmail.com> - 1.78-1
-- Update to version 1.78.
-- Remove unnecessary parent from POM file.
-
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.78-2
-- Mass rebuild for javapackages-tools 201902
-
-* Mon Sep 02 2019 Marian Koncek <mkoncek@redhat.com> - 1.78-1
-- Update to upstream version 1.78
-
-* Thu Aug 15 2019 Marian Koncek <mkoncek@redhat.com> - 1.75-1
-- Update to upstream version 1.75
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.71-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.71-6
-- Mass rebuild for javapackages-tools 201901
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.71-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Jul 30 2018 Michael Simacek <msimacek@redhat.com> - 1.71-5
-- Repack the tarball without binaries
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.71-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.71-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.71-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Tue Jun 13 2017 Roman Vais <rvais@redhat.com> - 1.71-1
-- Update to upstream version 1.71
-- Add patch for issue https://github.com/cbeust/jcommander/issues/367
-
-* Fri Mar 10 2017 Roman Vais <rvais@redhat.com> - 1.66-1
-- Update to upstream version 1.66
-
-* Fri Feb 17 2017 Roman Vais <rvais@redhat.com> - 1.65-1
-- Update to upstream version 1.65
-
-* Thu Jan 26 2017 Roman Vais <rvais@redhat.com> - 1.62-1
-- Update to upstream version 1.62
-
-* Wed Dec 14 2016 Michael Simacek <msimacek@redhat.com> - 1.60-1
-- Update to upstream version 1.60
-
-* Tue Nov 01 2016 Roman Vais <rvais@redhat.com> - 1.58-1
-- Update to upstream version 1.58
-
-* Fri Sep 30 2016 Roman Vais <rvais@redhat.com> - 1.57-1
-- Update to upstream version 1.57
-- Correct directory setup in prep section
-- Change of tarball name in source url to correspond to upstream
-
-* Tue Sep 27 2016 Roman Vais <rvais@redhat.com> - 1.56-1
-- New version release.
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.47-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.47-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Wed Jan 28 2015 Michael Simacek <msimacek@redhat.com> - 1.47-1
-- Update to upstream version 1.47
-- Enable tests
-
-* Mon Oct 13 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.45-1
-- Update to upstream version 1.45
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.35-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Wed Feb 26 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.35-1
-- Update to upstream version 1.35
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.30-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 1.30-3
-- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
-- Replace maven BuildRequires with maven-local
-
-* Wed Feb  6 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.30-2
-- Replace BR: xmvn with maven-local
-
-* Thu Jan 10 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.30-1
-- Update to upstream version 1.30
-- Build with xmvn
-
-* Thu Aug 16 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.17-6
-- Install NOTICE files
-
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Wed Nov 30 2011 Alexander Kurtakov <akurtako@redhat.com> 1.17-3
-- Use the new maven macro.
-
-* Mon May 16 2011 Jaromir Capik <jcapik@redhat.com> - 1.17-2
-- Unwanted comment removal
-- Target javadoc:jar replaced with javadoc:aggregate
-
-* Fri May 13 2011 Jaromir Capik <jcapik@redhat.com> - 1.17-1
-- Initial version of the package
+%autochangelog

changelog

@@ -0,0 +1,177 @@
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.82-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Fri May 31 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.82-10
+- Switch to a newer patch macro syntax
+
+* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 1.82-9
+- Rebuilt for java-21-openjdk as system jdk
+
+* Fri Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 1.82-8
+- bump of release for for java-21-openjdk as system jdk
+
+* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.82-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.82-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Oct 31 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.82-5
+- Fix license directory permissions
+- Resolves: rhbz#2144648
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.82-4
+- Convert License tag to SPDX format
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.82-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.82-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Sep 07 2022 Marian Koncek <mkoncek@redhat.com> - 1.82-1
+- Update to upstream version 1.82
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.78-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.78-9
+- Rebuilt for java-17-openjdk as system jdk
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.78-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.78-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.78-6
+- Bootstrap build
+- Non-bootstrap build
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.78-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.78-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1.78-3
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Tue Jun 09 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.78-3
+- skipped tests as they require user input with jdk11, changed way of javadoc generation
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.78-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Nov 09 2019 Fabio Valentini <decathorpe@gmail.com> - 1.78-1
+- Update to version 1.78.
+- Remove unnecessary parent from POM file.
+
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.78-2
+- Mass rebuild for javapackages-tools 201902
+
+* Mon Sep 02 2019 Marian Koncek <mkoncek@redhat.com> - 1.78-1
+- Update to upstream version 1.78
+
+* Thu Aug 15 2019 Marian Koncek <mkoncek@redhat.com> - 1.75-1
+- Update to upstream version 1.75
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.71-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.71-6
+- Mass rebuild for javapackages-tools 201901
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.71-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Jul 30 2018 Michael Simacek <msimacek@redhat.com> - 1.71-5
+- Repack the tarball without binaries
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.71-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.71-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.71-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue Jun 13 2017 Roman Vais <rvais@redhat.com> - 1.71-1
+- Update to upstream version 1.71
+- Add patch for issue https://github.com/cbeust/jcommander/issues/367
+
+* Fri Mar 10 2017 Roman Vais <rvais@redhat.com> - 1.66-1
+- Update to upstream version 1.66
+
+* Fri Feb 17 2017 Roman Vais <rvais@redhat.com> - 1.65-1
+- Update to upstream version 1.65
+
+* Thu Jan 26 2017 Roman Vais <rvais@redhat.com> - 1.62-1
+- Update to upstream version 1.62
+
+* Wed Dec 14 2016 Michael Simacek <msimacek@redhat.com> - 1.60-1
+- Update to upstream version 1.60
+
+* Tue Nov 01 2016 Roman Vais <rvais@redhat.com> - 1.58-1
+- Update to upstream version 1.58
+
+* Fri Sep 30 2016 Roman Vais <rvais@redhat.com> - 1.57-1
+- Update to upstream version 1.57
+- Correct directory setup in prep section
+- Change of tarball name in source url to correspond to upstream
+
+* Tue Sep 27 2016 Roman Vais <rvais@redhat.com> - 1.56-1
+- New version release.
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.47-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.47-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Wed Jan 28 2015 Michael Simacek <msimacek@redhat.com> - 1.47-1
+- Update to upstream version 1.47
+- Enable tests
+
+* Mon Oct 13 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.45-1
+- Update to upstream version 1.45
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.35-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Wed Feb 26 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.35-1
+- Update to upstream version 1.35
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.30-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 1.30-3
+- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
+- Replace maven BuildRequires with maven-local
+
+* Wed Feb  6 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.30-2
+- Replace BR: xmvn with maven-local
+
+* Thu Jan 10 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.30-1
+- Update to upstream version 1.30
+- Build with xmvn
+
+* Thu Aug 16 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.17-6
+- Install NOTICE files
+
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Wed Nov 30 2011 Alexander Kurtakov <akurtako@redhat.com> 1.17-3
+- Use the new maven macro.
+
+* Mon May 16 2011 Jaromir Capik <jcapik@redhat.com> - 1.17-2
+- Unwanted comment removal
+- Target javadoc:jar replaced with javadoc:aggregate
+
+* Fri May 13 2011 Jaromir Capik <jcapik@redhat.com> - 1.17-1
+- Initial version of the package

plans/javapackages.fmf

@@ -1,7 +1,7 @@
 summary: Run javapackages-specific tests
 discover:
   how: fmf
-  url: https://src.fedoraproject.org/tests/javapackages
-  ref: f37
+  url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
+  ref: f43
 execute:
   how: tmt