From c5193e442df609a81067a3be7cf6fab326a2e34b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 16 Feb 2025 17:17:20 +0100 Subject: [PATCH 1/7] Add classes alias --- google-guice.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/google-guice.spec b/google-guice.spec index e57adaa..125fa5f 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -172,6 +172,8 @@ API documentation for %{name}. #%pom_xpath_inject "pom:dependency[pom:artifactId='guice']" "provided" extensions +%mvn_alias :guice :::classes: + %build #%mvn_alias "com.google.inject.extensions:" "org.sonatype.sisu.inject:" From 0f9650b1d9cd4019629843b9d36bfd5f0d45ff07 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:13 +0100 Subject: [PATCH 2/7] Remove javadoc subpackage --- google-guice.spec | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/google-guice.spec b/google-guice.spec index 125fa5f..d9b59af 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -32,6 +32,8 @@ BuildRequires: mvn(org.ow2.asm:asm) # xmvn-builddep misses this: BuildRequires: mvn(org.apache:apache-jar-resource-bundle) %endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 5.1.0-27 %description Put simply, Guice alleviates the need for factories and the use of new @@ -115,12 +117,6 @@ Summary: Bill of Materials for Guice Guice is a lightweight dependency injection framework for Java 5 and above. This package provides Bill of Materials module for Guice. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %prep %autosetup -p1 -C @@ -184,7 +180,7 @@ API documentation for %{name}. %mvn_file ":guice" guice/%{name} %{name} #%mvn_alias ":guice" "org.sonatype.sisu:sisu-guice" # Skip tests because of missing dependency guice-testlib -%mvn_build -f -s +%mvn_build -j -f -s %install %mvn_install @@ -210,8 +206,5 @@ API documentation for %{name}. %files -n guice-bom -f .mfiles-guice-bom -%files javadoc -f .mfiles-javadoc -%license COPYING - %changelog %autochangelog From ba01846bc95ce1508ebb1a99eb3cbcca45f126cd Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:19 +0100 Subject: [PATCH 3/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 886ca0dbed43b173389f68498c9a1fcd5fc18b1a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:31 +0200 Subject: [PATCH 4/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 ebfe1da389ab682a49c0c12efeb4e9e9a7f8e1c0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:51 +0200 Subject: [PATCH 5/7] Build with OpenJDK 25 --- google-guice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-guice.spec b/google-guice.spec index d9b59af..1ce6ef4 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -17,7 +17,7 @@ BuildRequires: jurand %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(aopalliance:aopalliance) BuildRequires: mvn(com.google.code.findbugs:jsr305) BuildRequires: mvn(com.google.guava:guava) From 30ffc7c9ff6c6faf7e62cc9349ff45a4d77018d2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 16:24:53 +0000 Subject: [PATCH 6/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 5d78b12e8344b9f814a0af76adad70e181f73ec0 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 29 Jul 2025 20:50:18 +0200 Subject: [PATCH 7/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.