.gitignore

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

.google-guice.metadata

@@ -1 +1 @@
-960d2670c1297839c5998ea60a53d3bd5c8ce1c7 SOURCES/google-guice-4.1.tar.xz
+45e372dd2006509e7108e3c32206ae0c981cdda7 SOURCES/google-guice-4.2.3.tar.xz

SPECS/google-guice.spec

@@ -1,52 +1,34 @@
-%bcond_without jpa
+%bcond_with bootstrap
-%bcond_without spring
 
-%global short_name guice
+Name:           google-guice
-
+Version:        4.2.3
-Name:           google-%{short_name}
+Release:        9%{?dist}
-Version:        4.1
-Release:        11%{?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}
 Source0:        %{name}-%{version}.tar.xz
 Source1:        create-tarball.sh
 
-BuildRequires:  maven-local
+BuildRequires:  maven-local-openjdk8
-BuildRequires:  mvn(aopalliance:aopalliance)
+%if %{with bootstrap}
-BuildRequires:  mvn(cglib:cglib)
+BuildRequires:  javapackages-bootstrap
-BuildRequires:  mvn(com.google.guava:guava:19.0)
+%else
-BuildRequires:  mvn(javax.inject:javax.inject)
+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.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.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)
-
-%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
@@ -68,110 +50,80 @@ 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.
 
-%if %{with jpa}
+%package -n guice-servlet
-%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
 
-%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.
 
-%if %{with spring}
+%package -n guice-throwingproviders
-%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
-
-%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
 
-%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.
 
-%package javadoc
+%{?javadoc_package}
-Summary:        API documentation for Guice
-
-%description javadoc
-This package provides %{summary}.
-
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 
 # We don't have struts2 in Fedora yet.
 %pom_disable_module struts2 extensions
@@ -199,27 +151,40 @@ This package provides %{summary}.
 # 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
 
-%if %{without jpa}
 %pom_disable_module persist extensions
-%endif
-%if %{without spring}
 %pom_disable_module spring extensions
-%endif
 
 %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_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-{*}"  %{short_name}/guice-@1
+%mvn_file  ":guice-{*}"  guice/guice-@1
-%mvn_file  ":guice" %{short_name}/%{name} %{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
@@ -227,37 +192,92 @@ This package provides %{summary}.
 %install
 %mvn_install
 
-%files -f .mfiles-guice
+%files -n %{?module_prefix}%{name} -f .mfiles-guice
-%dir %{_javadir}/%{short_name}
 
-%files -n %{short_name}-parent -f .mfiles-guice-parent
+%files -n guice-parent -f .mfiles-guice-parent
-%doc COPYING
+%license COPYING
 
-%files -n %{short_name}-assistedinject -f .mfiles-guice-assistedinject
+%files -n guice-assistedinject -f .mfiles-guice-assistedinject
-%files -n %{short_name}-extensions -f .mfiles-extensions-parent
+%files -n guice-extensions -f .mfiles-extensions-parent
-%files -n %{short_name}-grapher -f .mfiles-guice-grapher
+%files -n guice-grapher -f .mfiles-guice-grapher
-%files -n %{short_name}-jmx -f .mfiles-guice-jmx
+%files -n guice-jmx -f .mfiles-guice-jmx
-%files -n %{short_name}-jndi -f .mfiles-guice-jndi
+%files -n guice-jndi -f .mfiles-guice-jndi
-%files -n %{short_name}-multibindings -f .mfiles-guice-multibindings
+%files -n guice-multibindings -f .mfiles-guice-multibindings
-%if %{with jpa}
+%files -n guice-servlet -f .mfiles-guice-servlet
-%files -n %{short_name}-persist -f .mfiles-guice-persist
+%files -n guice-throwingproviders -f .mfiles-guice-throwingproviders
-%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
 
-%files -n %{short_name}-bom -f .mfiles-guice-bom
+%files -n guice-bom -f .mfiles-guice-bom
 
-%files javadoc -f .mfiles-javadoc
+%changelog
-%doc COPYING
+* Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.3-9
+- Rebuild to regenerate auto-requires
 
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 4.2.3-8
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-%changelog
+* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.3-7
-* Tue Dec 12 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 4.1-11
+- Rebuild to workaround DistroBaker issue
-- Rebuilt for MSVSphere 8.8
+
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.3-6
+- Bootstrap Maven for CentOS Stream 9
+
+* 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
+
+* Fri Apr 05 2019 Marian Koncek <mkoncek@redhat.com> - 4.2.2-1
+- 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