From 349872f01fc2e12b1eb0275145d3e628559859e2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:14 +0100 Subject: [PATCH 1/7] Remove javadoc subpackage --- plexus-languages.spec | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/plexus-languages.spec b/plexus-languages.spec index 0c5e0ac..33f9263 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -26,17 +26,13 @@ BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin) BuildRequires: mvn(org.ow2.asm:asm) %endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 1.2.0-15 %description Plexus Languages is a set of Plexus components that maintain shared language features. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %prep %autosetup -p1 -C @@ -46,7 +42,7 @@ cp %{SOURCE1} . %build # many tests rely on bundled test jars/classes -%mvn_build -f +%mvn_build -j -f %install %mvn_install @@ -54,7 +50,5 @@ cp %{SOURCE1} . %files -f .mfiles %license LICENSE-2.0.txt -%files javadoc -f .mfiles-javadoc - %changelog %autochangelog From d349ff56981a762e0d161b22c6fdf3bfd470a6a2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:19 +0100 Subject: [PATCH 2/7] 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 7a06781f81150d909915dcd4db32a64d90184a63 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:32 +0200 Subject: [PATCH 3/7] 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 86f329e008ac8127818d1ed7cb126d2e5683a449 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:52 +0200 Subject: [PATCH 4/7] Build with OpenJDK 25 --- plexus-languages.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plexus-languages.spec b/plexus-languages.spec index 33f9263..aaa6bd0 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -18,7 +18,7 @@ Source2: generate-tarball.sh %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(com.thoughtworks.qdox:qdox) BuildRequires: mvn(javax.inject:javax.inject) BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) From 3b8608d299e008e3a261302cf2052f1e8479342f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 05:55:12 +0000 Subject: [PATCH 5/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 5212ffdd6e796df22cefb91ac990fbc269e4e159 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 01:05:07 +0200 Subject: [PATCH 6/7] 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 20ce00880f5ca93fe10510956f85b40887022b17 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Thu, 4 Sep 2025 15:11:50 +0200 Subject: [PATCH 7/7] manual bodhi update for jdk25 needed on selected pkgs