From 8abf2093ef8e56a790b7e3ae403338496659ac9c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:13 +0100 Subject: [PATCH 1/6] 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 2/6] 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 3/6] 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 4/6] 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 5/6] 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 6/6] 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.