From 4ac4caca15e61babf0d914ed47742ad10584bd4c7a8a1f67d231304f944d0bbd Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 2 May 2023 14:57:07 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/google-guice?expand=0&rev=25 --- _service | 14 ++ create-tarball.sh | 17 --- google-guice-4.1.tar.xz | 3 - google-guice-5.1.0.tar.xz | 3 + google-guice-build.tar.xz | 3 + google-guice-throwingproviderbinder.patch | 33 ----- google-guice.spec | 163 +++++++--------------- guice-4.1-disabledextensions.patch | 102 -------------- guice-4.1-fixup-ant.patch | 147 ------------------- guice-4.1-javadoc.patch | 46 ------ 10 files changed, 74 insertions(+), 457 deletions(-) create mode 100644 _service delete mode 100644 create-tarball.sh delete mode 100644 google-guice-4.1.tar.xz create mode 100644 google-guice-5.1.0.tar.xz create mode 100644 google-guice-build.tar.xz delete mode 100644 google-guice-throwingproviderbinder.patch delete mode 100644 guice-4.1-disabledextensions.patch delete mode 100644 guice-4.1-fixup-ant.patch delete mode 100644 guice-4.1-javadoc.patch diff --git a/_service b/_service new file mode 100644 index 0000000..9e68bc5 --- /dev/null +++ b/_service @@ -0,0 +1,14 @@ + + + git + https://github.com/google/guice.git + 5.1.0 + @PARENT_TAG@ + google-guice + + + *.tar + xz + + + diff --git a/create-tarball.sh b/create-tarball.sh deleted file mode 100644 index fca9092..0000000 --- a/create-tarball.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -set -e -x -test $# -eq 1 -test ! -d guice -git clone https://github.com/google/guice.git -cd ./guice -git checkout ${1} -git branch unbundled-${1} -git checkout unbundled-${1} -rm -rf $(ls . | grep -E -v 'core|extensions|pom|bom|jdk8-tests|COPYING|common.xml|build.xml|build.properties|lib') -find . -name "*.jar" -and ! -name munge.jar -delete -find . -name "*.class" -delete -find lib -type f -and ! -name munge.jar -delete -git commit -a -m "Remove unneeded stuff" -git tag unbundled-${1} -git archive --format=tar --prefix=google-guice-${1}/ unbundled-${1} \ - | xz >../google-guice-${1}.tar.xz diff --git a/google-guice-4.1.tar.xz b/google-guice-4.1.tar.xz deleted file mode 100644 index e121199..0000000 --- a/google-guice-4.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ad9a303c0b69065b67fc4295b9f4acfdde49920f2886cdb2823153d7b59edab0 -size 383200 diff --git a/google-guice-5.1.0.tar.xz b/google-guice-5.1.0.tar.xz new file mode 100644 index 0000000..c6fbdcb --- /dev/null +++ b/google-guice-5.1.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0fa10549f7cf3cb83e05f06cfad470cb21a60f98f0a8ed4b302c79835ba1d3e3 +size 446716 diff --git a/google-guice-build.tar.xz b/google-guice-build.tar.xz new file mode 100644 index 0000000..b972ffd --- /dev/null +++ b/google-guice-build.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a38d9acb0f9712287e792507b68b5b75d4697f15039f10a5484f5e2c2c0fe354 +size 3812 diff --git a/google-guice-throwingproviderbinder.patch b/google-guice-throwingproviderbinder.patch deleted file mode 100644 index 02722e9..0000000 --- a/google-guice-throwingproviderbinder.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- google-guice-4.1/common.xml 2021-06-10 12:08:42.237189651 +0200 -+++ google-guice-4.1/common.xml 2021-06-10 12:10:20.765834983 +0200 -@@ -14,7 +14,7 @@ - -+ source="1.8" target="1.8" encoding="UTF-8" includeantruntime="false"> - - - -@@ -39,7 +39,7 @@ - - - -- -+ - - - -@@ -82,7 +82,7 @@ - -+ source="1.8" target="1.8" encoding="UTF-8" includeantruntime="false"> - - - -Only in google-guice-4.1/core: pom.xml.orig -Only in google-guice-4.1/extensions: pom.xml.orig -Only in google-guice-4.1/jdk8-tests: pom.xml.orig -Only in google-guice-4.1: pom.xml.orig diff --git a/google-guice.spec b/google-guice.spec index 619b826..0a7ac05 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %global short_name guice Name: google-%{short_name} -Version: 4.1 +Version: 5.1.0 Release: 0 Summary: Dependency injection framework for Java 5 and above License: Apache-2.0 @@ -26,21 +26,20 @@ Group: Development/Libraries/Java URL: https://github.com/google/%{short_name} # ./create-tarball.sh %%{version} Source0: %{name}-%{version}.tar.xz -Source1: create-tarball.sh -Patch0: guice-4.1-fixup-ant.patch -Patch1: guice-4.1-disabledextensions.patch -Patch2: guice-4.1-javadoc.patch -Patch3: google-guice-throwingproviderbinder.patch +Source1: %{name}-build.tar.xz BuildRequires: ant -BuildRequires: aqute-bnd +BuildRequires: aopalliance BuildRequires: atinject BuildRequires: fdupes BuildRequires: glassfish-servlet-api +BuildRequires: google-errorprone-annotations BuildRequires: guava BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local -Requires: mvn(com.google.guava:guava) -Requires: mvn(javax.inject:javax.inject) +BuildRequires: jsr-305 +BuildRequires: objectweb-asm +Obsoletes: %{short_name}-multibindings +Obsoletes: %{short_name}-testlibs BuildArch: noarch %description @@ -63,7 +62,6 @@ and above. This package provides parent POM for Guice modules. %package -n %{short_name}-assistedinject Summary: AssistedInject extension module for Guice Group: Development/Libraries/Java -Requires: mvn(com.google.inject:guice) %description -n %{short_name}-assistedinject Guice is a dependency injection framework for Java 5 @@ -72,7 +70,6 @@ and above. This package provides AssistedInject module for Guice. %package -n %{short_name}-extensions Summary: Extensions for Guice Group: Development/Libraries/Java -Requires: mvn(com.google.inject:guice-parent:pom:) %description -n %{short_name}-extensions Guice is a dependency injection framework for Java 5 @@ -81,9 +78,6 @@ and above. This package provides extensions POM for Guice. %package -n %{short_name}-grapher Summary: Grapher extension module for Guice Group: Development/Libraries/Java -Requires: mvn(com.google.inject.extensions:guice-assistedinject) -Requires: mvn(com.google.inject.extensions:guice-multibindings) -Requires: mvn(com.google.inject:guice) %description -n %{short_name}-grapher Guice is a dependency injection framework for Java 5 @@ -92,7 +86,6 @@ and above. This package provides Grapher module for Guice. %package -n %{short_name}-jmx Summary: JMX extension module for Guice Group: Development/Libraries/Java -Requires: mvn(com.google.inject:guice) %description -n %{short_name}-jmx Guice is a dependency injection framework for Java 5 @@ -101,43 +94,22 @@ and above. This package provides JMX module for Guice. %package -n %{short_name}-jndi Summary: JNDI extension module for Guice Group: Development/Libraries/Java -Requires: mvn(com.google.inject:guice) %description -n %{short_name}-jndi Guice is a dependency injection framework for Java 5 and above. This package provides JNDI module for Guice. -%package -n %{short_name}-multibindings -Summary: MultiBindings extension module for Guice -Group: Development/Libraries/Java -Requires: mvn(com.google.inject:guice) - -%description -n %{short_name}-multibindings -Guice is a dependency injection framework for Java 5 -and above. This package provides MultiBindings module for Guice. - %package -n %{short_name}-servlet Summary: Servlet extension module for Guice Group: Development/Libraries/Java -Requires: mvn(com.google.inject:guice) %description -n %{short_name}-servlet Guice is a 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 -Group: Development/Libraries/Java -Requires: mvn(com.google.inject:guice) - -%description -n %{short_name}-testlib -Guice is a 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 Group: Development/Libraries/Java -Requires: mvn(com.google.inject:guice) %description -n %{short_name}-throwingproviders Guice is a dependency injection framework for Java 5 @@ -146,7 +118,6 @@ and above. This package provides ThrowingProviders module for Guice. %package -n %{short_name}-bom Summary: Bill of Materials for Guice Group: Development/Libraries/Java -Requires: mvn(com.google.inject:guice-parent:pom:) %description -n %{short_name}-bom Guice is a dependency injection framework for Java 5 @@ -160,18 +131,17 @@ Group: Documentation/HTML This package provides %{summary}. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -find . -name "*.jar" -and ! -name "munge.jar" -delete -find . -name "*.class" -delete +%setup -q -a1 +# We don't have struts2. %pom_disable_module struts2 extensions # Android-specific extension %pom_disable_module dagger-adapter extensions +# Remove additional build profiles, which we don't use anyways +# and which are only pulling additional dependencies. +%pom_xpath_remove "pom:profile[pom:id='guice.with.jarjar']" core + # Fix OSGi metadata due to not using jarjar %pom_xpath_set "pom:instructions/pom:Import-Package" \ "!com.google.inject.*,*" core @@ -189,112 +159,91 @@ find . -name "*.class" -delete # 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_disable_module persist extensions +%pom_disable_module spring extensions +%pom_disable_module testlib extensions %pom_change_dep -r -f ::::: ::::: -%pom_remove_parent %pom_remove_parent core %pom_xpath_inject pom:project " com.google.inject - 4.1.0" core + %{version}" core -for mdl in assistedinject dagger-adapter grapher jmx jndi multibindings persist servlet spring struts2 testlib throwingproviders; do +for mdl in assistedinject dagger-adapter grapher jmx jndi persist servlet spring struts2 testlib throwingproviders; do %pom_remove_parent extensions/${mdl} %pom_xpath_inject pom:project " com.google.inject.extensions - 4.1.0" extensions/${mdl} + %{version}" extensions/${mdl} done -%pom_disable_module persist extensions -%pom_disable_module spring extensions - -%pom_disable_module jdk8-tests - -%pom_remove_plugin :maven-remote-resources-plugin -%pom_remove_plugin :maven-bundle-plugin -%pom_remove_plugin :maven-source-plugin - -%pom_remove_plugin :maven-remote-resources-plugin extensions -%pom_remove_plugin :maven-bundle-plugin extensions -%pom_remove_plugin :maven-source-plugin extensions - -%pom_xpath_remove "pom:dependency[pom:scope[text()='test']]" core -%pom_xpath_remove "pom:profiles" core -%pom_xpath_remove "pom:build" core -%pom_xpath_remove "pom:optional" core - %build -mkdir -p lib/build -build-jar-repository -s -p lib/build \ - guava javax.inject glassfish-servlet-api aqute-bnd -%{ant} clean.all no_aop -pushd build/no_aop -mkdir -p extensions/servlet/lib/build -%pom_remove_dep :aopalliance core -%pom_remove_dep :asm core -%pom_remove_dep :cglib core -%{ant} -Dversion=%{version} dist javadoc -popd +mkdir -p lib +build-jar-repository -s lib \ + aopalliance \ + atinject \ + glassfish-servlet-api \ + google-errorprone/annotations \ + guava/guava \ + jsr-305 \ + objectweb-asm/asm \ + +%{ant} -Dtest.skip=true package javadoc %install # jars install -dm 0755 %{buildroot}%{_javadir}/%{short_name} -install -pm 0644 build/no_aop/build/guice-%{version}.jar %{buildroot}%{_javadir}/%{short_name}/%{name}.jar +install -pm 0644 core/target/guice-%{version}.jar %{buildroot}%{_javadir}/%{short_name}/%{name}.jar # Provide symlinks for all jars that existed, no_aop and aop ln -sf %{short_name}/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}/%{name}-no_aop.jar ln -sf %{short_name}/%{name}.jar %{buildroot}%{_javadir}/%{name}-no_aop.jar -install -pm 0644 build/no_aop/build/dist/guice-jmx-%{version}.jar \ +install -pm 0644 extensions/jmx/target/guice-jmx-%{version}.jar \ %{buildroot}%{_javadir}/%{short_name}/guice-jmx.jar -install -pm 0644 build/no_aop/build/dist/guice-assistedinject-%{version}.jar \ +install -pm 0644 extensions/assistedinject/target/guice-assistedinject-%{version}.jar \ %{buildroot}%{_javadir}/%{short_name}/guice-assistedinject.jar -install -pm 0644 build/no_aop/build/dist/guice-multibindings-%{version}.jar \ - %{buildroot}%{_javadir}/%{short_name}/guice-multibindings.jar -install -pm 0644 build/no_aop/build/dist/guice-throwingproviders-%{version}.jar \ +install -pm 0644 extensions/throwingproviders/target/guice-throwingproviders-%{version}.jar \ %{buildroot}%{_javadir}/%{short_name}/guice-throwingproviders.jar -install -pm 0644 build/no_aop/build/dist/guice-servlet-%{version}.jar \ +install -pm 0644 extensions/servlet/target/guice-servlet-%{version}.jar \ %{buildroot}%{_javadir}/%{short_name}/guice-servlet.jar -install -pm 0644 build/no_aop/build/dist/guice-jndi-%{version}.jar \ +install -pm 0644 extensions/jndi/target/guice-jndi-%{version}.jar \ %{buildroot}%{_javadir}/%{short_name}/guice-jndi.jar -install -pm 0644 build/no_aop/build/dist/guice-testlib-%{version}.jar \ - %{buildroot}%{_javadir}/%{short_name}/guice-testlib.jar -install -pm 0644 build/no_aop/build/dist/guice-grapher-%{version}.jar \ +install -pm 0644 extensions/grapher/target/guice-grapher-%{version}.jar \ %{buildroot}%{_javadir}/%{short_name}/guice-grapher.jar # poms install -dm 0755 %{buildroot}%{_mavenpomdir}/%{short_name} -install -pm 0644 build/no_aop/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-parent.pom +install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-parent.pom %add_maven_depmap %{short_name}/guice-parent.pom -f parent -install -pm 0644 build/no_aop/bom/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-bom.pom +install -pm 0644 bom/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-bom.pom %add_maven_depmap %{short_name}/guice-bom.pom -f bom -install -pm 0644 build/no_aop/extensions/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/extensions-parent.pom +install -pm 0644 extensions/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/extensions-parent.pom %add_maven_depmap %{short_name}/extensions-parent.pom -a org.sonatype.sisu.inject:extensions-parent -f extensions -install -pm 0644 build/no_aop/core/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/%{name}.pom +install -pm 0644 core/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/%{name}.pom %add_maven_depmap %{short_name}/%{name}.pom %{short_name}/%{name}.jar -a "org.sonatype.sisu:sisu-guice,com.google.inject:guice::no_aop:,org.sonatype.sisu:sisu-guice::no_aop:" -install -pm 0644 build/no_aop/extensions/jmx/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-jmx.pom +install -pm 0644 extensions/jmx/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-jmx.pom %add_maven_depmap %{short_name}/guice-jmx.pom %{short_name}/guice-jmx.jar -a org.sonatype.sisu.inject:guice-jmx -f jmx -install -pm 0644 build/no_aop/extensions/assistedinject/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-assistedinject.pom +install -pm 0644 extensions/assistedinject/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-assistedinject.pom %add_maven_depmap %{short_name}/guice-assistedinject.pom %{short_name}/guice-assistedinject.jar -a org.sonatype.sisu.inject:guice-assistedinject -f assistedinject -install -pm 0644 build/no_aop/extensions/multibindings/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-multibindings.pom -%add_maven_depmap %{short_name}/guice-multibindings.pom %{short_name}/guice-multibindings.jar -a org.sonatype.sisu.inject:guice-multibindings -f multibindings -install -pm 0644 build/no_aop/extensions/throwingproviders/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-throwingproviders.pom +install -pm 0644 extensions/throwingproviders/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-throwingproviders.pom %add_maven_depmap %{short_name}/guice-throwingproviders.pom %{short_name}/guice-throwingproviders.jar -a org.sonatype.sisu.inject:guice-throwingproviders -f throwingproviders -install -pm 0644 build/no_aop/extensions/servlet/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-servlet.pom +install -pm 0644 extensions/servlet/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-servlet.pom %add_maven_depmap %{short_name}/guice-servlet.pom %{short_name}/guice-servlet.jar -a org.sonatype.sisu.inject:guice-servlet -f servlet -install -pm 0644 build/no_aop/extensions/jndi/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-jndi.pom +install -pm 0644 extensions/jndi/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-jndi.pom %add_maven_depmap %{short_name}/guice-jndi.pom %{short_name}/guice-jndi.jar -a org.sonatype.sisu.inject:guice-jndi -f jndi -install -pm 0644 build/no_aop/extensions/testlib/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-testlib.pom -%add_maven_depmap %{short_name}/guice-testlib.pom %{short_name}/guice-testlib.jar -a org.sonatype.sisu.inject:guice-testlib -f testlib -install -pm 0644 build/no_aop/extensions/grapher/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-grapher.pom +install -pm 0644 extensions/grapher/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-grapher.pom %add_maven_depmap %{short_name}/guice-grapher.pom %{short_name}/guice-grapher.jar -a org.sonatype.sisu.inject:guice-grapher -f grapher # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name} -cp -pr build/no_aop/build/docs/javadoc/* %{buildroot}%{_javadocdir}/%{name}/ +cp -pr core/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ %fdupes -s %{buildroot}%{_javadocdir} %files -f .mfiles @@ -315,12 +264,8 @@ cp -pr build/no_aop/build/docs/javadoc/* %{buildroot}%{_javadocdir}/%{name}/ %files -n %{short_name}-jndi -f .mfiles-jndi -%files -n %{short_name}-multibindings -f .mfiles-multibindings - %files -n %{short_name}-servlet -f .mfiles-servlet -%files -n %{short_name}-testlib -f .mfiles-testlib - %files -n %{short_name}-throwingproviders -f .mfiles-throwingproviders %files -n %{short_name}-bom -f .mfiles-bom diff --git a/guice-4.1-disabledextensions.patch b/guice-4.1-disabledextensions.patch deleted file mode 100644 index 368857e..0000000 --- a/guice-4.1-disabledextensions.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- guice-4.1/build.xml 2018-10-30 11:38:11.568428971 +0100 -+++ guice-4.1/build.xml 2018-10-30 11:38:32.188523986 +0100 -@@ -25,15 +25,11 @@ - - -- -- - - - - - -- -- - - - -@@ -41,12 +37,6 @@ - - - -- -- -- -- -- -- - - - -@@ -62,12 +52,6 @@ - - - -- -- -- -- -- -- - - - -@@ -154,15 +138,11 @@ - - - -- - - - - - -- -- -- - - - -@@ -216,9 +196,6 @@ - - - -- -- -- - - - -@@ -228,15 +205,6 @@ - - - -- -- -- -- -- -- -- -- -- - - - -@@ -300,15 +268,11 @@ - depends="clean" - description="Remove generated files."> - -- -- - - - - - -- -- - - - diff --git a/guice-4.1-fixup-ant.patch b/guice-4.1-fixup-ant.patch deleted file mode 100644 index e5c4343..0000000 --- a/guice-4.1-fixup-ant.patch +++ /dev/null @@ -1,147 +0,0 @@ -diff -urEbwB guice-4.1/build.properties guice-4.1.new/build.properties ---- guice-4.1/build.properties 2016-06-17 20:00:06.000000000 +0200 -+++ guice-4.1.new/build.properties 2019-02-13 23:51:02.592074396 +0100 -@@ -37,4 +37,4 @@ - com.google.inject.testing.fieldbinder - test.class=com.google.inject.AllTests - module=com.google.inject --imports=!net.sf.cglib.*,!org.objectweb.asm.* -+imports=net.sf.cglib.*,org.objectweb.asm.* -diff -urEbwB guice-4.1/build.xml guice-4.1.new/build.xml ---- guice-4.1/build.xml 2016-06-17 20:00:06.000000000 +0200 -+++ guice-4.1.new/build.xml 2019-02-13 23:51:02.596074414 +0100 -@@ -18,10 +18,10 @@ - - - -- -- -+ -- -+ - - - -@@ -118,16 +118,8 @@ - - - -- -- -- -- -- -- -- -- -- -- -+ -+ - - - -diff -urEbwB guice-4.1/common.xml guice-4.1.new/common.xml ---- guice-4.1/common.xml 2016-06-17 20:00:06.000000000 +0200 -+++ guice-4.1.new/common.xml 2019-02-13 23:51:18.596146420 +0100 -@@ -14,7 +14,7 @@ - -+ source="1.6" target="1.6" encoding="UTF-8" includeantruntime="false"> - - - -@@ -26,7 +26,7 @@ - - - -+ classpathref="compile.classpath"/> - - - -@@ -48,7 +48,7 @@ - - - -- -+ - - - -@@ -60,13 +60,19 @@ - - - -- -+ -+ -+ -+ -+ - - - - - - -+ -+ - - - -+ source="1.6" target="1.6" encoding="UTF-8" includeantruntime="false"> - - - -@@ -120,37 +126,16 @@ - description="Build jar files"/> - - -+ description="Build a jar of tests."> - - -- -- -- -- -- -- -- -- -- -- -+ - - - -+ description="Build jar."> - - -- -- -- -- -- -- -- -- -- -- -- -+ - - diff --git a/guice-4.1-javadoc.patch b/guice-4.1-javadoc.patch deleted file mode 100644 index d3c75c1..0000000 --- a/guice-4.1-javadoc.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -urEbwB guice-4.1/build.xml guice-4.1.new/build.xml ---- guice-4.1/build.xml 2019-02-13 23:43:35.806063663 +0100 -+++ guice-4.1.new/build.xml 2019-02-13 23:46:22.818815271 +0100 -@@ -126,7 +126,7 @@ - - - - -@@ -151,7 +151,7 @@ - - -@@ -170,9 +170,9 @@ - - -@@ -205,12 +205,6 @@ - - - -- -- -- -- -- -- - - - From bf4c5b2d03b5e8a57cbf0ab04d18fbb2de1ac91ea489f5233bc516795ae1ef3b Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 3 May 2023 11:42:29 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/google-guice?expand=0&rev=26 --- google-guice.changes | 77 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/google-guice.changes b/google-guice.changes index 8938b41..b5e0f06 100644 --- a/google-guice.changes +++ b/google-guice.changes @@ -1,3 +1,80 @@ +------------------------------------------------------------------- +Wed May 3 11:27:41 UTC 2023 - Fridrich Strba + +- Upgrade to upstream version 5.1.0 + * Changes of 4.2: + + Java 9 and JPMS support + + Multibindings are now in the Guice core artifact. + The multibindings artifact is empty to prevent confusion + during upgrading and will be removed in a later release. + + Improve the performance of guice provisioning (by about 20%) + by changing the way errors are reported. Guice will no longer + report multiple errors during provisioning (Guice still + reports multiple errors during injector creation). + + Better error messages for a missing binding. + + Various optimizations. + + AbstractModule.configure() is non-abstract to allow modules + with only @Provides/@ProvidesIntoSet/... methods. + + Add a CheckedProviders class. + + Change the way Singletons work to not rely on ThreadLocals nor + WeakReferences. + + Add MapBinderBinding.getEntries(Iterable). + + Deprecate ProvisionListener.ProvisionInvocation + .getDependencyChain(). + + Ensure that Struts interceptors are populated even if they are + created after the injector (Fixes #1081, #1075). + + Add support for multibindings with annotations in the Guice + DaggerMethodScanner. + * Changes of 4.2.1 + + Java10 support (updated cglib & asm). + + Minor updates to the testlib extension. + * Changes of 4.2.2 + + Java11 support (updated cglib & asm) + * Changes of 4.2.3 + + Java14 support (updated asm). + + Added Injector.getElements API, to expose all Element SPI + types from the Injector. + + Added Injector.getAllMembersInjectorInjectionPoints API, + to expose injection points created by arbitrary members + injection. + + Added getAlternateKeys to Multibinder SPI types + (MultibinderBinding, MapBinderBinding, OptionalBinderBinding), + to explicitly list the other keys these bindings are + available as. + + Scan for (and bind) @Provides-like methods in a consistent + ordering, rather than relying on the non-deterministic + Class.getDeclaredMembers ordering. + + Update DaggerAdapter to work with newer dagger code. + + Fixed a subtle bug with eager singleton evaluation. + + Updated @RequestScope's scope annotation to the JSR330 @Scope, + so it can be reused by non-Guice DI systems. + + Clarified the error message when an injectable constructor is + missing. + + Add deprecated overloads to various Modules methods, to make + it clearer when calling them is unnecessary. + + Added factory methods to Modules for common Binder + configuration methods, to make it easier to configure them. + * Changes of 5.0.1: + + Added Java15 support (updated asm and bug fixes). + + Removed cglib as a core dependency. (#1359) + + Improved error messages. + + Improved support for using Guice with Kotlin. + + Added a mechanism to restrict who can bind types or + annotations, to allow library authors to control their + bindings. + + Removed no-aop build variant. + + Fixed 'illegal reflective access' warnings. + * Changes of 5.1.0: + + This minor release adds support for Java 17. +- Removed patches: + * google-guice-throwingproviderbinder.patch + * guice-4.1-disabledextensions.patch + * guice-4.1-fixup-ant.patch + * guice-4.1-javadoc.patch +- Fetch sources using source service, which allows us to clean up + the tarball if needed +- Generate the ant build system using the maven pom files. + ------------------------------------------------------------------- Wed Apr 27 11:52:34 UTC 2022 - Fridrich Strba From 3b7196a07a7aa20f4f108dd01acc8719ea950dbba4336c9dd81f777cb6eaac07 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 3 May 2023 15:31:55 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/google-guice?expand=0&rev=27 --- google-guice.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/google-guice.spec b/google-guice.spec index 0a7ac05..22fb507 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -38,7 +38,8 @@ BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local BuildRequires: jsr-305 BuildRequires: objectweb-asm -Obsoletes: %{short_name}-multibindings +Provides: %{short_name}-multibindings = %{version} +Obsoletes: %{short_name}-multibindings < %{version} Obsoletes: %{short_name}-testlibs BuildArch: noarch