From 30aaf68f9fa3803696615973773dabe1ae851740 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 12 May 2022 22:33:24 +0200 Subject: [PATCH 01/31] Add ExclusiveArch: %{java_arches} noarch See: https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- beust-jcommander.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/beust-jcommander.spec b/beust-jcommander.spec index 26a4e52..e002829 100644 --- a/beust-jcommander.spec +++ b/beust-jcommander.spec @@ -7,6 +7,7 @@ Summary: Java framework for parsing command line parameters License: ASL 2.0 URL: http://jcommander.org/ BuildArch: noarch +ExclusiveArch: %{java_arches} noarch # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz From d837652e25fb96b6045be71547d7abc8e9b06e23 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 Jun 2022 08:03:17 +0200 Subject: [PATCH 02/31] Update build-requires in bootstrap mode --- beust-jcommander.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beust-jcommander.spec b/beust-jcommander.spec index e002829..2e44434 100644 --- a/beust-jcommander.spec +++ b/beust-jcommander.spec @@ -18,10 +18,10 @@ Source2: generate-tarball.sh Patch0: 0001-ParseValues-NullPointerException-patch.patch -BuildRequires: maven-local %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else +BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.testng:testng) %endif From 9528d1f3c7979a8352975814feb525806ae58052 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 21:56:08 +0000 Subject: [PATCH 03/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- beust-jcommander.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beust-jcommander.spec b/beust-jcommander.spec index 2e44434..9206a93 100644 --- a/beust-jcommander.spec +++ b/beust-jcommander.spec @@ -2,7 +2,7 @@ Name: beust-jcommander Version: 1.78 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Java framework for parsing command line parameters License: ASL 2.0 URL: http://jcommander.org/ @@ -58,6 +58,9 @@ sed -i 's/@VERSION@/%{version}/g' pom.xml %doc license.txt notice.md %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 1.78-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Feb 05 2022 Jiri Vanek - 1.78-9 - Rebuilt for java-17-openjdk as system jdk From ce7ee5748f95325a03c8381d3d8d84ac58c29e05 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Aug 2022 08:36:51 +0200 Subject: [PATCH 04/31] Onboard package into gating --- .fmf/version | 1 + ci.fmf | 1 + gating.yaml | 8 ++++++++ plans/javapackages.fmf | 7 +++++++ 4 files changed, 17 insertions(+) create mode 100644 .fmf/version create mode 100644 ci.fmf create mode 100644 gating.yaml create mode 100644 plans/javapackages.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..0d484d7 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,8 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: + - bodhi_update_push_testing + - bodhi_update_push_stable +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..8f6c9cb --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://src.fedoraproject.org/tests/javapackages + ref: f37 +execute: + how: tmt From 095c1ee4c21d353a1e3bc23712722c0fddf6f1cc Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 29 Jun 2022 15:53:37 +0200 Subject: [PATCH 05/31] Update to upstream version 1.82 --- .gitignore | 2 + beust-jcommander.pom | 271 ------------------------------------------ beust-jcommander.spec | 24 ++-- sources | 3 +- 4 files changed, 19 insertions(+), 281 deletions(-) delete mode 100644 beust-jcommander.pom diff --git a/.gitignore b/.gitignore index 8a5dacc..bb5fe93 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,5 @@ /beust-jcommander-1.71.tar.gz /beust-jcommander-1.75.tar.gz /beust-jcommander-1.78.tar.gz +/beust-jcommander-1.82.tar.gz +/jcommander-1.82.pom diff --git a/beust-jcommander.pom b/beust-jcommander.pom deleted file mode 100644 index d34ebbe..0000000 --- a/beust-jcommander.pom +++ /dev/null @@ -1,271 +0,0 @@ - - - - 4.0.0 - com.beust - jcommander - jar - JCommander - @VERSION@ - A Java framework to parse command line options with annotations. - http://beust.com/jcommander - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - scm:git:git@github.com:cbeust/jcommander.git - scm:git:git@github.com:cbeust/jcommander.git - git@github.com:cbeust/jcommander.git - - - - - jcenter - bintray - http://jcenter.bintray.com - - - - - - - sonatype-nexus-staging - Nexus Staging Repository - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - Cedric Beust - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.1 - - 1.8 - 1.8 - UTF-8 - - - - - - org.apache.maven.plugins - maven-resources-plugin - 2.4.1 - - UTF-8 - - - - - - org.apache.felix - maven-bundle-plugin - 2.1.0 - - - bundle-manifest - process-classes - - manifest - - - - <_versionpolicy>$(@) - - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.3.1 - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.10 - - false - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.7 - - *.internal - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.felix - - maven-bundle-plugin - - - [2.1.0,) - - - manifest - - - - - - - - - - - - - - - - - org.testng - testng - 6.8.21 - jar - test - - - jcommander - com.beust - - - - - - - - - - license - - - - com.mycila.maven-license-plugin - maven-license-plugin - 1.7.0 - - false -
src/main/license/license-header.txt
- - src/** - pom.xml - - - **/.git/** - - **/target/** - - false - - - - - check - - - - - - - - - - - sign - - - - maven-gpg-plugin - 1.4 - - - sign-artifacts - verify - - sign - - - - - - - - - - diff --git a/beust-jcommander.spec b/beust-jcommander.spec index 9206a93..1d91409 100644 --- a/beust-jcommander.spec +++ b/beust-jcommander.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: beust-jcommander -Version: 1.78 -Release: 10%{?dist} +Version: 1.82 +Release: 1%{?dist} Summary: Java framework for parsing command line parameters License: ASL 2.0 URL: http://jcommander.org/ @@ -11,8 +11,7 @@ ExclusiveArch: %{java_arches} noarch # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz -# Adapted from earlier version that still shipped poms. It uses kobalt for building now -Source1: %{name}.pom +Source1: https://repo1.maven.org/maven2/com/beust/jcommander/%{version}/jcommander-%{version}.pom # Cleaned up bundled jars whose licensing cannot be easily verified Source2: generate-tarball.sh @@ -40,24 +39,31 @@ This package contains the %{summary}. %setup -q %patch0 -p1 -chmod -x license.txt cp -p %SOURCE1 pom.xml -sed -i 's/@VERSION@/%{version}/g' pom.xml +%pom_xpath_set "pom:project/pom:version" "%{version}" + +# maven-surefire-plugin requires explicit version >= 4.7 +%pom_add_dep org.testng:testng:4.7:test + +%mvn_file : %{name} %build -%mvn_file : %{name} %mvn_build %install %mvn_install %files -f .mfiles -%doc license.txt notice.md README.markdown +%attr(0644,root,root) %license license.txt notice.md +%doc README.markdown %files javadoc -f .mfiles-javadoc -%doc license.txt notice.md +%license license.txt notice.md %changelog +* Wed Sep 07 2022 Marian Koncek - 1.82-1 +- Update to upstream version 1.82 + * Wed Jul 20 2022 Fedora Release Engineering - 1.78-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 0be1842..82431ad 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (beust-jcommander-1.78.tar.gz) = 618367d1644bf0423c3184bd4a6be73571c1b2de243bb7dad4e72d5a3023bf30116c0e5337088e0e4d1f42f24ba94b0fddaedcd3e54613c335d068edeaddfaef +SHA512 (beust-jcommander-1.82.tar.gz) = f0d13c021429476120ece6a252695dc7b05af41e7bf2535afed6e0e1cadedaea5300a90e0b7f77b413d1f3a049cbd57f96f322ab5d9dcb022ad2ad4c46bc235a +SHA512 (jcommander-1.82.pom) = bf24086ad1466ca1c2c9ad4a5a1dc8e8161a1831117b2a8c91c417101252d4526c83e0a7ab5878ff6e8163901127e9e6cf3457a0d1f7746de4bd6d5fea1d0e8e From a103e47591c93695c04b9249691ec789799dbf64 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 22:49:37 +0000 Subject: [PATCH 06/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- beust-jcommander.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beust-jcommander.spec b/beust-jcommander.spec index 1d91409..b937a45 100644 --- a/beust-jcommander.spec +++ b/beust-jcommander.spec @@ -2,7 +2,7 @@ Name: beust-jcommander Version: 1.82 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java framework for parsing command line parameters License: ASL 2.0 URL: http://jcommander.org/ @@ -61,6 +61,9 @@ cp -p %SOURCE1 pom.xml %license license.txt notice.md %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 1.82-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Sep 07 2022 Marian Koncek - 1.82-1 - Update to upstream version 1.82 From 637652d7af4836f62628b8838c17e4017c98ea96 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 14:33:41 +0000 Subject: [PATCH 07/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- beust-jcommander.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beust-jcommander.spec b/beust-jcommander.spec index b937a45..395b970 100644 --- a/beust-jcommander.spec +++ b/beust-jcommander.spec @@ -2,7 +2,7 @@ Name: beust-jcommander Version: 1.82 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java framework for parsing command line parameters License: ASL 2.0 URL: http://jcommander.org/ @@ -61,6 +61,9 @@ cp -p %SOURCE1 pom.xml %license license.txt notice.md %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1.82-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 1.82-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 0029999113f25c76aedddf311d5d483dd7437b36 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 1 Sep 2023 13:20:31 +0200 Subject: [PATCH 08/31] Convert License tag to SPDX format Related: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 --- beust-jcommander.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/beust-jcommander.spec b/beust-jcommander.spec index 395b970..62445a9 100644 --- a/beust-jcommander.spec +++ b/beust-jcommander.spec @@ -2,9 +2,9 @@ Name: beust-jcommander Version: 1.82 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java framework for parsing command line parameters -License: ASL 2.0 +License: Apache-2.0 URL: http://jcommander.org/ BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -61,6 +61,9 @@ cp -p %SOURCE1 pom.xml %license license.txt notice.md %changelog +* Fri Sep 01 2023 Mikolaj Izdebski - 1.82-4 +- Convert License tag to SPDX format + * Wed Jul 19 2023 Fedora Release Engineering - 1.82-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 4d7b48951913d2b84211045c33c3d02afaf89776 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 31 Oct 2023 14:38:27 +0100 Subject: [PATCH 09/31] Fix license directory permissions Resolves: rhbz#2144648 --- beust-jcommander.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/beust-jcommander.spec b/beust-jcommander.spec index 62445a9..01099af 100644 --- a/beust-jcommander.spec +++ b/beust-jcommander.spec @@ -2,7 +2,7 @@ Name: beust-jcommander Version: 1.82 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java framework for parsing command line parameters License: Apache-2.0 URL: http://jcommander.org/ @@ -38,6 +38,7 @@ This package contains the %{summary}. %prep %setup -q %patch0 -p1 +chmod -x license.txt cp -p %SOURCE1 pom.xml %pom_xpath_set "pom:project/pom:version" "%{version}" @@ -54,13 +55,17 @@ cp -p %SOURCE1 pom.xml %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 +* Tue Oct 31 2023 Mikolaj Izdebski - 1.82-5 +- Fix license directory permissions +- Resolves: rhbz#2144648 + * Fri Sep 01 2023 Mikolaj Izdebski - 1.82-4 - Convert License tag to SPDX format From f76786cf842bc4fd3f524655affba0581730e386 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 26 Oct 2023 07:33:07 +0200 Subject: [PATCH 10/31] Update javapackages test plan to f40 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 8f6c9cb..a2cdaba 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: f37 + ref: f40 execute: how: tmt From ba4a8d74e97c51d4d4c70da455d4a766046af416 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 14:20:38 +0000 Subject: [PATCH 11/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- beust-jcommander.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beust-jcommander.spec b/beust-jcommander.spec index 01099af..6978360 100644 --- a/beust-jcommander.spec +++ b/beust-jcommander.spec @@ -2,7 +2,7 @@ Name: beust-jcommander Version: 1.82 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java framework for parsing command line parameters License: Apache-2.0 URL: http://jcommander.org/ @@ -62,6 +62,9 @@ cp -p %SOURCE1 pom.xml %license license.txt notice.md %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.82-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Oct 31 2023 Mikolaj Izdebski - 1.82-5 - Fix license directory permissions - Resolves: rhbz#2144648 From c4ba6a3c0dc7ab452a08c72c067d4bdb468dc562 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 23 Jan 2024 00:18:35 +0000 Subject: [PATCH 12/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- beust-jcommander.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beust-jcommander.spec b/beust-jcommander.spec index 6978360..0888874 100644 --- a/beust-jcommander.spec +++ b/beust-jcommander.spec @@ -2,7 +2,7 @@ Name: beust-jcommander Version: 1.82 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Java framework for parsing command line parameters License: Apache-2.0 URL: http://jcommander.org/ @@ -62,6 +62,9 @@ cp -p %SOURCE1 pom.xml %license license.txt notice.md %changelog +* Tue Jan 23 2024 Fedora Release Engineering - 1.82-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.82-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From e7f7d9f8caaba583a7ef6e61f12544286daed140 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 23 Feb 2024 14:17:16 +0100 Subject: [PATCH 13/31] 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 --- beust-jcommander.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beust-jcommander.spec b/beust-jcommander.spec index 0888874..364df07 100644 --- a/beust-jcommander.spec +++ b/beust-jcommander.spec @@ -2,7 +2,7 @@ Name: beust-jcommander Version: 1.82 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Java framework for parsing command line parameters License: Apache-2.0 URL: http://jcommander.org/ @@ -62,6 +62,9 @@ cp -p %SOURCE1 pom.xml %license license.txt notice.md %changelog +* Fri Feb 23 2024 Jiri Vanek - 1.82-8 +- bump of release for for java-21-openjdk as system jdk + * Tue Jan 23 2024 Fedora Release Engineering - 1.82-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From d4d5b5bb8d71e429661ce76231a7ad5d2f85cc7d Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 14:59:20 +0100 Subject: [PATCH 14/31] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- beust-jcommander.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beust-jcommander.spec b/beust-jcommander.spec index 364df07..951e905 100644 --- a/beust-jcommander.spec +++ b/beust-jcommander.spec @@ -2,7 +2,7 @@ Name: beust-jcommander Version: 1.82 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Java framework for parsing command line parameters License: Apache-2.0 URL: http://jcommander.org/ @@ -62,6 +62,9 @@ cp -p %SOURCE1 pom.xml %license license.txt notice.md %changelog +* Tue Feb 27 2024 Jiri Vanek - 1.82-9 +- Rebuilt for java-21-openjdk as system jdk + * Fri Feb 23 2024 Jiri Vanek - 1.82-8 - bump of release for for java-21-openjdk as system jdk From ea4a5ead2b634c5f4edfeec6c86066a3d40404f5 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:46 +0200 Subject: [PATCH 15/31] Eliminate use of obsolete %patchN syntax (#2283636) --- beust-jcommander.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beust-jcommander.spec b/beust-jcommander.spec index 951e905..6f9c5f1 100644 --- a/beust-jcommander.spec +++ b/beust-jcommander.spec @@ -37,7 +37,7 @@ This package contains the %{summary}. %prep %setup -q -%patch0 -p1 +%patch -P0 -p1 chmod -x license.txt cp -p %SOURCE1 pom.xml From 5fb2300db4edc6f2f46be6d2a959b8f4cb8a9e9c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 31 May 2024 05:41:47 +0200 Subject: [PATCH 16/31] Switch to a newer %patch syntax --- beust-jcommander.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/beust-jcommander.spec b/beust-jcommander.spec index 6f9c5f1..e71393a 100644 --- a/beust-jcommander.spec +++ b/beust-jcommander.spec @@ -2,7 +2,7 @@ Name: beust-jcommander Version: 1.82 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Java framework for parsing command line parameters License: Apache-2.0 URL: http://jcommander.org/ @@ -37,7 +37,7 @@ This package contains the %{summary}. %prep %setup -q -%patch -P0 -p1 +%patch 0 -p1 chmod -x license.txt cp -p %SOURCE1 pom.xml @@ -62,6 +62,9 @@ cp -p %SOURCE1 pom.xml %license license.txt notice.md %changelog +* Fri May 31 2024 Mikolaj Izdebski - 1.82-10 +- Switch to a newer patch macro syntax + * Tue Feb 27 2024 Jiri Vanek - 1.82-9 - Rebuilt for java-21-openjdk as system jdk From 5186376a3b3b539e5617401e8e67f9d194d45c69 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 18:14:10 +0000 Subject: [PATCH 17/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- beust-jcommander.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beust-jcommander.spec b/beust-jcommander.spec index e71393a..0bd6d28 100644 --- a/beust-jcommander.spec +++ b/beust-jcommander.spec @@ -2,7 +2,7 @@ Name: beust-jcommander Version: 1.82 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Java framework for parsing command line parameters License: Apache-2.0 URL: http://jcommander.org/ @@ -62,6 +62,9 @@ cp -p %SOURCE1 pom.xml %license license.txt notice.md %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.82-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri May 31 2024 Mikolaj Izdebski - 1.82-10 - Switch to a newer patch macro syntax From ce23b9ddda69aa83df06703299dc973c564bb012 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:29 +0200 Subject: [PATCH 18/31] 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 88f218a9b4060eaf18ba6f528ba785462342be99 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:56 +0200 Subject: [PATCH 19/31] Switch from %setup to %autosetup --- beust-jcommander.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/beust-jcommander.spec b/beust-jcommander.spec index 0bd6d28..c267c3e 100644 --- a/beust-jcommander.spec +++ b/beust-jcommander.spec @@ -36,8 +36,7 @@ Summary: API documentation for %{name} This package contains the %{summary}. %prep -%setup -q -%patch 0 -p1 +%autosetup -p1 -C chmod -x license.txt cp -p %SOURCE1 pom.xml From d804a988396fad3506ae14cac9c14e067525b828 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 Aug 2024 22:13:18 +0200 Subject: [PATCH 20/31] Switch to non-numdered patches --- beust-jcommander.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beust-jcommander.spec b/beust-jcommander.spec index c267c3e..ea1b22f 100644 --- a/beust-jcommander.spec +++ b/beust-jcommander.spec @@ -15,7 +15,7 @@ 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 From 70606932663ea8becc2f2a861b6fba2594db5fd7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:02 +0200 Subject: [PATCH 21/31] Convert to %autorelease and %autochangelog --- beust-jcommander.spec | 180 +----------------------------------------- changelog | 177 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 179 insertions(+), 178 deletions(-) create mode 100644 changelog diff --git a/beust-jcommander.spec b/beust-jcommander.spec index ea1b22f..b3cf542 100644 --- a/beust-jcommander.spec +++ b/beust-jcommander.spec @@ -2,7 +2,7 @@ Name: beust-jcommander Version: 1.82 -Release: 11%{?dist} +Release: %autorelease Summary: Java framework for parsing command line parameters License: Apache-2.0 URL: http://jcommander.org/ @@ -61,180 +61,4 @@ cp -p %SOURCE1 pom.xml %license license.txt notice.md %changelog -* Wed Jul 17 2024 Fedora Release Engineering - 1.82-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri May 31 2024 Mikolaj Izdebski - 1.82-10 -- Switch to a newer patch macro syntax - -* Tue Feb 27 2024 Jiri Vanek - 1.82-9 -- Rebuilt for java-21-openjdk as system jdk - -* Fri Feb 23 2024 Jiri Vanek - 1.82-8 -- bump of release for for java-21-openjdk as system jdk - -* Tue Jan 23 2024 Fedora Release Engineering - 1.82-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1.82-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Tue Oct 31 2023 Mikolaj Izdebski - 1.82-5 -- Fix license directory permissions -- Resolves: rhbz#2144648 - -* Fri Sep 01 2023 Mikolaj Izdebski - 1.82-4 -- Convert License tag to SPDX format - -* Wed Jul 19 2023 Fedora Release Engineering - 1.82-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jan 18 2023 Fedora Release Engineering - 1.82-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Sep 07 2022 Marian Koncek - 1.82-1 -- Update to upstream version 1.82 - -* Wed Jul 20 2022 Fedora Release Engineering - 1.78-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Feb 05 2022 Jiri Vanek - 1.78-9 -- Rebuilt for java-17-openjdk as system jdk - -* Wed Jan 19 2022 Fedora Release Engineering - 1.78-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 1.78-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 17 2021 Mikolaj Izdebski - 1.78-6 -- Bootstrap build -- Non-bootstrap build - -* Tue Jan 26 2021 Fedora Release Engineering - 1.78-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 1.78-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 10 2020 Jiri Vanek - 1.78-3 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Tue Jun 09 2020 Fedora Release Engineering - 1.78-3 -- skipped tests as they require user input with jdk11, changed way of javadoc generation - -* Tue Jan 28 2020 Fedora Release Engineering - 1.78-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Nov 09 2019 Fabio Valentini - 1.78-1 -- Update to version 1.78. -- Remove unnecessary parent from POM file. - -* Tue Nov 05 2019 Mikolaj Izdebski - 1.78-2 -- Mass rebuild for javapackages-tools 201902 - -* Mon Sep 02 2019 Marian Koncek - 1.78-1 -- Update to upstream version 1.78 - -* Thu Aug 15 2019 Marian Koncek - 1.75-1 -- Update to upstream version 1.75 - -* Wed Jul 24 2019 Fedora Release Engineering - 1.71-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri May 24 2019 Mikolaj Izdebski - 1.71-6 -- Mass rebuild for javapackages-tools 201901 - -* Thu Jan 31 2019 Fedora Release Engineering - 1.71-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Jul 30 2018 Michael Simacek - 1.71-5 -- Repack the tarball without binaries - -* Thu Jul 12 2018 Fedora Release Engineering - 1.71-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 1.71-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.71-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Tue Jun 13 2017 Roman Vais - 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 - 1.66-1 -- Update to upstream version 1.66 - -* Fri Feb 17 2017 Roman Vais - 1.65-1 -- Update to upstream version 1.65 - -* Thu Jan 26 2017 Roman Vais - 1.62-1 -- Update to upstream version 1.62 - -* Wed Dec 14 2016 Michael Simacek - 1.60-1 -- Update to upstream version 1.60 - -* Tue Nov 01 2016 Roman Vais - 1.58-1 -- Update to upstream version 1.58 - -* Fri Sep 30 2016 Roman Vais - 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 - 1.56-1 -- New version release. - -* Wed Feb 03 2016 Fedora Release Engineering - 1.47-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 1.47-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Jan 28 2015 Michael Simacek - 1.47-1 -- Update to upstream version 1.47 -- Enable tests - -* Mon Oct 13 2014 Mikolaj Izdebski - 1.45-1 -- Update to upstream version 1.45 - -* Sat Jun 07 2014 Fedora Release Engineering - 1.35-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed Feb 26 2014 Mikolaj Izdebski - 1.35-1 -- Update to upstream version 1.35 - -* Sat Aug 03 2013 Fedora Release Engineering - 1.30-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 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 - 1.30-2 -- Replace BR: xmvn with maven-local - -* Thu Jan 10 2013 Mikolaj Izdebski - 1.30-1 -- Update to upstream version 1.30 -- Build with xmvn - -* Thu Aug 16 2012 Mikolaj Izdebski - 1.17-6 -- Install NOTICE files - -* Wed Jul 18 2012 Fedora Release Engineering - 1.17-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jan 12 2012 Fedora Release Engineering - 1.17-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Nov 30 2011 Alexander Kurtakov 1.17-3 -- Use the new maven macro. - -* Mon May 16 2011 Jaromir Capik - 1.17-2 -- Unwanted comment removal -- Target javadoc:jar replaced with javadoc:aggregate - -* Fri May 13 2011 Jaromir Capik - 1.17-1 -- Initial version of the package +%autochangelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..315fc13 --- /dev/null +++ b/changelog @@ -0,0 +1,177 @@ +* Wed Jul 17 2024 Fedora Release Engineering - 1.82-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri May 31 2024 Mikolaj Izdebski - 1.82-10 +- Switch to a newer patch macro syntax + +* Tue Feb 27 2024 Jiri Vanek - 1.82-9 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 1.82-8 +- bump of release for for java-21-openjdk as system jdk + +* Tue Jan 23 2024 Fedora Release Engineering - 1.82-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1.82-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Oct 31 2023 Mikolaj Izdebski - 1.82-5 +- Fix license directory permissions +- Resolves: rhbz#2144648 + +* Fri Sep 01 2023 Mikolaj Izdebski - 1.82-4 +- Convert License tag to SPDX format + +* Wed Jul 19 2023 Fedora Release Engineering - 1.82-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jan 18 2023 Fedora Release Engineering - 1.82-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Sep 07 2022 Marian Koncek - 1.82-1 +- Update to upstream version 1.82 + +* Wed Jul 20 2022 Fedora Release Engineering - 1.78-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 1.78-9 +- Rebuilt for java-17-openjdk as system jdk + +* Wed Jan 19 2022 Fedora Release Engineering - 1.78-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 1.78-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 1.78-6 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 1.78-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 1.78-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 1.78-3 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Tue Jun 09 2020 Fedora Release Engineering - 1.78-3 +- skipped tests as they require user input with jdk11, changed way of javadoc generation + +* Tue Jan 28 2020 Fedora Release Engineering - 1.78-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Nov 09 2019 Fabio Valentini - 1.78-1 +- Update to version 1.78. +- Remove unnecessary parent from POM file. + +* Tue Nov 05 2019 Mikolaj Izdebski - 1.78-2 +- Mass rebuild for javapackages-tools 201902 + +* Mon Sep 02 2019 Marian Koncek - 1.78-1 +- Update to upstream version 1.78 + +* Thu Aug 15 2019 Marian Koncek - 1.75-1 +- Update to upstream version 1.75 + +* Wed Jul 24 2019 Fedora Release Engineering - 1.71-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 24 2019 Mikolaj Izdebski - 1.71-6 +- Mass rebuild for javapackages-tools 201901 + +* Thu Jan 31 2019 Fedora Release Engineering - 1.71-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Jul 30 2018 Michael Simacek - 1.71-5 +- Repack the tarball without binaries + +* Thu Jul 12 2018 Fedora Release Engineering - 1.71-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 1.71-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.71-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Tue Jun 13 2017 Roman Vais - 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 - 1.66-1 +- Update to upstream version 1.66 + +* Fri Feb 17 2017 Roman Vais - 1.65-1 +- Update to upstream version 1.65 + +* Thu Jan 26 2017 Roman Vais - 1.62-1 +- Update to upstream version 1.62 + +* Wed Dec 14 2016 Michael Simacek - 1.60-1 +- Update to upstream version 1.60 + +* Tue Nov 01 2016 Roman Vais - 1.58-1 +- Update to upstream version 1.58 + +* Fri Sep 30 2016 Roman Vais - 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 - 1.56-1 +- New version release. + +* Wed Feb 03 2016 Fedora Release Engineering - 1.47-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 1.47-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Jan 28 2015 Michael Simacek - 1.47-1 +- Update to upstream version 1.47 +- Enable tests + +* Mon Oct 13 2014 Mikolaj Izdebski - 1.45-1 +- Update to upstream version 1.45 + +* Sat Jun 07 2014 Fedora Release Engineering - 1.35-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed Feb 26 2014 Mikolaj Izdebski - 1.35-1 +- Update to upstream version 1.35 + +* Sat Aug 03 2013 Fedora Release Engineering - 1.30-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 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 - 1.30-2 +- Replace BR: xmvn with maven-local + +* Thu Jan 10 2013 Mikolaj Izdebski - 1.30-1 +- Update to upstream version 1.30 +- Build with xmvn + +* Thu Aug 16 2012 Mikolaj Izdebski - 1.17-6 +- Install NOTICE files + +* Wed Jul 18 2012 Fedora Release Engineering - 1.17-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jan 12 2012 Fedora Release Engineering - 1.17-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Nov 30 2011 Alexander Kurtakov 1.17-3 +- Use the new maven macro. + +* Mon May 16 2011 Jaromir Capik - 1.17-2 +- Unwanted comment removal +- Target javadoc:jar replaced with javadoc:aggregate + +* Fri May 13 2011 Jaromir Capik - 1.17-1 +- Initial version of the package From 8d3ae2485f13e2e1052c50b2d1c35a9d5806aaf2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 29 Nov 2024 08:28:38 +0100 Subject: [PATCH 22/31] 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 cb4acd410176e6ae7ba1befa39042d32dd698205 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 31 Dec 2024 09:59:10 +0100 Subject: [PATCH 23/31] Update javadoc package description [skip changelog] --- beust-jcommander.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beust-jcommander.spec b/beust-jcommander.spec index b3cf542..87cbe84 100644 --- a/beust-jcommander.spec +++ b/beust-jcommander.spec @@ -33,7 +33,7 @@ parse command line parameters (with annotations). Summary: API documentation for %{name} %description javadoc -This package contains the %{summary}. +API documentation for %{name}. %prep %autosetup -p1 -C From b61672dcbc6e8854dbf4acff22357858f21117b4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 13 Jan 2025 10:46:45 +0100 Subject: [PATCH 24/31] Switch upstream URL to https --- beust-jcommander.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beust-jcommander.spec b/beust-jcommander.spec index 87cbe84..068fbc6 100644 --- a/beust-jcommander.spec +++ b/beust-jcommander.spec @@ -5,7 +5,7 @@ Version: 1.82 Release: %autorelease Summary: Java framework for parsing command line parameters License: Apache-2.0 -URL: http://jcommander.org/ +URL: https://jcommander.org BuildArch: noarch ExclusiveArch: %{java_arches} noarch From a1ebab3ba63b6b2e63290ef4a4d498d168e61f8f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 12:26:22 +0000 Subject: [PATCH 25/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 8abf2093ef8e56a790b7e3ae403338496659ac9c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:13 +0100 Subject: [PATCH 26/31] Remove javadoc subpackage --- beust-jcommander.spec | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/beust-jcommander.spec b/beust-jcommander.spec index 068fbc6..a206aa7 100644 --- a/beust-jcommander.spec +++ b/beust-jcommander.spec @@ -24,17 +24,13 @@ BuildRequires: maven-local 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 -API documentation for %{name}. - %prep %autosetup -p1 -C chmod -x license.txt @@ -48,7 +44,7 @@ cp -p %SOURCE1 pom.xml %mvn_file : %{name} %build -%mvn_build +%mvn_build -j %install %mvn_install @@ -57,8 +53,5 @@ cp -p %SOURCE1 pom.xml %license license.txt notice.md %doc README.markdown -%files javadoc -f .mfiles-javadoc -%license license.txt notice.md - %changelog %autochangelog From 1d1c86068adc8b6cbd9c419a1edfe2d1b856ba06 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:18 +0100 Subject: [PATCH 27/31] 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 767d745f83e4c63dde0f8f09cccefdc8dbdab6f1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:31 +0200 Subject: [PATCH 28/31] 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 85fc8cb7242aabe7a7dcfe33ac8559989c062e4d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:51 +0200 Subject: [PATCH 29/31] Build with OpenJDK 25 --- beust-jcommander.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beust-jcommander.spec b/beust-jcommander.spec index a206aa7..94cbb67 100644 --- a/beust-jcommander.spec +++ b/beust-jcommander.spec @@ -20,7 +20,7 @@ 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 From 78a3463be820eeaea00c440ef53ef947731975ff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:40:03 +0000 Subject: [PATCH 30/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From a634400b0a0ca84dfae9994cbf5be8f81db7a15c Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 29 Jul 2025 19:49:43 +0200 Subject: [PATCH 31/31] 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.