update to version 4.2.2
This commit is contained in:
Fabio Valentini
parent
13bea8cc09
commit
b972e619b6
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,3 +1,6 @@
|
||||
/results_*
|
||||
/*.src.rpm
|
||||
|
||||
/guice-2.0-1219.tar.xz
|
||||
/guice-3.0-rc2-src.zip
|
||||
/google-guice-3.1.3.tar.xz
|
||||
@ -11,3 +14,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
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
%global short_name guice
|
||||
|
||||
Name: google-%{short_name}
|
||||
Version: 4.1
|
||||
Release: 16%{?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}
|
||||
@ -18,22 +18,24 @@ 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.code.findbugs:jsr305)
|
||||
BuildRequires: mvn(com.google.guava:guava)
|
||||
BuildRequires: mvn(javax.inject:javax.inject)
|
||||
BuildRequires: mvn(javax.servlet:servlet-api)
|
||||
# xmvn-builddep misses apache-jar-resource-bundle
|
||||
BuildRequires: mvn(org.apache:apache-jar-resource-bundle)
|
||||
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.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
|
||||
BuildRequires: mvn(org.hibernate.javax.persistence:hibernate-jpa-2.0-api)
|
||||
%endif
|
||||
%if %{with spring}
|
||||
BuildRequires: springframework-beans
|
||||
BuildRequires: mvn(org.springframework:spring-beans)
|
||||
%endif
|
||||
|
||||
# Test dependencies:
|
||||
@ -48,6 +50,8 @@ BuildRequires: mvn(org.hsqldb:hsqldb-j5)
|
||||
BuildRequires: testng
|
||||
%endif
|
||||
|
||||
Obsoletes: guice-testlib < 4.1-17
|
||||
|
||||
%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
|
||||
@ -67,6 +71,7 @@ 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
|
||||
Summary: Guice parent POM
|
||||
|
||||
@ -74,6 +79,7 @@ Summary: Guice parent POM
|
||||
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
|
||||
Summary: AssistedInject extension module for Guice
|
||||
|
||||
@ -81,6 +87,7 @@ Summary: AssistedInject extension module for Guice
|
||||
Guice is a lightweight dependency injection framework for Java 5
|
||||
and above. This package provides AssistedInject module for Guice.
|
||||
|
||||
|
||||
%package -n %{short_name}-extensions
|
||||
Summary: Extensions for Guice
|
||||
|
||||
@ -88,6 +95,7 @@ Summary: Extensions for Guice
|
||||
Guice is a lightweight dependency injection framework for Java 5
|
||||
and above. This package provides extensions POM for Guice.
|
||||
|
||||
|
||||
%package -n %{short_name}-grapher
|
||||
Summary: Grapher extension module for Guice
|
||||
|
||||
@ -95,6 +103,7 @@ Summary: Grapher extension module for Guice
|
||||
Guice is a lightweight dependency injection framework for Java 5
|
||||
and above. This package provides Grapher module for Guice.
|
||||
|
||||
|
||||
%package -n %{short_name}-jmx
|
||||
Summary: JMX extension module for Guice
|
||||
|
||||
@ -102,6 +111,7 @@ Summary: JMX extension module for Guice
|
||||
Guice is a lightweight dependency injection framework for Java 5
|
||||
and above. This package provides JMX module for Guice.
|
||||
|
||||
|
||||
%package -n %{short_name}-jndi
|
||||
Summary: JNDI extension module for Guice
|
||||
|
||||
@ -109,6 +119,7 @@ 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 %{short_name}-multibindings
|
||||
Summary: MultiBindings extension module for Guice
|
||||
|
||||
@ -116,6 +127,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.
|
||||
|
||||
|
||||
%if %{with jpa}
|
||||
%package -n %{short_name}-persist
|
||||
Summary: Persist extension module for Guice
|
||||
@ -125,6 +137,7 @@ 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
|
||||
|
||||
@ -132,6 +145,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.
|
||||
|
||||
|
||||
%if %{with spring}
|
||||
%package -n %{short_name}-spring
|
||||
Summary: Spring extension module for Guice
|
||||
@ -141,12 +155,6 @@ 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
|
||||
@ -155,6 +163,7 @@ Summary: ThrowingProviders extension module for Guice
|
||||
Guice is a lightweight dependency injection framework for Java 5
|
||||
and above. This package provides ThrowingProviders module for Guice.
|
||||
|
||||
|
||||
%package -n %{short_name}-bom
|
||||
Summary: Bill of Materials for Guice
|
||||
|
||||
@ -162,6 +171,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.
|
||||
|
||||
|
||||
%package javadoc
|
||||
Summary: API documentation for Guice
|
||||
|
||||
@ -212,6 +222,13 @@ 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:"
|
||||
|
||||
@ -220,12 +237,15 @@ This package provides %{summary}.
|
||||
%mvn_file ":guice-{*}" %{short_name}/guice-@1
|
||||
%mvn_file ":guice" %{short_name}/%{name} %{name}
|
||||
%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
|
||||
%dir %{_javadir}/%{short_name}
|
||||
|
||||
@ -245,7 +265,6 @@ This package provides %{summary}.
|
||||
%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
|
||||
@ -255,6 +274,10 @@ This package provides %{summary}.
|
||||
|
||||
|
||||
%changelog
|
||||
* 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.
|
||||
|
||||
@ -472,3 +495,4 @@ This package provides %{summary}.
|
||||
|
||||
* Thu Oct 7 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.0-1.1219svn
|
||||
- Initial version of the package
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user