From 9d29604bc27250dff0bc95f1200b816ea96e59bf Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:00 +0200 Subject: [PATCH 01/14] Convert to %autorelease and %autochangelog --- apache-commons-cli.spec | 165 +--------------------------------------- changelog | 162 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 164 insertions(+), 163 deletions(-) create mode 100644 changelog diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index 4066485..b88fa5a 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -2,7 +2,7 @@ Name: apache-commons-cli Version: 1.8.0 -Release: 2%{?dist} +Release: %autorelease Summary: Command Line Interface Library for Java License: Apache-2.0 URL: https://commons.apache.org/proper/commons-cli/ @@ -45,165 +45,4 @@ command line arguments and options. %doc README.md RELEASE-NOTES.txt %changelog -* Wed Jul 17 2024 Fedora Release Engineering - 1.8.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Jul 16 2024 Marian Koncek - 1.8.0-1 -- Update to upstream version 1.8.0 - -* Tue Feb 27 2024 Jiri Vanek - 1.6.0-5 -- Rebuilt for java-21-openjdk as system jdk - -* Fri Feb 23 2024 Jiri Vanek - 1.6.0-4 -- bump of release for for java-21-openjdk as system jdk - -* Mon Jan 22 2024 Fedora Release Engineering - 1.6.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Dec 04 2023 Mikolaj Izdebski - 1.6.0-1 -- Update to upstream version 1.6.0 - -* Wed Sep 20 2023 Mikolaj Izdebski - 1.5.0-8 -- Rebuild to regenerate auto-Requires on java - -* Fri Sep 01 2023 Mikolaj Izdebski - 1.5.0-7 -- Convert License tag to SPDX format - -* Wed Jul 19 2023 Fedora Release Engineering - 1.5.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jan 18 2023 Fedora Release Engineering - 1.5.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 1.5.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Feb 05 2022 Jiri Vanek - 1.5.0-3 -- Rebuilt for java-17-openjdk as system jdk - -* Wed Jan 19 2022 Fedora Release Engineering - 1.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Nov 4 2021 Christian Schuermann 1.5.0-1 -- Update to upstream version 1.5.0 - -* Wed Jul 21 2021 Fedora Release Engineering - 1.4-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 17 2021 Mikolaj Izdebski - 1.4-13 -- Bootstrap build -- Non-bootstrap build - -* Tue Jan 26 2021 Fedora Release Engineering - 1.4-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 1.4-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 10 2020 Jiri Vanek - 1.4-10 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Wed Jun 24 2020 Alexander Kurtakov 1.4-9 -- Fix build with Java 11 - -* Tue Jan 28 2020 Fedora Release Engineering - 1.4-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jan 25 2020 Mikolaj Izdebski - 1.4-7 -- Build with OpenJDK 8 - -* Tue Nov 05 2019 Mikolaj Izdebski - 1.4-6 -- Mass rebuild for javapackages-tools 201902 - -* Wed Jul 24 2019 Fedora Release Engineering - 1.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri May 24 2019 Mikolaj Izdebski - 1.4-5 -- Mass rebuild for javapackages-tools 201901 - -* Thu Jan 31 2019 Fedora Release Engineering - 1.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 1.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 1.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Jan 29 2018 Mikolaj Izdebski - 1.4-3 -- Cleanup spec file - -* Wed Jul 26 2017 Fedora Release Engineering - 1.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Tue Apr 11 2017 Michael Simacek - 1.4-1 -- Update to upstream version 1.4 - -* Fri Feb 10 2017 Fedora Release Engineering - 1.3.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 01 2017 Michael Simacek - 1.3.1-5 -- Remove BR on jacoco - -* Wed Jun 15 2016 Mikolaj Izdebski - 1.3.1-4 -- Regenerate build-requires - -* Wed Feb 03 2016 Fedora Release Engineering - 1.3.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jun 23 2015 Michal Srb - 1.3.1-2 -- Add workaround for CLI-253 - -* Wed Jun 17 2015 Michal Srb - 1.3.1-1 -- Update to upstream version 1.3.1 - -* Wed Jun 17 2015 Fedora Release Engineering - 1.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Jun 3 2015 Mikolaj Izdebski - 1.3-1 -- Update to upstream version 1.3 - -* Sat Jun 07 2014 Fedora Release Engineering - 1.2-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Mar 04 2014 Stanislav Ochotnicky - 1.2-12 -- Use Requires: java-headless rebuild (#1067528) - -* Mon Aug 05 2013 Mat Booth - 1.2-11 -- Update for newer guidelines -- Drop ancient obsoletes/provides on old jakarta name - -* Sat Aug 03 2013 Fedora Release Engineering - 1.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Feb 19 2013 Mat Booth - 1.2-9 -- Add missing maven-local BuildRequires - -* Wed Feb 13 2013 Fedora Release Engineering - 1.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Jul 18 2012 Fedora Release Engineering - 1.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jan 12 2012 Fedora Release Engineering - 1.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Nov 30 2011 Alexander Kurtakov 1.2-5 -- Build with maven 3. -- Adapt to current guidelines. - -* Mon Feb 07 2011 Fedora Release Engineering - 1.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Nov 9 2010 Chris Spike 1.2-3 -- Removed maven* BRs in favour of apache-commons-parent -- Added deprecated groupId to depmap for compatibility reasons - -* Mon Oct 18 2010 Chris Spike 1.2-2 -- Removed Epoch - -* Sun Oct 3 2010 Chris Spike 1.2-1 -- Rename and rebase from jakarta-commons-cli +%autochangelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..ef63bef --- /dev/null +++ b/changelog @@ -0,0 +1,162 @@ +* Wed Jul 17 2024 Fedora Release Engineering - 1.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Jul 16 2024 Marian Koncek - 1.8.0-1 +- Update to upstream version 1.8.0 + +* Tue Feb 27 2024 Jiri Vanek - 1.6.0-5 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 1.6.0-4 +- bump of release for for java-21-openjdk as system jdk + +* Mon Jan 22 2024 Fedora Release Engineering - 1.6.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Dec 04 2023 Mikolaj Izdebski - 1.6.0-1 +- Update to upstream version 1.6.0 + +* Wed Sep 20 2023 Mikolaj Izdebski - 1.5.0-8 +- Rebuild to regenerate auto-Requires on java + +* Fri Sep 01 2023 Mikolaj Izdebski - 1.5.0-7 +- Convert License tag to SPDX format + +* Wed Jul 19 2023 Fedora Release Engineering - 1.5.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jan 18 2023 Fedora Release Engineering - 1.5.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jul 20 2022 Fedora Release Engineering - 1.5.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 1.5.0-3 +- Rebuilt for java-17-openjdk as system jdk + +* Wed Jan 19 2022 Fedora Release Engineering - 1.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Nov 4 2021 Christian Schuermann 1.5.0-1 +- Update to upstream version 1.5.0 + +* Wed Jul 21 2021 Fedora Release Engineering - 1.4-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 1.4-13 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 1.4-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 1.4-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 1.4-10 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Jun 24 2020 Alexander Kurtakov 1.4-9 +- Fix build with Java 11 + +* Tue Jan 28 2020 Fedora Release Engineering - 1.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jan 25 2020 Mikolaj Izdebski - 1.4-7 +- Build with OpenJDK 8 + +* Tue Nov 05 2019 Mikolaj Izdebski - 1.4-6 +- Mass rebuild for javapackages-tools 201902 + +* Wed Jul 24 2019 Fedora Release Engineering - 1.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 24 2019 Mikolaj Izdebski - 1.4-5 +- Mass rebuild for javapackages-tools 201901 + +* Thu Jan 31 2019 Fedora Release Engineering - 1.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 1.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 1.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Jan 29 2018 Mikolaj Izdebski - 1.4-3 +- Cleanup spec file + +* Wed Jul 26 2017 Fedora Release Engineering - 1.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Tue Apr 11 2017 Michael Simacek - 1.4-1 +- Update to upstream version 1.4 + +* Fri Feb 10 2017 Fedora Release Engineering - 1.3.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 01 2017 Michael Simacek - 1.3.1-5 +- Remove BR on jacoco + +* Wed Jun 15 2016 Mikolaj Izdebski - 1.3.1-4 +- Regenerate build-requires + +* Wed Feb 03 2016 Fedora Release Engineering - 1.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Jun 23 2015 Michal Srb - 1.3.1-2 +- Add workaround for CLI-253 + +* Wed Jun 17 2015 Michal Srb - 1.3.1-1 +- Update to upstream version 1.3.1 + +* Wed Jun 17 2015 Fedora Release Engineering - 1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Jun 3 2015 Mikolaj Izdebski - 1.3-1 +- Update to upstream version 1.3 + +* Sat Jun 07 2014 Fedora Release Engineering - 1.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Mar 04 2014 Stanislav Ochotnicky - 1.2-12 +- Use Requires: java-headless rebuild (#1067528) + +* Mon Aug 05 2013 Mat Booth - 1.2-11 +- Update for newer guidelines +- Drop ancient obsoletes/provides on old jakarta name + +* Sat Aug 03 2013 Fedora Release Engineering - 1.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue Feb 19 2013 Mat Booth - 1.2-9 +- Add missing maven-local BuildRequires + +* Wed Feb 13 2013 Fedora Release Engineering - 1.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jul 18 2012 Fedora Release Engineering - 1.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jan 12 2012 Fedora Release Engineering - 1.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Nov 30 2011 Alexander Kurtakov 1.2-5 +- Build with maven 3. +- Adapt to current guidelines. + +* Mon Feb 07 2011 Fedora Release Engineering - 1.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Nov 9 2010 Chris Spike 1.2-3 +- Removed maven* BRs in favour of apache-commons-parent +- Added deprecated groupId to depmap for compatibility reasons + +* Mon Oct 18 2010 Chris Spike 1.2-2 +- Removed Epoch + +* Sun Oct 3 2010 Chris Spike 1.2-1 +- Rename and rebase from jakarta-commons-cli From 1f71c4f4ec58568098dbdd15c016de7de9c93381 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 02:04:04 +0200 Subject: [PATCH 02/14] Update to upstream version 1.9.0 - Resolves: rhbz#2305042 --- .gitignore | 1 + apache-commons-cli.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fdafc4b..9c9dd53 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /commons-cli-1.5.0-src.tar.gz /commons-cli-1.6.0-src.tar.gz /commons-cli-1.8.0-src.tar.gz +/commons-cli-1.9.0-src.tar.gz diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index b88fa5a..b1a47b9 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: apache-commons-cli -Version: 1.8.0 +Version: 1.9.0 Release: %autorelease Summary: Command Line Interface Library for Java License: Apache-2.0 @@ -15,10 +15,13 @@ Source0: https://www.apache.org/dist/commons/cli/source/commons-cli-%{ver BuildRequires: javapackages-bootstrap %else BuildRequires: maven-local +BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.junit.jupiter:junit-jupiter-api) -BuildRequires: mvn(org.junit.vintage:junit-vintage-engine) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter-engine) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter-params) +BuildRequires: mvn(org.mockito:mockito-core) %endif %description diff --git a/sources b/sources index 7cb2dda..ee08b7f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-cli-1.8.0-src.tar.gz) = 588d89d86deb60ac0e182bd4b574e30aac4000dde9da13ee1080844a4982d45f4a4d29fc3ee54c904c74ed6bf14dbb3bffdcbad0eab86ddde8418811f2efb5c2 +SHA512 (commons-cli-1.9.0-src.tar.gz) = d20df809e8e0ebed79c57af9c9b447b0068347ba0edfcdec3652cb00bd9575b24fc77093d735e827d9d02a6fe2681bf239fd01df5f7c682ae34ade0781c53e35 From d68c605ec7052a3d06c7a941b7d10e7012456b1b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:32:53 +0200 Subject: [PATCH 03/14] Use %autosetup -C --- apache-commons-cli.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index b1a47b9..c3363b7 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -31,7 +31,7 @@ command line arguments and options. %{?javadoc_package} %prep -%autosetup -p1 -n commons-cli-%{version}-src +%autosetup -p1 -C # Compatibility links %mvn_alias : org.apache.commons:commons-cli From 06bab565f3490c4d38a69189f6477d602ba7575a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 29 Nov 2024 08:28:38 +0100 Subject: [PATCH 04/14] 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 4fa509534e941c5a206b6ba8d39f1802538303db Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 18:06:35 +0100 Subject: [PATCH 05/14] Explicitly declare javadoc subpackage [skip changelog] --- apache-commons-cli.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index c3363b7..155b077 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -28,7 +28,11 @@ BuildRequires: mvn(org.mockito:mockito-core) The CLI library provides a simple and easy to use API for working with the command line arguments and options. -%{?javadoc_package} +%package javadoc +Summary: API documentation for %{name} + +%description javadoc +API documentation for %{name}. %prep %autosetup -p1 -C @@ -47,5 +51,7 @@ command line arguments and options. %license LICENSE.txt NOTICE.txt %doc README.md RELEASE-NOTES.txt +%files javadoc -f .mfiles-javadoc + %changelog %autochangelog From 4d8b857afa356fab3fc4a62a13b54661989a06b0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 11:14:21 +0000 Subject: [PATCH 06/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 7f93d3082029e695fb65dd78efc5763f2c71e23e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:13 +0100 Subject: [PATCH 07/14] Remove javadoc subpackage --- apache-commons-cli.spec | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index 155b077..7c0dc7a 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -23,17 +23,13 @@ BuildRequires: mvn(org.junit.jupiter:junit-jupiter-engine) BuildRequires: mvn(org.junit.jupiter:junit-jupiter-params) BuildRequires: mvn(org.mockito:mockito-core) %endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 1.9.0-7 %description The CLI library provides a simple and easy to use API for working with the command line arguments and options. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %prep %autosetup -p1 -C @@ -42,7 +38,7 @@ API documentation for %{name}. %mvn_file : commons-cli %{name} %build -%mvn_build +%mvn_build -j %install %mvn_install @@ -51,7 +47,5 @@ API documentation for %{name}. %license LICENSE.txt NOTICE.txt %doc README.md RELEASE-NOTES.txt -%files javadoc -f .mfiles-javadoc - %changelog %autochangelog From a05ce65ef673f2b57bf4eb8131c1d79fcc95771d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:18 +0100 Subject: [PATCH 08/14] 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 3cddc8dbdd9cc3f3d13b886ea621b18f7dabd718 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:31 +0200 Subject: [PATCH 09/14] 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 194e595e350aa455101d879aa703da313ff4d876 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:51 +0200 Subject: [PATCH 10/14] Build with OpenJDK 25 --- apache-commons-cli.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index 7c0dc7a..a0a366a 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -14,7 +14,7 @@ Source0: https://www.apache.org/dist/commons/cli/source/commons-cli-%{ver %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) From b77f92e4d024bbea5237335679f5fa45700713e8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:05:12 +0000 Subject: [PATCH 11/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 45da626305dcb02e6f31b9d62e405f6c3ac1cc53 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 29 Jul 2025 19:00:47 +0200 Subject: [PATCH 12/14] 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 e42d8406c93c61a22edfbb99fa376609faf5baf1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 10 Oct 2025 15:33:55 +0200 Subject: [PATCH 13/14] Update to upstream version 1.10.0 --- .gitignore | 1 + 0001-Port-tests-to-commons-lang3.patch | 67 ++++++++++++++++++++++++++ apache-commons-cli.spec | 4 +- sources | 2 +- 4 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 0001-Port-tests-to-commons-lang3.patch diff --git a/.gitignore b/.gitignore index 9c9dd53..6fc0a6d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /commons-cli-1.6.0-src.tar.gz /commons-cli-1.8.0-src.tar.gz /commons-cli-1.9.0-src.tar.gz +/commons-cli-1.10.0-src.tar.gz diff --git a/0001-Port-tests-to-commons-lang3.patch b/0001-Port-tests-to-commons-lang3.patch new file mode 100644 index 0000000..4096341 --- /dev/null +++ b/0001-Port-tests-to-commons-lang3.patch @@ -0,0 +1,67 @@ +From 92fcda0792a631eebef413a6608bd9c91794158d Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Fri, 10 Oct 2025 16:50:15 +0200 +Subject: [PATCH] Port tests to commons-lang3 + +We want to avoid dependency on commons-text for now. +--- + pom.xml | 4 ++-- + .../org/apache/commons/cli/example/AptHelpAppendable.java | 6 +++--- + .../org/apache/commons/cli/example/XhtmlHelpAppendable.java | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/pom.xml b/pom.xml +index 2663f3f..95ac48c 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -69,8 +69,8 @@ + + + org.apache.commons +- commons-text +- 1.14.0 ++ commons-lang3 ++ 3.18.0 + test + + +diff --git a/src/test/java/org/apache/commons/cli/example/AptHelpAppendable.java b/src/test/java/org/apache/commons/cli/example/AptHelpAppendable.java +index cbedfe2..7e275c1 100644 +--- a/src/test/java/org/apache/commons/cli/example/AptHelpAppendable.java ++++ b/src/test/java/org/apache/commons/cli/example/AptHelpAppendable.java +@@ -25,8 +25,8 @@ import org.apache.commons.cli.help.FilterHelpAppendable; + import org.apache.commons.cli.help.TableDefinition; + import org.apache.commons.cli.help.TextStyle; + import org.apache.commons.lang3.StringUtils; +-import org.apache.commons.text.translate.CharSequenceTranslator; +-import org.apache.commons.text.translate.LookupTranslator; ++import org.apache.commons.lang3.text.translate.CharSequenceTranslator; ++import org.apache.commons.lang3.text.translate.LookupTranslator; + + /** + * Appends APT formatted text to an {@link Appendable}. +@@ -45,7 +45,7 @@ public class AptHelpAppendable extends FilterHelpAppendable { + escapeAptMap.put("*", "\\*"); + escapeAptMap.put("+", "\\+"); + escapeAptMap.put("|", "\\|"); +- ESCAPE_APT = new LookupTranslator(escapeAptMap); ++ ESCAPE_APT = new LookupTranslator(escapeAptMap.entrySet().stream().map(e -> new CharSequence[]{ e.getKey(), e.getValue() }).toArray(CharSequence[][]::new)); + } + + /** +diff --git a/src/test/java/org/apache/commons/cli/example/XhtmlHelpAppendable.java b/src/test/java/org/apache/commons/cli/example/XhtmlHelpAppendable.java +index 51ae058..ee6f2b3 100644 +--- a/src/test/java/org/apache/commons/cli/example/XhtmlHelpAppendable.java ++++ b/src/test/java/org/apache/commons/cli/example/XhtmlHelpAppendable.java +@@ -24,7 +24,7 @@ import java.util.Objects; + import org.apache.commons.cli.help.FilterHelpAppendable; + import org.apache.commons.cli.help.TableDefinition; + import org.apache.commons.lang3.StringUtils; +-import org.apache.commons.text.StringEscapeUtils; ++import org.apache.commons.lang3.StringEscapeUtils; + + /** + * Appends XHTML formatted text to an {@link Appendable}. +-- +2.51.0 + diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index a0a366a..27c557e 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: apache-commons-cli -Version: 1.9.0 +Version: 1.10.0 Release: %autorelease Summary: Command Line Interface Library for Java License: Apache-2.0 @@ -11,6 +11,8 @@ ExclusiveArch: %{java_arches} noarch Source0: https://www.apache.org/dist/commons/cli/source/commons-cli-%{version}-src.tar.gz +Patch: 0001-Port-tests-to-commons-lang3.patch + %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else diff --git a/sources b/sources index ee08b7f..fc2fa2d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-cli-1.9.0-src.tar.gz) = d20df809e8e0ebed79c57af9c9b447b0068347ba0edfcdec3652cb00bd9575b24fc77093d735e827d9d02a6fe2681bf239fd01df5f7c682ae34ade0781c53e35 +SHA512 (commons-cli-1.10.0-src.tar.gz) = 245951919a88068f692fc4cab906cb210bbefd853d851167d5c34fd4aebab7370766458033c47cf8174d7a409c4364752770b573252d19746cbb9a0e2c8c255b From 5b25f257f7b9464c0aaa486a9921eca974713cc6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:46:23 +0000 Subject: [PATCH 14/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild