.gitignore

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

.google-guice.metadata

@@ -1 +1 @@
-45e372dd2006509e7108e3c32206ae0c981cdda7 SOURCES/google-guice-4.2.3.tar.xz
+b6026a2dca56aae1b1f7ebab2cd28b2d8445c2d8 SOURCES/google-guice-4.2.2.tar.xz

SPECS/google-guice.spec

@@ -1,23 +1,18 @@
-%bcond_with bootstrap
-
 Name:           google-guice
-Version:        4.2.3
-Release:        9%{?dist}
+Version:        4.2.2
+Release:        4%{?dist}
 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
 Source1:        create-tarball.sh
 
-%if %{with bootstrap}
-BuildRequires:  javapackages-bootstrap-openjdk8
-%else
 BuildRequires:  maven-local-openjdk8
-BuildRequires:  mvn(com.google.code.findbugs:jsr305)
+BuildRequires:  %{?module_prefix}mvn(aopalliance:aopalliance)
+BuildRequires:  mvn(cglib:cglib)
 BuildRequires:  %{?module_prefix}mvn(com.google.guava:guava)
 BuildRequires:  %{?module_prefix}mvn(javax.inject:javax.inject)
 BuildRequires:  mvn(javax.servlet:servlet-api)
@@ -25,12 +20,12 @@ 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)
-%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
@@ -100,6 +95,7 @@ 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.
 
+
 %package -n guice-servlet
 Summary:        Servlet extension module for Guice
 
@@ -107,6 +103,7 @@ 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
 
@@ -121,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
@@ -152,7 +150,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='tests']" extensions
+%pom_xpath_remove "pom:dependency[pom:classifier[text()='tests']]" extensions
 
 %pom_remove_parent
 %pom_set_parent com.google.inject:guice-parent:%{version} jdk8-tests
@@ -168,21 +166,10 @@ 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']" "<scope>provided</scope>" 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}
@@ -210,59 +197,12 @@ 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 <releng@fedoraproject.org> - 4.2.3-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 4.2.3-8
-- Rebuilt for java-17-openjdk as system jdk
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.3-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.3-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.3-5
-- Bump release
-
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.3-2
-- Bootstrap build
-- Non-bootstrap build
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.3-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Sep 18 2020 Marian Koncek <mkoncek@redhat.com> - 4.2.3-1
-- Update to upstream version 4.2.3
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 4.2.3-2
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Fri May 08 2020 Fabio Valentini <decathorpe@gmail.com> - 4.2.3-1
-- Update to version 4.2.3.
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
 * Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.2-4
 - Build with OpenJDK 8
 
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.2-3
 - Mass rebuild for javapackages-tools 201902
 
-* Mon Jul 29 2019 Fabio Valentini <decathorpe@gmail.com> - 4.2.2-1
-- Update to version 4.2.2.
-- Obsolete guice-testlib.
-
-* Fri Jul 26 2019 Fabio Valentini <decathorpe@gmail.com> - 4.1-16
-- Disable support for spring and JPA.
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.2-2
 - Mass rebuild for javapackages-tools 201901
 
@@ -270,15 +210,6 @@ and above. This package provides Bill of Materials module for Guice.
 - Update to upstream version 4.2.2
 - Fixes: RHBZ #1563661
 
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Dec 13 2018 Mat Booth <mat.booth@redhat.com> - 4.1-13
-- Regenerate OSGi metadata due to ASM 7
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
 * Wed Apr 18 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.1-11
 - Remove legacy Provides