.gitignore

@@ -1 +1 @@
-SOURCES/google-guice-5.1.0.tar.xz
+SOURCES/google-guice-4.2.3.tar.xz

.google-guice.metadata

@@ -1 +1 @@
-4f026d37309ceb48e0a6377b91f12ad0334de976 SOURCES/google-guice-5.1.0.tar.xz
+45e372dd2006509e7108e3c32206ae0c981cdda7 SOURCES/google-guice-4.2.3.tar.xz

SOURCES/create-tarball.sh

@@ -2,7 +2,7 @@
 set -e -x
 test $# -eq 1
 test ! -d guice
-git clone https://github.com/google/guice.git
+git clone git://github.com/google/guice.git
 cd ./guice
 git checkout ${1}
 git branch unbundled-${1}

SPECS/google-guice.spec

@@ -1,39 +1,35 @@
 %bcond_with bootstrap
 
 Name:           google-guice
-Version:        5.1.0
+Version:        4.2.3
-Release:        11%{?dist}
+Release:        10%{?dist}
 Summary:        Lightweight dependency injection framework for Java 5 and above
-License:        Apache-2.0
+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
 Source1:        create-tarball.sh
 
+BuildRequires:  maven-local-openjdk8
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
-BuildRequires:  maven-local
-BuildRequires:  mvn(aopalliance:aopalliance)
 BuildRequires:  mvn(com.google.code.findbugs:jsr305)
-BuildRequires:  mvn(com.google.guava:guava)
+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)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
-BuildRequires:  mvn(org.ow2.asm:asm)
+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
-BuildRequires:  jurand
-
-Obsoletes:      guice-multibindings < 5
 
 %description
 Put simply, Guice alleviates the need for factories and the use of new
@@ -96,6 +92,13 @@ 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
 
@@ -122,10 +125,6 @@ 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,37 +154,45 @@ 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 :aopalliance core
-#%pom_remove_dep :asm core
+%pom_remove_dep :asm core
-#%pom_remove_dep :cglib 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:configuration"
-#%pom_xpath_remove "pom:plugin[pom:artifactId='maven-jar-plugin']/pom:executions"
+%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: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_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']" "<scope>provided</scope>" extensions
+%pom_xpath_inject "pom:dependency[pom:artifactId='guice']" "<scope>provided</scope>" 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 :::no_aop: guice
-#%mvn_package :guice:jar:{}: __noinstall
+%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 -f .mfiles-guice
+%files -n %{?module_prefix}%{name} -f .mfiles-guice
 
 %files -n guice-parent -f .mfiles-guice-parent
 %license COPYING
@@ -195,62 +202,28 @@ 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 Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 5.1.0-11
+* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com> - 4.2.3-10
-- Rebuilt for MSVSphere 10
+- Rebuild with regenerated Requires on Java
-
-* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 5.1.0-11
-- Bump release for Aug 2024 java mass rebuild
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 5.1.0-10
-- Bump release for June 2024 mass rebuild
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.0-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.0-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Sep 20 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.1.0-7
-- Rebuild to regenerate auto-Requires on java
-
-* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.1.0-6
-- Convert License tag to SPDX format
-
-* Wed Aug 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.1.0-5
-- Build with Jurand instead of deprecated javapackages-extra
-
-* Tue Aug 15 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.1.0-4
-- Build with default JDK 17
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Fri Mar 31 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.1.0-2
-- Rebuild with no changes
-
-* Tue Mar 21 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.1.0-1
-- Update to upstream version 5.1.0
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.3-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.3-9
+* Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.3-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+- Rebuild to regenerate auto-requires
 
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 4.2.3-8
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 4.2.3-8
-- Rebuilt for java-17-openjdk as system jdk
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.3-7
+* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.3-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+- Rebuild to workaround DistroBaker issue
 
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.3-6
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.3-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+- Bootstrap Maven for CentOS Stream 9
 
 * Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.3-5
 - Bump release