From 7f6160e4ebaea7631240f7330c2415946c3df184 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:06:43 +0000 Subject: [PATCH 01/57] Switch to SHA512 sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 4f5f0b9..1f42259 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8e54f0c2bab596dcac751362af15b271 google-guice-4.1.tar.xz +SHA512 (google-guice-4.1.tar.xz) = 9a0250c5c821a6fce71db55502265ff2e93aef63901767c1b23bcc3a7370befc0c12dba07731d3c18c412acef9b74644ab85b13f623acb68f40c29fcb9fe5a69 From 6cdb6d0ae72ff4741b53812a28841d3278d01a3c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:42:46 +0000 Subject: [PATCH 02/57] Expand conditionals --- google-guice.spec | 44 -------------------------------------------- 1 file changed, 44 deletions(-) diff --git a/google-guice.spec b/google-guice.spec index aad3020..1aba54b 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -1,5 +1,3 @@ -%bcond_without jpa -%bcond_without spring %global short_name guice @@ -30,24 +28,8 @@ BuildRequires: mvn(org.sonatype.plugins:munge-maven-plugin) # xmvn-builddep misses this: BuildRequires: mvn(org.apache:apache-jar-resource-bundle) -%if %{with jpa} -BuildRequires: hibernate-jpa-2.0-api -%endif -%if %{with spring} -BuildRequires: springframework-beans -%endif # Test dependencies: -%if 0 -BuildRequires: maven-surefire-provider-testng -BuildRequires: aqute-bnd -BuildRequires: atinject-tck -BuildRequires: easymock2 -BuildRequires: felix-framework -BuildRequires: hibernate3-entitymanager -BuildRequires: mvn(org.hsqldb:hsqldb-j5) -BuildRequires: testng -%endif %description Put simply, Guice alleviates the need for factories and the use of new @@ -117,14 +99,6 @@ Summary: MultiBindings extension module for Guice Guice is a lightweight dependency injection framework for Java 5 and above. This package provides MultiBindings module for Guice. -%if %{with jpa} -%package -n %{short_name}-persist -Summary: Persist extension module for Guice - -%description -n %{short_name}-persist -Guice is a lightweight dependency injection framework for Java 5 -and above. This package provides Persist module for Guice. -%endif %package -n %{short_name}-servlet Summary: Servlet extension module for Guice @@ -133,14 +107,6 @@ Summary: Servlet extension module for Guice Guice is a lightweight dependency injection framework for Java 5 and above. This package provides Servlet module for Guice. -%if %{with spring} -%package -n %{short_name}-spring -Summary: Spring extension module for Guice - -%description -n %{short_name}-spring -Guice is a lightweight dependency injection framework for Java 5 -and above. This package provides Spring module for Guice. -%endif %package -n %{short_name}-testlib Summary: TestLib extension module for Guice @@ -204,12 +170,8 @@ This package provides %{summary}. %pom_remove_parent %pom_set_parent com.google.inject:guice-parent:%{version} jdk8-tests -%if %{without jpa} %pom_disable_module persist extensions -%endif -%if %{without spring} %pom_disable_module spring extensions -%endif %pom_disable_module jdk8-tests @@ -239,13 +201,7 @@ This package provides %{summary}. %files -n %{short_name}-jmx -f .mfiles-guice-jmx %files -n %{short_name}-jndi -f .mfiles-guice-jndi %files -n %{short_name}-multibindings -f .mfiles-guice-multibindings -%if %{with jpa} -%files -n %{short_name}-persist -f .mfiles-guice-persist -%endif %files -n %{short_name}-servlet -f .mfiles-guice-servlet -%if %{with spring} -%files -n %{short_name}-spring -f .mfiles-guice-spring -%endif %files -n %{short_name}-testlib -f .mfiles-guice-testlib %files -n %{short_name}-throwingproviders -f .mfiles-guice-throwingproviders From 22c2dbefb70a7b290e49a61e4dbeee2718334427 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 23 Nov 2018 11:31:33 +0100 Subject: [PATCH 03/57] Update to upstream version 4.2.2 --- .gitignore | 1 + google-guice.spec | 28 ++++++++++++++-------------- sources | 2 +- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 6722616..84ad8ee 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /google-guice-3.2.6.tar.xz /google-guice-4.0.tar.xz /google-guice-4.1.tar.xz +/google-guice-4.2.2.tar.xz diff --git a/google-guice.spec b/google-guice.spec index 1aba54b..2135ac9 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -2,8 +2,8 @@ %global short_name guice Name: google-%{short_name} -Version: 4.1 -Release: 11%{?dist} +Version: 4.2.2 +Release: 1%{?dist} Summary: Lightweight dependency injection framework for Java 5 and above License: ASL 2.0 URL: https://github.com/google/%{short_name} @@ -16,12 +16,13 @@ Source1: create-tarball.sh BuildRequires: maven-local BuildRequires: mvn(aopalliance:aopalliance) BuildRequires: mvn(cglib:cglib) -BuildRequires: mvn(com.google.guava:guava:19.0) +BuildRequires: mvn(com.google.guava:guava) BuildRequires: mvn(javax.inject:javax.inject) BuildRequires: mvn(javax.servlet:servlet-api) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) +BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.ow2.asm:asm) BuildRequires: mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.sonatype.plugins:munge-maven-plugin) @@ -29,8 +30,6 @@ BuildRequires: mvn(org.sonatype.plugins:munge-maven-plugin) BuildRequires: mvn(org.apache:apache-jar-resource-bundle) -# Test dependencies: - %description Put simply, Guice alleviates the need for factories and the use of new in your Java code. Think of Guice's @Inject as the new new. You will @@ -108,13 +107,6 @@ Guice is a lightweight dependency injection framework for Java 5 and above. This package provides Servlet module for Guice. -%package -n %{short_name}-testlib -Summary: TestLib extension module for Guice - -%description -n %{short_name}-testlib -Guice is a lightweight dependency injection framework for Java 5 -and above. This package provides TestLib module for Guice. - %package -n %{short_name}-throwingproviders Summary: ThrowingProviders extension module for Guice @@ -135,7 +127,6 @@ Summary: API documentation for Guice %description javadoc This package provides %{summary}. - %prep %setup -q -n %{name}-%{version} @@ -175,6 +166,12 @@ This package provides %{summary}. %pom_disable_module jdk8-tests +# Require a newer compiler +%pom_xpath_set "pom:build/pom:pluginManagement/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:source" "1.8" +%pom_xpath_set "pom:build/pom:pluginManagement/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:target" "1.8" + +%pom_disable_module testlib extensions + %build %mvn_alias "com.google.inject.extensions:" "org.sonatype.sisu.inject:" @@ -202,7 +199,6 @@ This package provides %{summary}. %files -n %{short_name}-jndi -f .mfiles-guice-jndi %files -n %{short_name}-multibindings -f .mfiles-guice-multibindings %files -n %{short_name}-servlet -f .mfiles-guice-servlet -%files -n %{short_name}-testlib -f .mfiles-guice-testlib %files -n %{short_name}-throwingproviders -f .mfiles-guice-throwingproviders %files -n %{short_name}-bom -f .mfiles-guice-bom @@ -212,6 +208,10 @@ This package provides %{summary}. %changelog +* Fri Apr 05 2019 Marian Koncek - 4.2.2-1 +- Update to upstream version 4.2.2 +- Fixes: RHBZ #1563661 + * Wed Apr 18 2018 Mikolaj Izdebski - 4.1-11 - Remove legacy Provides diff --git a/sources b/sources index 1f42259..40113dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (google-guice-4.1.tar.xz) = 9a0250c5c821a6fce71db55502265ff2e93aef63901767c1b23bcc3a7370befc0c12dba07731d3c18c412acef9b74644ab85b13f623acb68f40c29fcb9fe5a69 +SHA512 (google-guice-4.2.2.tar.xz) = 2ab60fe0ff277f0f2be5613b453ffe014bdb0ad08f88beb8698d7d93bd9d6d915e0f5eeaf5b3d3617439c48e44a4b850f1e48d9e82c070618fead00ccb482cb4 From bbd6ce046f28ae46c6dd1be6fe551c89af371673 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:37 +0200 Subject: [PATCH 04/57] Mass rebuild for javapackages-tools 201901 --- google-guice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/google-guice.spec b/google-guice.spec index 2135ac9..d737274 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -3,7 +3,7 @@ Name: google-%{short_name} Version: 4.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Lightweight dependency injection framework for Java 5 and above License: ASL 2.0 URL: https://github.com/google/%{short_name} @@ -208,6 +208,9 @@ This package provides %{summary}. %changelog +* Fri May 24 2019 Mikolaj Izdebski - 4.2.2-2 +- Mass rebuild for javapackages-tools 201901 + * Fri Apr 05 2019 Marian Koncek - 4.2.2-1 - Update to upstream version 4.2.2 - Fixes: RHBZ #1563661 From fbefb4ccacdbf842c90d208a32da10d25c61c893 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 13:46:12 +0200 Subject: [PATCH 05/57] Expand %short_name macro --- google-guice.spec | 73 +++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 38 deletions(-) diff --git a/google-guice.spec b/google-guice.spec index d737274..eb56eec 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -1,12 +1,9 @@ - -%global short_name guice - -Name: google-%{short_name} +Name: google-guice Version: 4.2.2 Release: 2%{?dist} Summary: Lightweight dependency injection framework for Java 5 and above License: ASL 2.0 -URL: https://github.com/google/%{short_name} +URL: https://github.com/google/guice BuildArch: noarch # ./create-tarball.sh %%{version} @@ -49,75 +46,75 @@ with at least three use cases. When in doubt, we leave it out. We build general functionality which enables you to extend Guice rather than adding every feature to the core framework. -%package -n %{short_name}-parent +%package -n guice-parent Summary: Guice parent POM -%description -n %{short_name}-parent +%description -n guice-parent Guice is a lightweight dependency injection framework for Java 5 and above. This package provides parent POM for Guice modules. -%package -n %{short_name}-assistedinject +%package -n guice-assistedinject Summary: AssistedInject extension module for Guice -%description -n %{short_name}-assistedinject +%description -n guice-assistedinject Guice is a lightweight dependency injection framework for Java 5 and above. This package provides AssistedInject module for Guice. -%package -n %{short_name}-extensions +%package -n guice-extensions Summary: Extensions for Guice -%description -n %{short_name}-extensions +%description -n guice-extensions Guice is a lightweight dependency injection framework for Java 5 and above. This package provides extensions POM for Guice. -%package -n %{short_name}-grapher +%package -n guice-grapher Summary: Grapher extension module for Guice -%description -n %{short_name}-grapher +%description -n guice-grapher Guice is a lightweight dependency injection framework for Java 5 and above. This package provides Grapher module for Guice. -%package -n %{short_name}-jmx +%package -n guice-jmx Summary: JMX extension module for Guice -%description -n %{short_name}-jmx +%description -n guice-jmx Guice is a lightweight dependency injection framework for Java 5 and above. This package provides JMX module for Guice. -%package -n %{short_name}-jndi +%package -n guice-jndi Summary: JNDI extension module for Guice -%description -n %{short_name}-jndi +%description -n guice-jndi Guice is a lightweight dependency injection framework for Java 5 and above. This package provides JNDI module for Guice. -%package -n %{short_name}-multibindings +%package -n guice-multibindings Summary: MultiBindings extension module for Guice -%description -n %{short_name}-multibindings +%description -n guice-multibindings Guice is a lightweight dependency injection framework for Java 5 and above. This package provides MultiBindings module for Guice. -%package -n %{short_name}-servlet +%package -n guice-servlet Summary: Servlet extension module for Guice -%description -n %{short_name}-servlet +%description -n guice-servlet Guice is a lightweight dependency injection framework for Java 5 and above. This package provides Servlet module for Guice. -%package -n %{short_name}-throwingproviders +%package -n guice-throwingproviders Summary: ThrowingProviders extension module for Guice -%description -n %{short_name}-throwingproviders +%description -n guice-throwingproviders Guice is a lightweight dependency injection framework for Java 5 and above. This package provides ThrowingProviders module for Guice. -%package -n %{short_name}-bom +%package -n guice-bom Summary: Bill of Materials for Guice -%description -n %{short_name}-bom +%description -n guice-bom Guice is a lightweight dependency injection framework for Java 5 and above. This package provides Bill of Materials module for Guice. @@ -177,8 +174,8 @@ This package provides %{summary}. %mvn_package :::no_aop: guice -%mvn_file ":guice-{*}" %{short_name}/guice-@1 -%mvn_file ":guice" %{short_name}/%{name} %{name} +%mvn_file ":guice-{*}" guice/guice-@1 +%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 @@ -187,21 +184,21 @@ This package provides %{summary}. %mvn_install %files -f .mfiles-guice -%dir %{_javadir}/%{short_name} +%dir %{_javadir}/guice -%files -n %{short_name}-parent -f .mfiles-guice-parent +%files -n guice-parent -f .mfiles-guice-parent %doc COPYING -%files -n %{short_name}-assistedinject -f .mfiles-guice-assistedinject -%files -n %{short_name}-extensions -f .mfiles-extensions-parent -%files -n %{short_name}-grapher -f .mfiles-guice-grapher -%files -n %{short_name}-jmx -f .mfiles-guice-jmx -%files -n %{short_name}-jndi -f .mfiles-guice-jndi -%files -n %{short_name}-multibindings -f .mfiles-guice-multibindings -%files -n %{short_name}-servlet -f .mfiles-guice-servlet -%files -n %{short_name}-throwingproviders -f .mfiles-guice-throwingproviders +%files -n guice-assistedinject -f .mfiles-guice-assistedinject +%files -n guice-extensions -f .mfiles-extensions-parent +%files -n guice-grapher -f .mfiles-guice-grapher +%files -n guice-jmx -f .mfiles-guice-jmx +%files -n guice-jndi -f .mfiles-guice-jndi +%files -n guice-multibindings -f .mfiles-guice-multibindings +%files -n guice-servlet -f .mfiles-guice-servlet +%files -n guice-throwingproviders -f .mfiles-guice-throwingproviders -%files -n %{short_name}-bom -f .mfiles-guice-bom +%files -n guice-bom -f .mfiles-guice-bom %files javadoc -f .mfiles-javadoc %doc COPYING From 213d7b9ea727a238415f7716e1fed8f4ecda39d3 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 13:46:44 +0200 Subject: [PATCH 06/57] Use javadoc_package macro --- google-guice.spec | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/google-guice.spec b/google-guice.spec index eb56eec..2856f5d 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -118,14 +118,10 @@ 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 Guice - -%description javadoc -This package provides %{summary}. +%{?javadoc_package} %prep -%setup -q -n %{name}-%{version} +%setup -q # We don't have struts2 in Fedora yet. %pom_disable_module struts2 extensions @@ -184,10 +180,9 @@ This package provides %{summary}. %mvn_install %files -f .mfiles-guice -%dir %{_javadir}/guice %files -n guice-parent -f .mfiles-guice-parent -%doc COPYING +%license COPYING %files -n guice-assistedinject -f .mfiles-guice-assistedinject %files -n guice-extensions -f .mfiles-extensions-parent @@ -200,10 +195,6 @@ This package provides %{summary}. %files -n guice-bom -f .mfiles-guice-bom -%files javadoc -f .mfiles-javadoc -%doc COPYING - - %changelog * Fri May 24 2019 Mikolaj Izdebski - 4.2.2-2 - Mass rebuild for javapackages-tools 201901 From 5385cd49d795ede211c838e084c5a2001264972c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 13:47:53 +0200 Subject: [PATCH 07/57] Declare module package --- google-guice.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/google-guice.spec b/google-guice.spec index 2856f5d..846508b 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -118,6 +118,7 @@ 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. +%{?module_package} %{?javadoc_package} %prep @@ -179,7 +180,7 @@ and above. This package provides Bill of Materials module for Guice. %install %mvn_install -%files -f .mfiles-guice +%files -n %{?module_prefix}%{name} -f .mfiles-guice %files -n guice-parent -f .mfiles-guice-parent %license COPYING From f7f59fe46c57b820b36ef8475ebbfec32f4f3489 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 13:48:54 +0200 Subject: [PATCH 08/57] Namespace buildrequires --- google-guice.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/google-guice.spec b/google-guice.spec index 846508b..b63802f 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -11,10 +11,10 @@ Source0: %{name}-%{version}.tar.xz Source1: create-tarball.sh BuildRequires: maven-local -BuildRequires: mvn(aopalliance:aopalliance) +BuildRequires: %{?module_prefix}mvn(aopalliance:aopalliance) BuildRequires: mvn(cglib:cglib) -BuildRequires: mvn(com.google.guava:guava) -BuildRequires: mvn(javax.inject:javax.inject) +BuildRequires: %{?module_prefix}mvn(com.google.guava:guava) +BuildRequires: %{?module_prefix}mvn(javax.inject:javax.inject) BuildRequires: mvn(javax.servlet:servlet-api) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) From 54302a18638bffa31d2f2986b48bebc2058b259c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:27 +0100 Subject: [PATCH 09/57] Mass rebuild for javapackages-tools 201902 --- google-guice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/google-guice.spec b/google-guice.spec index b63802f..2ec9168 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -1,6 +1,6 @@ Name: google-guice Version: 4.2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Lightweight dependency injection framework for Java 5 and above License: ASL 2.0 URL: https://github.com/google/guice @@ -197,6 +197,9 @@ and above. This package provides Bill of Materials module for Guice. %files -n guice-bom -f .mfiles-guice-bom %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 4.2.2-3 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 4.2.2-2 - Mass rebuild for javapackages-tools 201901 From 6c1095e90bac813cb72e3ab54fbf7e1a2bfa68e6 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 25 Jan 2020 14:40:08 +0100 Subject: [PATCH 10/57] Build with OpenJDK 8 --- google-guice.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/google-guice.spec b/google-guice.spec index 2ec9168..1175a32 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -1,6 +1,6 @@ Name: google-guice Version: 4.2.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Lightweight dependency injection framework for Java 5 and above License: ASL 2.0 URL: https://github.com/google/guice @@ -10,7 +10,7 @@ BuildArch: noarch Source0: %{name}-%{version}.tar.xz Source1: create-tarball.sh -BuildRequires: maven-local +BuildRequires: maven-local-openjdk8 BuildRequires: %{?module_prefix}mvn(aopalliance:aopalliance) BuildRequires: mvn(cglib:cglib) BuildRequires: %{?module_prefix}mvn(com.google.guava:guava) @@ -197,6 +197,9 @@ and above. This package provides Bill of Materials module for Guice. %files -n guice-bom -f .mfiles-guice-bom %changelog +* Sat Jan 25 2020 Mikolaj Izdebski - 4.2.2-4 +- Build with OpenJDK 8 + * Tue Nov 05 2019 Mikolaj Izdebski - 4.2.2-3 - Mass rebuild for javapackages-tools 201902 From 8d2149f83e692a2a7d99916a80464f41e42d35d9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 16 May 2020 19:48:52 +0200 Subject: [PATCH 11/57] Disable building of AOP version --- google-guice.spec | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/google-guice.spec b/google-guice.spec index 1175a32..32b8153 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -11,17 +11,14 @@ Source0: %{name}-%{version}.tar.xz Source1: create-tarball.sh BuildRequires: maven-local-openjdk8 -BuildRequires: %{?module_prefix}mvn(aopalliance:aopalliance) -BuildRequires: mvn(cglib:cglib) +BuildRequires: mvn(com.google.code.findbugs:jsr305) BuildRequires: %{?module_prefix}mvn(com.google.guava:guava) -BuildRequires: %{?module_prefix}mvn(javax.inject:javax.inject) +BuildRequires: mvn(javax.inject:javax.inject) BuildRequires: mvn(javax.servlet:servlet-api) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) -BuildRequires: mvn(org.ow2.asm:asm) -BuildRequires: mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.sonatype.plugins:munge-maven-plugin) # xmvn-builddep misses this: BuildRequires: mvn(org.apache:apache-jar-resource-bundle) @@ -150,7 +147,7 @@ and above. This package provides Bill of Materials module for Guice. # remove test dependency to make sure we don't produce requires # see #1007498 %pom_remove_dep :guava-testlib extensions -%pom_xpath_remove "pom:dependency[pom:classifier[text()='tests']]" extensions +%pom_xpath_remove "pom:dependency[pom:classifier='tests']" extensions %pom_remove_parent %pom_set_parent com.google.inject:guice-parent:%{version} jdk8-tests @@ -166,10 +163,21 @@ and above. This package provides Bill of Materials module for Guice. %pom_disable_module testlib extensions +%pom_remove_dep :aopalliance core +%pom_remove_dep :asm core +%pom_remove_dep :cglib core +%pom_xpath_remove "pom:plugin[pom:artifactId='maven-jar-plugin']/pom:configuration" +%pom_xpath_remove "pom:plugin[pom:artifactId='maven-jar-plugin']/pom:executions" +%pom_xpath_set "pom:plugin[pom:artifactId='munge-maven-plugin']/pom:executions/pom:execution/pom:phase" generate-sources core +%pom_xpath_set "pom:plugin[pom:artifactId='munge-maven-plugin']/pom:executions/pom:execution/pom:goals/pom:goal" munge core + +%pom_xpath_inject "pom:dependency[pom:artifactId='guice']" "provided" extensions + %build %mvn_alias "com.google.inject.extensions:" "org.sonatype.sisu.inject:" %mvn_package :::no_aop: guice +%mvn_package :guice:jar:{}: __noinstall %mvn_file ":guice-{*}" guice/guice-@1 %mvn_file ":guice" guice/%{name} %{name} From 39157b9cbbfaa0d09ca00d5ff13e1a7b6638f423 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 20 Jul 2020 17:27:55 +0200 Subject: [PATCH 12/57] Fix BR on atinject --- google-guice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-guice.spec b/google-guice.spec index 32b8153..077253b 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -13,7 +13,7 @@ Source1: create-tarball.sh BuildRequires: maven-local-openjdk8 BuildRequires: mvn(com.google.code.findbugs:jsr305) BuildRequires: %{?module_prefix}mvn(com.google.guava:guava) -BuildRequires: mvn(javax.inject:javax.inject) +BuildRequires: %{?module_prefix}mvn(javax.inject:javax.inject) BuildRequires: mvn(javax.servlet:servlet-api) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) From 92c4d023c1e2ee4672b34c4cde74fdf4bab10e1a Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 18 Sep 2020 13:51:19 +0200 Subject: [PATCH 13/57] Update to upstream version 4.2.3 --- .gitignore | 1 + google-guice.spec | 9 +++++---- sources | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 84ad8ee..cdd54f6 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /google-guice-4.0.tar.xz /google-guice-4.1.tar.xz /google-guice-4.2.2.tar.xz +/google-guice-4.2.3.tar.xz diff --git a/google-guice.spec b/google-guice.spec index 077253b..a20652e 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -1,6 +1,6 @@ Name: google-guice -Version: 4.2.2 -Release: 4%{?dist} +Version: 4.2.3 +Release: 1%{?dist} Summary: Lightweight dependency injection framework for Java 5 and above License: ASL 2.0 URL: https://github.com/google/guice @@ -23,7 +23,6 @@ BuildRequires: mvn(org.sonatype.plugins:munge-maven-plugin) # xmvn-builddep misses this: BuildRequires: mvn(org.apache:apache-jar-resource-bundle) - %description Put simply, Guice alleviates the need for factories and the use of new in your Java code. Think of Guice's @Inject as the new new. You will @@ -100,7 +99,6 @@ Summary: Servlet extension module for Guice Guice is a lightweight dependency injection framework for Java 5 and above. This package provides Servlet module for Guice. - %package -n guice-throwingproviders Summary: ThrowingProviders extension module for Guice @@ -205,6 +203,9 @@ and above. This package provides Bill of Materials module for Guice. %files -n guice-bom -f .mfiles-guice-bom %changelog +* Fri Sep 18 2020 Marian Koncek - 4.2.3-1 +- Update to upstream version 4.2.3 + * Sat Jan 25 2020 Mikolaj Izdebski - 4.2.2-4 - Build with OpenJDK 8 diff --git a/sources b/sources index 40113dc..6f2c506 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (google-guice-4.2.2.tar.xz) = 2ab60fe0ff277f0f2be5613b453ffe014bdb0ad08f88beb8698d7d93bd9d6d915e0f5eeaf5b3d3617439c48e44a4b850f1e48d9e82c070618fead00ccb482cb4 +SHA512 (google-guice-4.2.3.tar.xz) = 289eb5c68e28526bfc75b5a9fcbef2c3b722afd49b2268cd62d86fe327d6c748fa3241ccf8ae8a34843817f4a78ec0335b6cefd3834a747b66d5232f18477484 From 33ad00b3d46dd697e8832c173e7c66af234b1c94 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 14/57] Conditionalize buildrequires in bootstrap mode --- google-guice.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/google-guice.spec b/google-guice.spec index a20652e..2d7f313 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: google-guice Version: 4.2.3 Release: 1%{?dist} @@ -11,6 +13,9 @@ Source0: %{name}-%{version}.tar.xz Source1: create-tarball.sh BuildRequires: maven-local-openjdk8 +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(com.google.code.findbugs:jsr305) BuildRequires: %{?module_prefix}mvn(com.google.guava:guava) BuildRequires: %{?module_prefix}mvn(javax.inject:javax.inject) @@ -20,8 +25,11 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.sonatype.plugins:munge-maven-plugin) +%endif # xmvn-builddep misses this: +%if %{without bootstrap} BuildRequires: mvn(org.apache:apache-jar-resource-bundle) +%endif %description Put simply, Guice alleviates the need for factories and the use of new From 22b31510bd89645b3ac60382d1508372f190afd5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 15/57] Turn off bootstrap mode by default --- google-guice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-guice.spec b/google-guice.spec index 2d7f313..6bea0de 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: google-guice Version: 4.2.3 From b42a690d8ae32276835538635b13bc1a0184f9e0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 15:49:43 +0200 Subject: [PATCH 16/57] Bootstrap build --- google-guice.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/google-guice.spec b/google-guice.spec index fdc5335..57d017d 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -1,8 +1,8 @@ -%bcond_with bootstrap +%bcond_without bootstrap Name: google-guice Version: 4.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Lightweight dependency injection framework for Java 5 and above License: ASL 2.0 URL: https://github.com/google/guice @@ -209,6 +209,9 @@ and above. This package provides Bill of Materials module for Guice. %files -n guice-bom -f .mfiles-guice-bom %changelog +* Mon May 17 2021 Mikolaj Izdebski - 4.2.3-2 +- Bootstrap build + * Tue Jan 26 2021 Fedora Release Engineering - 4.2.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 2a10c8b31b3df02bdd23064698b4beb5e138dc80 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 18:01:42 +0200 Subject: [PATCH 17/57] Non-bootstrap build --- google-guice.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/google-guice.spec b/google-guice.spec index 57d017d..e854221 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: google-guice Version: 4.2.3 @@ -211,6 +211,7 @@ and above. This package provides Bill of Materials module for Guice. %changelog * Mon May 17 2021 Mikolaj Izdebski - 4.2.3-2 - Bootstrap build +- Non-bootstrap build * Tue Jan 26 2021 Fedora Release Engineering - 4.2.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From a5fb7688394313ab705d08c1e1034f905a2a9ed4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 20:47:44 +0200 Subject: [PATCH 18/57] Bump release --- google-guice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/google-guice.spec b/google-guice.spec index e854221..25574e6 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -2,7 +2,7 @@ Name: google-guice Version: 4.2.3 -Release: 2%{?dist} +Release: 5%{?dist} Summary: Lightweight dependency injection framework for Java 5 and above License: ASL 2.0 URL: https://github.com/google/guice @@ -209,6 +209,9 @@ and above. This package provides Bill of Materials module for Guice. %files -n guice-bom -f .mfiles-guice-bom %changelog +* Mon May 17 2021 Mikolaj Izdebski - 4.2.3-5 +- Bump release + * Mon May 17 2021 Mikolaj Izdebski - 4.2.3-2 - Bootstrap build - Non-bootstrap build From a74e611e06504a7143178c649e1e0e5fcd25c8e5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 06:54:25 +0000 Subject: [PATCH 19/57] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- google-guice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/google-guice.spec b/google-guice.spec index 25574e6..1fbfe64 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -2,7 +2,7 @@ Name: google-guice Version: 4.2.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Lightweight dependency injection framework for Java 5 and above License: ASL 2.0 URL: https://github.com/google/guice @@ -209,6 +209,9 @@ and above. This package provides Bill of Materials module for Guice. %files -n guice-bom -f .mfiles-guice-bom %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 4.2.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon May 17 2021 Mikolaj Izdebski - 4.2.3-5 - Bump release From 27e95a2971624b9caafc84ece9cf2ed29366f948 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 11:34:44 +0000 Subject: [PATCH 20/57] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- google-guice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/google-guice.spec b/google-guice.spec index 1fbfe64..d2564da 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -2,7 +2,7 @@ Name: google-guice Version: 4.2.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Lightweight dependency injection framework for Java 5 and above License: ASL 2.0 URL: https://github.com/google/guice @@ -209,6 +209,9 @@ and above. This package provides Bill of Materials module for Guice. %files -n guice-bom -f .mfiles-guice-bom %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 4.2.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 4.2.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 6d1e045c679879f5667ac8f84634f1234189e337 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 20:50:03 +0100 Subject: [PATCH 21/57] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- google-guice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/google-guice.spec b/google-guice.spec index d2564da..4e7e976 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -2,7 +2,7 @@ Name: google-guice Version: 4.2.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Lightweight dependency injection framework for Java 5 and above License: ASL 2.0 URL: https://github.com/google/guice @@ -209,6 +209,9 @@ and above. This package provides Bill of Materials module for Guice. %files -n guice-bom -f .mfiles-guice-bom %changelog +* Sat Feb 05 2022 Jiri Vanek - 4.2.3-8 +- Rebuilt for java-17-openjdk as system jdk + * Thu Jan 20 2022 Fedora Release Engineering - 4.2.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 641e245d05d9bc7eabeca4979e5bee12ad3b3939 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 12 May 2022 22:33:24 +0200 Subject: [PATCH 22/57] Add ExclusiveArch: %{java_arches} noarch See: https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- google-guice.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/google-guice.spec b/google-guice.spec index 4e7e976..49b8905 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -7,6 +7,7 @@ Summary: Lightweight dependency injection framework for Java 5 and above License: ASL 2.0 URL: https://github.com/google/guice BuildArch: noarch +ExclusiveArch: %{java_arches} noarch # ./create-tarball.sh %%{version} Source0: %{name}-%{version}.tar.xz From 60a815f056f5473582b86fed252a8dbacf0b2617 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 Jun 2022 08:03:17 +0200 Subject: [PATCH 23/57] Update build-requires in bootstrap mode --- google-guice.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/google-guice.spec b/google-guice.spec index 49b8905..da49ebe 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -13,10 +13,10 @@ ExclusiveArch: %{java_arches} noarch Source0: %{name}-%{version}.tar.xz Source1: create-tarball.sh -BuildRequires: maven-local-openjdk8 %if %{with bootstrap} -BuildRequires: javapackages-bootstrap +BuildRequires: javapackages-bootstrap-openjdk8 %else +BuildRequires: maven-local-openjdk8 BuildRequires: mvn(com.google.code.findbugs:jsr305) BuildRequires: %{?module_prefix}mvn(com.google.guava:guava) BuildRequires: %{?module_prefix}mvn(javax.inject:javax.inject) From f3e42b683e937e11bd0409f14704898e54cfa845 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 12:46:56 +0000 Subject: [PATCH 24/57] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- google-guice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/google-guice.spec b/google-guice.spec index da49ebe..c797e88 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -2,7 +2,7 @@ Name: google-guice Version: 4.2.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Lightweight dependency injection framework for Java 5 and above License: ASL 2.0 URL: https://github.com/google/guice @@ -210,6 +210,9 @@ and above. This package provides Bill of Materials module for Guice. %files -n guice-bom -f .mfiles-guice-bom %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 4.2.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Feb 05 2022 Jiri Vanek - 4.2.3-8 - Rebuilt for java-17-openjdk as system jdk From 643dc2307b815e033d9bc38abe23f8e66a4265f3 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Aug 2022 08:36:51 +0200 Subject: [PATCH 25/57] 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 93464dac2f43eae3c02e9535671b27907470dcd3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 11:17:29 +0000 Subject: [PATCH 26/57] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- google-guice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/google-guice.spec b/google-guice.spec index c797e88..1a74577 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -2,7 +2,7 @@ Name: google-guice Version: 4.2.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Lightweight dependency injection framework for Java 5 and above License: ASL 2.0 URL: https://github.com/google/guice @@ -210,6 +210,9 @@ and above. This package provides Bill of Materials module for Guice. %files -n guice-bom -f .mfiles-guice-bom %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 4.2.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 4.2.3-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From b8772dbc8dd71890431054815b4ff096adae5c64 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 21 Mar 2023 08:06:41 +0100 Subject: [PATCH 27/57] Update to upstream version 5.1.0 --- .gitignore | 1 + create-tarball.sh | 2 +- google-guice.spec | 64 +++++++++++++++++++++-------------------------- sources | 2 +- 4 files changed, 32 insertions(+), 37 deletions(-) diff --git a/.gitignore b/.gitignore index 4e1334d..6ec9199 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /google-guice-4.1.tar.xz /google-guice-4.2.2.tar.xz /google-guice-4.2.3.tar.xz +/google-guice-5.1.0.tar.xz diff --git a/create-tarball.sh b/create-tarball.sh index 5220cf9..d2b2f58 100755 --- a/create-tarball.sh +++ b/create-tarball.sh @@ -2,7 +2,7 @@ set -e -x test $# -eq 1 test ! -d guice -git clone git://github.com/google/guice.git +git clone https://github.com/google/guice.git cd ./guice git checkout ${1} git branch unbundled-${1} diff --git a/google-guice.spec b/google-guice.spec index 1a74577..eec7ddf 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: google-guice -Version: 4.2.3 -Release: 10%{?dist} +Version: 5.1.0 +Release: 1%{?dist} Summary: Lightweight dependency injection framework for Java 5 and above License: ASL 2.0 URL: https://github.com/google/guice @@ -13,25 +13,28 @@ ExclusiveArch: %{java_arches} noarch Source0: %{name}-%{version}.tar.xz Source1: create-tarball.sh +BuildRequires: javapackages-extra %if %{with bootstrap} BuildRequires: javapackages-bootstrap-openjdk8 %else BuildRequires: maven-local-openjdk8 +BuildRequires: mvn(aopalliance:aopalliance) BuildRequires: mvn(com.google.code.findbugs:jsr305) -BuildRequires: %{?module_prefix}mvn(com.google.guava:guava) -BuildRequires: %{?module_prefix}mvn(javax.inject:javax.inject) +BuildRequires: mvn(com.google.guava:guava) +BuildRequires: mvn(javax.inject:javax.inject) BuildRequires: mvn(javax.servlet:servlet-api) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) -BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) -BuildRequires: mvn(org.sonatype.plugins:munge-maven-plugin) +BuildRequires: mvn(org.ow2.asm:asm) %endif # xmvn-builddep misses this: %if %{without bootstrap} BuildRequires: mvn(org.apache:apache-jar-resource-bundle) %endif +Obsoletes: guice-multibindings < 5 + %description Put simply, Guice alleviates the need for factories and the use of new in your Java code. Think of Guice's @Inject as the new new. You will @@ -93,13 +96,6 @@ Summary: JNDI extension module for Guice Guice is a lightweight dependency injection framework for Java 5 and above. This package provides JNDI module for Guice. -%package -n guice-multibindings -Summary: MultiBindings extension module for Guice - -%description -n guice-multibindings -Guice is a lightweight dependency injection framework for Java 5 -and above. This package provides MultiBindings module for Guice. - %package -n guice-servlet Summary: Servlet extension module for Guice @@ -126,6 +122,10 @@ and above. This package provides Bill of Materials module for Guice. %prep %setup -q +%java_remove_annotations core/src/ \ + -p ^com.google.common.annotations. \ + -p ^com.google.errorprone.annotations. \ + # We don't have struts2 in Fedora yet. %pom_disable_module struts2 extensions # Android-specific extension @@ -155,45 +155,37 @@ and above. This package provides Bill of Materials module for Guice. %pom_xpath_remove "pom:dependency[pom:classifier='tests']" extensions %pom_remove_parent -%pom_set_parent com.google.inject:guice-parent:%{version} jdk8-tests %pom_disable_module persist extensions %pom_disable_module spring extensions - -%pom_disable_module jdk8-tests - -# Require a newer compiler -%pom_xpath_set "pom:build/pom:pluginManagement/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:source" "1.8" -%pom_xpath_set "pom:build/pom:pluginManagement/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:target" "1.8" - %pom_disable_module testlib extensions -%pom_remove_dep :aopalliance core -%pom_remove_dep :asm core -%pom_remove_dep :cglib core -%pom_xpath_remove "pom:plugin[pom:artifactId='maven-jar-plugin']/pom:configuration" -%pom_xpath_remove "pom:plugin[pom:artifactId='maven-jar-plugin']/pom:executions" -%pom_xpath_set "pom:plugin[pom:artifactId='munge-maven-plugin']/pom:executions/pom:execution/pom:phase" generate-sources core -%pom_xpath_set "pom:plugin[pom:artifactId='munge-maven-plugin']/pom:executions/pom:execution/pom:goals/pom:goal" munge core +#%pom_remove_dep :aopalliance core +#%pom_remove_dep :asm core +#%pom_remove_dep :cglib core +#%pom_xpath_remove "pom:plugin[pom:artifactId='maven-jar-plugin']/pom:configuration" +#%pom_xpath_remove "pom:plugin[pom:artifactId='maven-jar-plugin']/pom:executions" +#%pom_xpath_set "pom:plugin[pom:artifactId='munge-maven-plugin']/pom:executions/pom:execution/pom:phase" generate-sources core +#%pom_xpath_set "pom:plugin[pom:artifactId='munge-maven-plugin']/pom:executions/pom:execution/pom:goals/pom:goal" munge core -%pom_xpath_inject "pom:dependency[pom:artifactId='guice']" "provided" extensions +#%pom_xpath_inject "pom:dependency[pom:artifactId='guice']" "provided" extensions %build -%mvn_alias "com.google.inject.extensions:" "org.sonatype.sisu.inject:" +#%mvn_alias "com.google.inject.extensions:" "org.sonatype.sisu.inject:" -%mvn_package :::no_aop: guice -%mvn_package :guice:jar:{}: __noinstall +#%mvn_package :::no_aop: guice +#%mvn_package :guice:jar:{}: __noinstall %mvn_file ":guice-{*}" guice/guice-@1 %mvn_file ":guice" guice/%{name} %{name} -%mvn_alias ":guice" "org.sonatype.sisu:sisu-guice" +#%mvn_alias ":guice" "org.sonatype.sisu:sisu-guice" # Skip tests because of missing dependency guice-testlib %mvn_build -f -s %install %mvn_install -%files -n %{?module_prefix}%{name} -f .mfiles-guice +%files -f .mfiles-guice %files -n guice-parent -f .mfiles-guice-parent %license COPYING @@ -203,13 +195,15 @@ and above. This package provides Bill of Materials module for Guice. %files -n guice-grapher -f .mfiles-guice-grapher %files -n guice-jmx -f .mfiles-guice-jmx %files -n guice-jndi -f .mfiles-guice-jndi -%files -n guice-multibindings -f .mfiles-guice-multibindings %files -n guice-servlet -f .mfiles-guice-servlet %files -n guice-throwingproviders -f .mfiles-guice-throwingproviders %files -n guice-bom -f .mfiles-guice-bom %changelog +* Tue Mar 21 2023 Mikolaj Izdebski - 5.1.0-1 +- Update to upstream version 5.1.0 + * Thu Jan 19 2023 Fedora Release Engineering - 4.2.3-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 6f2c506..3e1c527 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (google-guice-4.2.3.tar.xz) = 289eb5c68e28526bfc75b5a9fcbef2c3b722afd49b2268cd62d86fe327d6c748fa3241ccf8ae8a34843817f4a78ec0335b6cefd3834a747b66d5232f18477484 +SHA512 (google-guice-5.1.0.tar.xz) = 17758f65a56e488579c371d89a9a34c7a4a752171331ec375b4d473f781cadc971848723c00d375205ab0e3797b5a4e83f7a8bc3ed30e1ab8f6321bbc5f85c8c From 1cf539fd9783eb8ec66a02276b42831673bb6f77 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 31 Mar 2023 20:12:16 +0200 Subject: [PATCH 28/57] Rebuild with no changes --- google-guice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/google-guice.spec b/google-guice.spec index eec7ddf..c32d77f 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -2,7 +2,7 @@ Name: google-guice Version: 5.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Lightweight dependency injection framework for Java 5 and above License: ASL 2.0 URL: https://github.com/google/guice @@ -201,6 +201,9 @@ and above. This package provides Bill of Materials module for Guice. %files -n guice-bom -f .mfiles-guice-bom %changelog +* Fri Mar 31 2023 Mikolaj Izdebski - 5.1.0-2 +- Rebuild with no changes + * Tue Mar 21 2023 Mikolaj Izdebski - 5.1.0-1 - Update to upstream version 5.1.0 From 62f10400e9fb0f84808fb1f2b1bd24161b063436 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 05:17:27 +0000 Subject: [PATCH 29/57] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- google-guice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/google-guice.spec b/google-guice.spec index c32d77f..092e2a3 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -2,7 +2,7 @@ Name: google-guice Version: 5.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Lightweight dependency injection framework for Java 5 and above License: ASL 2.0 URL: https://github.com/google/guice @@ -201,6 +201,9 @@ and above. This package provides Bill of Materials module for Guice. %files -n guice-bom -f .mfiles-guice-bom %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 5.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Mar 31 2023 Mikolaj Izdebski - 5.1.0-2 - Rebuild with no changes From 9a45dbe0d5ac7300c8aa329a198e508895a17886 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 15 Aug 2023 10:22:24 +0200 Subject: [PATCH 30/57] Build with default JDK 17 --- google-guice.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/google-guice.spec b/google-guice.spec index 092e2a3..b66d662 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -2,7 +2,7 @@ Name: google-guice Version: 5.1.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Lightweight dependency injection framework for Java 5 and above License: ASL 2.0 URL: https://github.com/google/guice @@ -15,9 +15,9 @@ Source1: create-tarball.sh BuildRequires: javapackages-extra %if %{with bootstrap} -BuildRequires: javapackages-bootstrap-openjdk8 +BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local-openjdk8 +BuildRequires: maven-local BuildRequires: mvn(aopalliance:aopalliance) BuildRequires: mvn(com.google.code.findbugs:jsr305) BuildRequires: mvn(com.google.guava:guava) @@ -201,6 +201,9 @@ and above. This package provides Bill of Materials module for Guice. %files -n guice-bom -f .mfiles-guice-bom %changelog +* Tue Aug 15 2023 Mikolaj Izdebski - 5.1.0-4 +- Build with default JDK 17 + * Thu Jul 20 2023 Fedora Release Engineering - 5.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 4b528ccd45169b946316301ce4ed7690c9bd7179 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 17 Aug 2023 15:58:52 +0200 Subject: [PATCH 31/57] Bootstrap build --- google-guice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-guice.spec b/google-guice.spec index b66d662..7b7dbd6 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -1,4 +1,4 @@ -%bcond_with bootstrap +%bcond_without bootstrap Name: google-guice Version: 5.1.0 From 9f9f25ef26f936507b051859e542452832ed3e8c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 17 Aug 2023 16:22:35 +0200 Subject: [PATCH 32/57] Non-bootstrap build --- google-guice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-guice.spec b/google-guice.spec index 7b7dbd6..b66d662 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: google-guice Version: 5.1.0 From 72756f0f065b05c5d5b7b165f2a40b28772ed1ad Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 30 Aug 2023 07:00:21 +0200 Subject: [PATCH 33/57] Build with Jurand instead of deprecated javapackages-extra --- google-guice.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/google-guice.spec b/google-guice.spec index b66d662..55098ca 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -2,7 +2,7 @@ Name: google-guice Version: 5.1.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Lightweight dependency injection framework for Java 5 and above License: ASL 2.0 URL: https://github.com/google/guice @@ -13,7 +13,6 @@ ExclusiveArch: %{java_arches} noarch Source0: %{name}-%{version}.tar.xz Source1: create-tarball.sh -BuildRequires: javapackages-extra %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else @@ -32,6 +31,7 @@ BuildRequires: mvn(org.ow2.asm:asm) %if %{without bootstrap} BuildRequires: mvn(org.apache:apache-jar-resource-bundle) %endif +BuildRequires: jurand Obsoletes: guice-multibindings < 5 @@ -201,6 +201,9 @@ and above. This package provides Bill of Materials module for Guice. %files -n guice-bom -f .mfiles-guice-bom %changelog +* Wed Aug 30 2023 Mikolaj Izdebski - 5.1.0-5 +- Build with Jurand instead of deprecated javapackages-extra + * Tue Aug 15 2023 Mikolaj Izdebski - 5.1.0-4 - Build with default JDK 17 From 3f44a346ed396f0c4cab1b9929f29e17d784f7e4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 1 Sep 2023 13:20:32 +0200 Subject: [PATCH 34/57] Convert License tag to SPDX format Related: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 --- google-guice.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/google-guice.spec b/google-guice.spec index 55098ca..7b6f8e5 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -2,9 +2,9 @@ Name: google-guice Version: 5.1.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Lightweight dependency injection framework for Java 5 and above -License: ASL 2.0 +License: Apache-2.0 URL: https://github.com/google/guice BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -201,6 +201,9 @@ and above. This package provides Bill of Materials module for Guice. %files -n guice-bom -f .mfiles-guice-bom %changelog +* Fri Sep 01 2023 Mikolaj Izdebski - 5.1.0-6 +- Convert License tag to SPDX format + * Wed Aug 30 2023 Mikolaj Izdebski - 5.1.0-5 - Build with Jurand instead of deprecated javapackages-extra From abbbf9dbb0aebfa37e2eda0db7db076d89a8ba95 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 20 Sep 2023 18:07:17 +0200 Subject: [PATCH 35/57] Rebuild to regenerate auto-Requires on java --- google-guice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/google-guice.spec b/google-guice.spec index 7b6f8e5..68c1ce4 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -2,7 +2,7 @@ Name: google-guice Version: 5.1.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Lightweight dependency injection framework for Java 5 and above License: Apache-2.0 URL: https://github.com/google/guice @@ -201,6 +201,9 @@ and above. This package provides Bill of Materials module for Guice. %files -n guice-bom -f .mfiles-guice-bom %changelog +* Wed Sep 20 2023 Mikolaj Izdebski - 5.1.0-7 +- Rebuild to regenerate auto-Requires on java + * Fri Sep 01 2023 Mikolaj Izdebski - 5.1.0-6 - Convert License tag to SPDX format From 95c33010bf578ddf1e812198147410a1c6b4af6a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 26 Oct 2023 07:33:07 +0200 Subject: [PATCH 36/57] 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 5f1779e7f209fe82c99224fcda6f62408870adc6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jan 2024 21:16:01 +0000 Subject: [PATCH 37/57] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- google-guice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/google-guice.spec b/google-guice.spec index 68c1ce4..d80e2b3 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -2,7 +2,7 @@ Name: google-guice Version: 5.1.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Lightweight dependency injection framework for Java 5 and above License: Apache-2.0 URL: https://github.com/google/guice @@ -201,6 +201,9 @@ and above. This package provides Bill of Materials module for Guice. %files -n guice-bom -f .mfiles-guice-bom %changelog +* Sat Jan 20 2024 Fedora Release Engineering - 5.1.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Sep 20 2023 Mikolaj Izdebski - 5.1.0-7 - Rebuild to regenerate auto-Requires on java From 2c72fa936a5a58f1f385895d734812fb248c5b47 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 20:46:25 +0000 Subject: [PATCH 38/57] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- google-guice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/google-guice.spec b/google-guice.spec index d80e2b3..d19c77e 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -2,7 +2,7 @@ Name: google-guice Version: 5.1.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Lightweight dependency injection framework for Java 5 and above License: Apache-2.0 URL: https://github.com/google/guice @@ -201,6 +201,9 @@ and above. This package provides Bill of Materials module for Guice. %files -n guice-bom -f .mfiles-guice-bom %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 5.1.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jan 20 2024 Fedora Release Engineering - 5.1.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f10848304ee7fdc5ccf3544508ff367a7a1ed687 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 23 Feb 2024 14:19:43 +0100 Subject: [PATCH 39/57] 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 --- google-guice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/google-guice.spec b/google-guice.spec index d19c77e..c68805a 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -2,7 +2,7 @@ Name: google-guice Version: 5.1.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Lightweight dependency injection framework for Java 5 and above License: Apache-2.0 URL: https://github.com/google/guice @@ -201,6 +201,9 @@ and above. This package provides Bill of Materials module for Guice. %files -n guice-bom -f .mfiles-guice-bom %changelog +* Fri Feb 23 2024 Jiri Vanek - 5.1.0-10 +- bump of release for for java-21-openjdk as system jdk + * Wed Jan 24 2024 Fedora Release Engineering - 5.1.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 95db6cf7fc190880f0e9af6df17ba25a2959953e Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 15:36:15 +0100 Subject: [PATCH 40/57] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- google-guice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/google-guice.spec b/google-guice.spec index c68805a..839c8f5 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -2,7 +2,7 @@ Name: google-guice Version: 5.1.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Lightweight dependency injection framework for Java 5 and above License: Apache-2.0 URL: https://github.com/google/guice @@ -201,6 +201,9 @@ and above. This package provides Bill of Materials module for Guice. %files -n guice-bom -f .mfiles-guice-bom %changelog +* Tue Feb 27 2024 Jiri Vanek - 5.1.0-11 +- Rebuilt for java-21-openjdk as system jdk + * Fri Feb 23 2024 Jiri Vanek - 5.1.0-10 - bump of release for for java-21-openjdk as system jdk From 7da80032ead8e1e4d927f2ad99834db93e8935af Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 08:20:07 +0000 Subject: [PATCH 41/57] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- google-guice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/google-guice.spec b/google-guice.spec index 839c8f5..ebc7acb 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -2,7 +2,7 @@ Name: google-guice Version: 5.1.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Lightweight dependency injection framework for Java 5 and above License: Apache-2.0 URL: https://github.com/google/guice @@ -201,6 +201,9 @@ and above. This package provides Bill of Materials module for Guice. %files -n guice-bom -f .mfiles-guice-bom %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 5.1.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Feb 27 2024 Jiri Vanek - 5.1.0-11 - Rebuilt for java-21-openjdk as system jdk From ed8d4034bde2a52f2776a384d5d07bb5afead07c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 30 Jul 2024 19:37:07 +0200 Subject: [PATCH 42/57] Drop unneeded Obsoletes --- google-guice.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/google-guice.spec b/google-guice.spec index ebc7acb..4468270 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -2,7 +2,7 @@ Name: google-guice Version: 5.1.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Lightweight dependency injection framework for Java 5 and above License: Apache-2.0 URL: https://github.com/google/guice @@ -33,8 +33,6 @@ BuildRequires: mvn(org.apache:apache-jar-resource-bundle) %endif BuildRequires: jurand -Obsoletes: guice-multibindings < 5 - %description Put simply, Guice alleviates the need for factories and the use of new in your Java code. Think of Guice's @Inject as the new new. You will @@ -201,6 +199,9 @@ and above. This package provides Bill of Materials module for Guice. %files -n guice-bom -f .mfiles-guice-bom %changelog +* Tue Jul 30 2024 Mikolaj Izdebski - 5.1.0-13 +- Drop unneeded Obsoletes + * Thu Jul 18 2024 Fedora Release Engineering - 5.1.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 262c2880be0f0550a56eba6aff015817caa1b69a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:29 +0200 Subject: [PATCH 43/57] 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 5beb5de09d2212c64f50ffe9a2987d616df3d0b4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:56 +0200 Subject: [PATCH 44/57] Switch from %setup to %autosetup --- google-guice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-guice.spec b/google-guice.spec index 4468270..95cded8 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -118,7 +118,7 @@ and above. This package provides Bill of Materials module for Guice. %{?javadoc_package} %prep -%setup -q +%autosetup -p1 -C %java_remove_annotations core/src/ \ -p ^com.google.common.annotations. \ From 3d952fb483aadf7ca855b001d12d1738639d0a20 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:04 +0200 Subject: [PATCH 45/57] Convert to %autorelease and %autochangelog --- changelog | 313 +++++++++++++++++++++++++++++++++++++++++++++ google-guice.spec | 316 +--------------------------------------------- 2 files changed, 315 insertions(+), 314 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..06ff0e2 --- /dev/null +++ b/changelog @@ -0,0 +1,313 @@ +* Tue Jul 30 2024 Mikolaj Izdebski - 5.1.0-13 +- Drop unneeded Obsoletes + +* Thu Jul 18 2024 Fedora Release Engineering - 5.1.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 5.1.0-11 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 5.1.0-10 +- bump of release for for java-21-openjdk as system jdk + +* Wed Jan 24 2024 Fedora Release Engineering - 5.1.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jan 20 2024 Fedora Release Engineering - 5.1.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Sep 20 2023 Mikolaj Izdebski - 5.1.0-7 +- Rebuild to regenerate auto-Requires on java + +* Fri Sep 01 2023 Mikolaj Izdebski - 5.1.0-6 +- Convert License tag to SPDX format + +* Wed Aug 30 2023 Mikolaj Izdebski - 5.1.0-5 +- Build with Jurand instead of deprecated javapackages-extra + +* Tue Aug 15 2023 Mikolaj Izdebski - 5.1.0-4 +- Build with default JDK 17 + +* Thu Jul 20 2023 Fedora Release Engineering - 5.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Mar 31 2023 Mikolaj Izdebski - 5.1.0-2 +- Rebuild with no changes + +* Tue Mar 21 2023 Mikolaj Izdebski - 5.1.0-1 +- Update to upstream version 5.1.0 + +* Thu Jan 19 2023 Fedora Release Engineering - 4.2.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 4.2.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 4.2.3-8 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 4.2.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 4.2.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 4.2.3-5 +- Bump release + +* Mon May 17 2021 Mikolaj Izdebski - 4.2.3-2 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 4.2.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Sep 18 2020 Marian Koncek - 4.2.3-1 +- Update to upstream version 4.2.3 + +* Tue Jul 28 2020 Fedora Release Engineering - 4.2.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 4.2.3-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Fri May 08 2020 Fabio Valentini - 4.2.3-1 +- Update to version 4.2.3. + +* Wed Jan 29 2020 Fedora Release Engineering - 4.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jan 25 2020 Mikolaj Izdebski - 4.2.2-4 +- Build with OpenJDK 8 + +* Tue Nov 05 2019 Mikolaj Izdebski - 4.2.2-3 +- Mass rebuild for javapackages-tools 201902 + +* Mon Jul 29 2019 Fabio Valentini - 4.2.2-1 +- Update to version 4.2.2. +- Obsolete guice-testlib. + +* Fri Jul 26 2019 Fabio Valentini - 4.1-16 +- Disable support for spring and JPA. + +* Thu Jul 25 2019 Fedora Release Engineering - 4.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 24 2019 Mikolaj Izdebski - 4.2.2-2 +- Mass rebuild for javapackages-tools 201901 + +* Fri Apr 05 2019 Marian Koncek - 4.2.2-1 +- Update to upstream version 4.2.2 +- Fixes: RHBZ #1563661 + +* Fri Feb 01 2019 Fedora Release Engineering - 4.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Dec 13 2018 Mat Booth - 4.1-13 +- Regenerate OSGi metadata due to ASM 7 + +* Fri Jul 13 2018 Fedora Release Engineering - 4.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Apr 18 2018 Mikolaj Izdebski - 4.1-11 +- Remove legacy Provides + +* Wed Feb 07 2018 Fedora Release Engineering - 4.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Feb 05 2018 Michael Simacek - 4.1-9 +- Use guava20 + +* Mon Oct 02 2017 Mat Booth - 4.1-8 +- Fix OSGi metadata to import cglib and asm, since we are not bundling them with + jarjar + +* Wed Jul 26 2017 Fedora Release Engineering - 4.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Jun 23 2017 Mikolaj Izdebski - 4.1-6 +- Remove unused patches + +* Fri Feb 24 2017 Mikolaj Izdebski - 4.1-5 +- Remove maven-javadoc-plugin from all POMs + +* Thu Feb 23 2017 Mikolaj Izdebski - 4.1-4 +- Add missing BR on apache-resource-bundles + +* Fri Feb 10 2017 Fedora Release Engineering - 4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 1 2017 Mikolaj Izdebski - 4.1-2 +- Introduce build-conditionals for jpa and spring + +* Thu Aug 4 2016 Mikolaj Izdebski - 4.1-1 +- Update to upstream version 4.1 + +* Wed Jun 29 2016 Mikolaj Izdebski - 4.0-6 +- Make aopalliance dependency optional + +* Wed Jun 15 2016 Mikolaj Izdebski - 4.0-5 +- Regenerate build-requires + +* Wed Feb 03 2016 Fedora Release Engineering - 4.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Jan 12 2016 Mikolaj Izdebski - 4.0-3 +- Install BOM even when without extensions + +* Wed Jun 17 2015 Fedora Release Engineering - 4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu May 14 2015 Mikolaj Izdebski - 4.0-1 +- Update to upstream version 4.0 + +* Mon Apr 27 2015 Mikolaj Izdebski - 3.2.6-1 +- Update to upstream version 3.2.6 + +* Fri Mar 6 2015 Alexander Kurtakov 3.2.5-2 +- Drop gone tomcat-servlet-3.0-api BR, builds fine without it. + +* Fri Jan 23 2015 Michael Simacek - 3.2.5-1 +- Update to upstream version 3.2.5 + +* Mon Sep 29 2014 Mikolaj Izdebski - 3.2.4-1 +- Update to upstream version 3.2.4 + +* Fri Jun 6 2014 Mikolaj Izdebski - 3.2.2-1 +- Update to upstream version 3.2.2 + +* Wed May 28 2014 Mikolaj Izdebski - 3.2.1-2 +- Rebuild to regenerate Maven auto-requires + +* Wed Apr 16 2014 Mikolaj Izdebski - 3.2.1-1 +- Update to upstream version 3.2.1 +- Add testlib subpackage + +* Tue Mar 4 2014 Mikolaj Izdebski - 3.1.10-3 +- Fix directory ownership + +* Tue Mar 04 2014 Stanislav Ochotnicky - 3.1.10-3 +- Use Requires: java-headless rebuild (#1067528) + +* Wed Feb 19 2014 Mikolaj Izdebski - 3.1.10-2 +- Fix unowned directory + +* Tue Feb 18 2014 Mikolaj Izdebski - 3.1.10-1 +- Update to upstream version 3.1.10 + +* Mon Jan 20 2014 Mikolaj Izdebski - 3.1.9-1 +- Update to upstream version 3.1.9 + +* Mon Nov 11 2013 Mikolaj Izdebski - 3.1.8-1 +- Update to upstream version 3.1.8 + +* Wed Oct 23 2013 Mikolaj Izdebski - 3.1.3-10 +- Rebuild to regenerate broken POMs +- Related: rhbz#1021484 + +* Fri Oct 18 2013 Mikolaj Izdebski - 3.1.3-9 +- Don't force generation of pom.properties + +* Wed Sep 25 2013 Mikolaj Izdebski - 3.1.3-8 +- Install no_aop artifact after javapackages update + +* Thu Sep 12 2013 Stanislav Ochotnicky - 3.1.3-7 +- Remove dependency on tests from runtime +- Related: rhbz#1007498 + +* Tue Sep 10 2013 Mikolaj Izdebski - 3.1.3-6 +- Install no_aop artifact +- Resolves: rhbz#1006491 + +* Wed Sep 4 2013 Mikolaj Izdebski - 3.1.3-5 +- Enable pom.properties +- Resolves: rhbz#1004360 + +* Wed Aug 07 2013 Michal Srb - 3.1.3-4 +- Add create-tarball.sh script to SRPM + +* Sat Aug 03 2013 Fedora Release Engineering - 3.1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Apr 24 2013 Michal Srb - 3.1.3-2 +- Revert update to 3.1.4 (uses asm4) + +* Thu Mar 14 2013 Michal Srb - 3.1.3-1 +- Update to upstream version 3.1.3 +- Remove bundled JARs from tarball + +* Wed Feb 06 2013 Java SIG - 3.1.2-11 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Thu Jan 31 2013 Michal Srb - 3.1.2-10 +- Remove all requires +- Correct usage of xmvn's macros + +* Mon Jan 28 2013 Michal Srb - 3.1.2-9 +- Build with xmvn + +* Fri Nov 16 2012 Mikolaj Izdebski - 3.1.2-8 +- Remove README + +* Fri Nov 16 2012 Mikolaj Izdebski - 3.1.2-7 +- Repackage tarball + +* Fri Nov 9 2012 Mikolaj Izdebski - 3.1.2-6 +- Don't try to build extension modules unless they are needed + +* Fri Nov 9 2012 Mikolaj Izdebski - 3.1.2-5 +- Conditionalize %%install section too + +* Fri Nov 9 2012 Mikolaj Izdebski - 3.1.2-4 +- Conditionally disable extensions + +* Thu Nov 1 2012 Mikolaj Izdebski - 3.1.2-3 +- Update to new add_maven_depmap macro + +* Wed Oct 31 2012 Stanislav Ochotnicky - 3.1.2-2 +- Use new generated maven filelist feature from javapackages-tools + +* Fri Oct 5 2012 Mikolaj Izdebski - 3.1.2-1 +- Complete rewrite of the spec file +- New upstream, to ease future maintenance +- Build with maven instead of ant +- Split into multiple subpackages + +* Thu Jul 19 2012 Fedora Release Engineering - 3.0-0.7.rc2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Feb 9 2012 Stanislav Ochotnicky - 3.0-0.6.rc2 +- Temporary fix for maven buildroots + +* Fri Jan 13 2012 Fedora Release Engineering - 3.0-0.5.rc2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Oct 12 2011 Stanislav Ochotnicky - 3.0-0.4.rc2 +- Build with aqute-bnd (#745176) +- Use new maven macros +- Few packaging tweaks + +* Tue May 24 2011 Stanislav Ochotnicky - 3.0-0.3.rc2 +- Add cglib and atinject to R + +* Thu May 12 2011 Stanislav Ochotnicky - 3.0-0.2.rc2 +- Remove test and missing deps from pom.xml + +* Tue Mar 1 2011 Stanislav Ochotnicky - 3.0-0.1.rc2 +- Update to 3.0rc2 +- Changes according to new guidelines (versionless jars & javadocs) + +* Tue Feb 08 2011 Fedora Release Engineering - 2.0-4.1219svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Oct 14 2010 Stanislav Ochotnicky - 2.0-3.1219svn +- Add java-devel >= 1:1.6.0 to BR + +* Wed Oct 13 2010 Stanislav Ochotnicky - 2.0-2.1219svn +- Moved munge repacking to prep +- Added -Dversion to change generated manifest version +- Removed http part of URL + +* Thu Oct 7 2010 Stanislav Ochotnicky - 2.0-1.1219svn +- Initial version of the package diff --git a/google-guice.spec b/google-guice.spec index 95cded8..2d5d024 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -2,7 +2,7 @@ Name: google-guice Version: 5.1.0 -Release: 13%{?dist} +Release: %autorelease Summary: Lightweight dependency injection framework for Java 5 and above License: Apache-2.0 URL: https://github.com/google/guice @@ -199,316 +199,4 @@ and above. This package provides Bill of Materials module for Guice. %files -n guice-bom -f .mfiles-guice-bom %changelog -* Tue Jul 30 2024 Mikolaj Izdebski - 5.1.0-13 -- Drop unneeded Obsoletes - -* Thu Jul 18 2024 Fedora Release Engineering - 5.1.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Feb 27 2024 Jiri Vanek - 5.1.0-11 -- Rebuilt for java-21-openjdk as system jdk - -* Fri Feb 23 2024 Jiri Vanek - 5.1.0-10 -- bump of release for for java-21-openjdk as system jdk - -* Wed Jan 24 2024 Fedora Release Engineering - 5.1.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jan 20 2024 Fedora Release Engineering - 5.1.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Sep 20 2023 Mikolaj Izdebski - 5.1.0-7 -- Rebuild to regenerate auto-Requires on java - -* Fri Sep 01 2023 Mikolaj Izdebski - 5.1.0-6 -- Convert License tag to SPDX format - -* Wed Aug 30 2023 Mikolaj Izdebski - 5.1.0-5 -- Build with Jurand instead of deprecated javapackages-extra - -* Tue Aug 15 2023 Mikolaj Izdebski - 5.1.0-4 -- Build with default JDK 17 - -* Thu Jul 20 2023 Fedora Release Engineering - 5.1.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Mar 31 2023 Mikolaj Izdebski - 5.1.0-2 -- Rebuild with no changes - -* Tue Mar 21 2023 Mikolaj Izdebski - 5.1.0-1 -- Update to upstream version 5.1.0 - -* Thu Jan 19 2023 Fedora Release Engineering - 4.2.3-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 4.2.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Feb 05 2022 Jiri Vanek - 4.2.3-8 -- Rebuilt for java-17-openjdk as system jdk - -* Thu Jan 20 2022 Fedora Release Engineering - 4.2.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 4.2.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 17 2021 Mikolaj Izdebski - 4.2.3-5 -- Bump release - -* Mon May 17 2021 Mikolaj Izdebski - 4.2.3-2 -- Bootstrap build -- Non-bootstrap build - -* Tue Jan 26 2021 Fedora Release Engineering - 4.2.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Sep 18 2020 Marian Koncek - 4.2.3-1 -- Update to upstream version 4.2.3 - -* Tue Jul 28 2020 Fedora Release Engineering - 4.2.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 10 2020 Jiri Vanek - 4.2.3-2 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Fri May 08 2020 Fabio Valentini - 4.2.3-1 -- Update to version 4.2.3. - -* Wed Jan 29 2020 Fedora Release Engineering - 4.2.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jan 25 2020 Mikolaj Izdebski - 4.2.2-4 -- Build with OpenJDK 8 - -* Tue Nov 05 2019 Mikolaj Izdebski - 4.2.2-3 -- Mass rebuild for javapackages-tools 201902 - -* Mon Jul 29 2019 Fabio Valentini - 4.2.2-1 -- Update to version 4.2.2. -- Obsolete guice-testlib. - -* Fri Jul 26 2019 Fabio Valentini - 4.1-16 -- Disable support for spring and JPA. - -* Thu Jul 25 2019 Fedora Release Engineering - 4.1-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri May 24 2019 Mikolaj Izdebski - 4.2.2-2 -- Mass rebuild for javapackages-tools 201901 - -* Fri Apr 05 2019 Marian Koncek - 4.2.2-1 -- Update to upstream version 4.2.2 -- Fixes: RHBZ #1563661 - -* Fri Feb 01 2019 Fedora Release Engineering - 4.1-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Dec 13 2018 Mat Booth - 4.1-13 -- Regenerate OSGi metadata due to ASM 7 - -* Fri Jul 13 2018 Fedora Release Engineering - 4.1-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Apr 18 2018 Mikolaj Izdebski - 4.1-11 -- Remove legacy Provides - -* Wed Feb 07 2018 Fedora Release Engineering - 4.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Feb 05 2018 Michael Simacek - 4.1-9 -- Use guava20 - -* Mon Oct 02 2017 Mat Booth - 4.1-8 -- Fix OSGi metadata to import cglib and asm, since we are not bundling them with - jarjar - -* Wed Jul 26 2017 Fedora Release Engineering - 4.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Jun 23 2017 Mikolaj Izdebski - 4.1-6 -- Remove unused patches - -* Fri Feb 24 2017 Mikolaj Izdebski - 4.1-5 -- Remove maven-javadoc-plugin from all POMs - -* Thu Feb 23 2017 Mikolaj Izdebski - 4.1-4 -- Add missing BR on apache-resource-bundles - -* Fri Feb 10 2017 Fedora Release Engineering - 4.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 1 2017 Mikolaj Izdebski - 4.1-2 -- Introduce build-conditionals for jpa and spring - -* Thu Aug 4 2016 Mikolaj Izdebski - 4.1-1 -- Update to upstream version 4.1 - -* Wed Jun 29 2016 Mikolaj Izdebski - 4.0-6 -- Make aopalliance dependency optional - -* Wed Jun 15 2016 Mikolaj Izdebski - 4.0-5 -- Regenerate build-requires - -* Wed Feb 03 2016 Fedora Release Engineering - 4.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jan 12 2016 Mikolaj Izdebski - 4.0-3 -- Install BOM even when without extensions - -* Wed Jun 17 2015 Fedora Release Engineering - 4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu May 14 2015 Mikolaj Izdebski - 4.0-1 -- Update to upstream version 4.0 - -* Mon Apr 27 2015 Mikolaj Izdebski - 3.2.6-1 -- Update to upstream version 3.2.6 - -* Fri Mar 6 2015 Alexander Kurtakov 3.2.5-2 -- Drop gone tomcat-servlet-3.0-api BR, builds fine without it. - -* Fri Jan 23 2015 Michael Simacek - 3.2.5-1 -- Update to upstream version 3.2.5 - -* Mon Sep 29 2014 Mikolaj Izdebski - 3.2.4-1 -- Update to upstream version 3.2.4 - -* Fri Jun 6 2014 Mikolaj Izdebski - 3.2.2-1 -- Update to upstream version 3.2.2 - -* Wed May 28 2014 Mikolaj Izdebski - 3.2.1-2 -- Rebuild to regenerate Maven auto-requires - -* Wed Apr 16 2014 Mikolaj Izdebski - 3.2.1-1 -- Update to upstream version 3.2.1 -- Add testlib subpackage - -* Tue Mar 4 2014 Mikolaj Izdebski - 3.1.10-3 -- Fix directory ownership - -* Tue Mar 04 2014 Stanislav Ochotnicky - 3.1.10-3 -- Use Requires: java-headless rebuild (#1067528) - -* Wed Feb 19 2014 Mikolaj Izdebski - 3.1.10-2 -- Fix unowned directory - -* Tue Feb 18 2014 Mikolaj Izdebski - 3.1.10-1 -- Update to upstream version 3.1.10 - -* Mon Jan 20 2014 Mikolaj Izdebski - 3.1.9-1 -- Update to upstream version 3.1.9 - -* Mon Nov 11 2013 Mikolaj Izdebski - 3.1.8-1 -- Update to upstream version 3.1.8 - -* Wed Oct 23 2013 Mikolaj Izdebski - 3.1.3-10 -- Rebuild to regenerate broken POMs -- Related: rhbz#1021484 - -* Fri Oct 18 2013 Mikolaj Izdebski - 3.1.3-9 -- Don't force generation of pom.properties - -* Wed Sep 25 2013 Mikolaj Izdebski - 3.1.3-8 -- Install no_aop artifact after javapackages update - -* Thu Sep 12 2013 Stanislav Ochotnicky - 3.1.3-7 -- Remove dependency on tests from runtime -- Related: rhbz#1007498 - -* Tue Sep 10 2013 Mikolaj Izdebski - 3.1.3-6 -- Install no_aop artifact -- Resolves: rhbz#1006491 - -* Wed Sep 4 2013 Mikolaj Izdebski - 3.1.3-5 -- Enable pom.properties -- Resolves: rhbz#1004360 - -* Wed Aug 07 2013 Michal Srb - 3.1.3-4 -- Add create-tarball.sh script to SRPM - -* Sat Aug 03 2013 Fedora Release Engineering - 3.1.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Apr 24 2013 Michal Srb - 3.1.3-2 -- Revert update to 3.1.4 (uses asm4) - -* Thu Mar 14 2013 Michal Srb - 3.1.3-1 -- Update to upstream version 3.1.3 -- Remove bundled JARs from tarball - -* Wed Feb 06 2013 Java SIG - 3.1.2-11 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Thu Jan 31 2013 Michal Srb - 3.1.2-10 -- Remove all requires -- Correct usage of xmvn's macros - -* Mon Jan 28 2013 Michal Srb - 3.1.2-9 -- Build with xmvn - -* Fri Nov 16 2012 Mikolaj Izdebski - 3.1.2-8 -- Remove README - -* Fri Nov 16 2012 Mikolaj Izdebski - 3.1.2-7 -- Repackage tarball - -* Fri Nov 9 2012 Mikolaj Izdebski - 3.1.2-6 -- Don't try to build extension modules unless they are needed - -* Fri Nov 9 2012 Mikolaj Izdebski - 3.1.2-5 -- Conditionalize %%install section too - -* Fri Nov 9 2012 Mikolaj Izdebski - 3.1.2-4 -- Conditionally disable extensions - -* Thu Nov 1 2012 Mikolaj Izdebski - 3.1.2-3 -- Update to new add_maven_depmap macro - -* Wed Oct 31 2012 Stanislav Ochotnicky - 3.1.2-2 -- Use new generated maven filelist feature from javapackages-tools - -* Fri Oct 5 2012 Mikolaj Izdebski - 3.1.2-1 -- Complete rewrite of the spec file -- New upstream, to ease future maintenance -- Build with maven instead of ant -- Split into multiple subpackages - -* Thu Jul 19 2012 Fedora Release Engineering - 3.0-0.7.rc2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Feb 9 2012 Stanislav Ochotnicky - 3.0-0.6.rc2 -- Temporary fix for maven buildroots - -* Fri Jan 13 2012 Fedora Release Engineering - 3.0-0.5.rc2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Oct 12 2011 Stanislav Ochotnicky - 3.0-0.4.rc2 -- Build with aqute-bnd (#745176) -- Use new maven macros -- Few packaging tweaks - -* Tue May 24 2011 Stanislav Ochotnicky - 3.0-0.3.rc2 -- Add cglib and atinject to R - -* Thu May 12 2011 Stanislav Ochotnicky - 3.0-0.2.rc2 -- Remove test and missing deps from pom.xml - -* Tue Mar 1 2011 Stanislav Ochotnicky - 3.0-0.1.rc2 -- Update to 3.0rc2 -- Changes according to new guidelines (versionless jars & javadocs) - -* Tue Feb 08 2011 Fedora Release Engineering - 2.0-4.1219svn -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Oct 14 2010 Stanislav Ochotnicky - 2.0-3.1219svn -- Add java-devel >= 1:1.6.0 to BR - -* Wed Oct 13 2010 Stanislav Ochotnicky - 2.0-2.1219svn -- Moved munge repacking to prep -- Added -Dversion to change generated manifest version -- Removed http part of URL - -* Thu Oct 7 2010 Stanislav Ochotnicky - 2.0-1.1219svn -- Initial version of the package +%autochangelog From 6952a5ab2fb2317e45cda856cbe19b223b38b01f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 29 Nov 2024 08:28:38 +0100 Subject: [PATCH 46/57] 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 82512746e85ab832c7b4fa583a6d4fb3cc94d5f9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 16:01:18 +0100 Subject: [PATCH 47/57] Unify spec style with the rest of Java/Maven packages [skip changelog] --- google-guice.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/google-guice.spec b/google-guice.spec index 2d5d024..8db667c 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -27,8 +27,8 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) BuildRequires: mvn(org.ow2.asm:asm) %endif -# xmvn-builddep misses this: %if %{without bootstrap} +# xmvn-builddep misses this: BuildRequires: mvn(org.apache:apache-jar-resource-bundle) %endif BuildRequires: jurand @@ -189,11 +189,17 @@ and above. This package provides Bill of Materials module for Guice. %license COPYING %files -n guice-assistedinject -f .mfiles-guice-assistedinject + %files -n guice-extensions -f .mfiles-extensions-parent + %files -n guice-grapher -f .mfiles-guice-grapher + %files -n guice-jmx -f .mfiles-guice-jmx + %files -n guice-jndi -f .mfiles-guice-jndi + %files -n guice-servlet -f .mfiles-guice-servlet + %files -n guice-throwingproviders -f .mfiles-guice-throwingproviders %files -n guice-bom -f .mfiles-guice-bom From f13c59c97ab52fa432025fcf43a096837d4b3270 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 17:01:09 +0100 Subject: [PATCH 48/57] Sort dependencies [skip changelog] --- google-guice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-guice.spec b/google-guice.spec index 8db667c..779a479 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -13,6 +13,7 @@ ExclusiveArch: %{java_arches} noarch Source0: %{name}-%{version}.tar.xz Source1: create-tarball.sh +BuildRequires: jurand %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else @@ -31,7 +32,6 @@ BuildRequires: mvn(org.ow2.asm:asm) # xmvn-builddep misses this: BuildRequires: mvn(org.apache:apache-jar-resource-bundle) %endif -BuildRequires: jurand %description Put simply, Guice alleviates the need for factories and the use of new From 5548e49ce959da09e3ed3987f4a2db653beabff8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 18:06:35 +0100 Subject: [PATCH 49/57] Explicitly declare javadoc subpackage [skip changelog] --- google-guice.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/google-guice.spec b/google-guice.spec index 779a479..e57adaa 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -115,7 +115,11 @@ 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. -%{?javadoc_package} +%package javadoc +Summary: API documentation for %{name} + +%description javadoc +API documentation for %{name}. %prep %autosetup -p1 -C @@ -204,5 +208,8 @@ and above. This package provides Bill of Materials module for Guice. %files -n guice-bom -f .mfiles-guice-bom +%files javadoc -f .mfiles-javadoc +%license COPYING + %changelog %autochangelog From 68b438154b37b2f89df86be935b419fbb2b690c8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 04:51:27 +0000 Subject: [PATCH 50/57] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From c5193e442df609a81067a3be7cf6fab326a2e34b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 16 Feb 2025 17:17:20 +0100 Subject: [PATCH 51/57] 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 52/57] 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 53/57] 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 54/57] 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 55/57] 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 56/57] 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 57/57] 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.