Revert "Update to upstream version 3.1.4"
This reverts commit fdb0ea42fc
.
google-guice 3.1.4 has been ported to asm4. Maven requires this
package, but uses asm3. Reverting this update, because we can't
be sure that this will work without any surprises.
This commit is contained in:
parent
fdb0ea42fc
commit
1aabeaa499
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,4 +1,3 @@
|
||||
/guice-2.0-1219.tar.xz
|
||||
/guice-3.0-rc2-src.zip
|
||||
/google-guice-3.1.3.tar.xz
|
||||
/google-guice-3.1.4.tar.xz
|
||||
|
@ -5,8 +5,8 @@
|
||||
%global short_name guice
|
||||
|
||||
Name: google-%{short_name}
|
||||
Version: 3.1.4
|
||||
Release: 1%{?dist}
|
||||
Version: 3.1.3
|
||||
Release: 2%{?dist}
|
||||
Summary: Lightweight dependency injection framework for Java 5 and above
|
||||
Group: Development/Libraries
|
||||
License: ASL 2.0
|
||||
@ -26,7 +26,6 @@ BuildRequires: atinject
|
||||
BuildRequires: cglib
|
||||
BuildRequires: guava
|
||||
BuildRequires: slf4j
|
||||
BuildRequires: objectweb-asm4
|
||||
|
||||
%if %{with extensions}
|
||||
BuildRequires: hibernate-jpa-2.0-api
|
||||
@ -193,7 +192,6 @@ servlet,spring,throwingproviders}" "com.google.inject.extensions:guice-@1"
|
||||
%mvn_file ":guice-{*}" %{short_name}/guice-@1
|
||||
%mvn_file ":sisu-guice" %{short_name}/%{name} %{name}
|
||||
%mvn_alias ":sisu-guice" "com.google.inject:guice"
|
||||
%mvn_package :extensions-parent guice-extensions
|
||||
# Skip tests because of missing dependency (hsqldb-j5).
|
||||
%mvn_build -f -s
|
||||
|
||||
@ -223,8 +221,8 @@ servlet,spring,throwingproviders}" "com.google.inject.extensions:guice-@1"
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Apr 24 2013 Michal Srb <msrb@redhat.com> - 3.1.4-1
|
||||
- Update to upstream version 3.1.4
|
||||
* Wed Apr 24 2013 Michal Srb <msrb@redhat.com> - 3.1.3-2
|
||||
- Revert update to 3.1.4 (uses asm4)
|
||||
|
||||
* Thu Mar 14 2013 Michal Srb <msrb@redhat.com> - 3.1.3-1
|
||||
- Update to upstream version 3.1.3
|
||||
|
Loading…
Reference in New Issue
Block a user