From 7f6160e4ebaea7631240f7330c2415946c3df184 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:06:43 +0000 Subject: [PATCH 01/15] 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/15] 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/15] 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/15] 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/15] 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/15] 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/15] 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/15] 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/15] 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/15] 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/15] 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/15] 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/15] 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/15] 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/15] 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