[aether] Update to upstream version 0.9.0.M4
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Mon Jan 6 11:51:12 UTC 2014
commit 9cd0008db00baa94045dec30ea3385ef2c961732
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Mon Jan 6 12:29:22 2014 +0100
Update to upstream version 0.9.0.M4
.gitignore | 1 +
0001-Port-from-Sonatype-Sisu-to-Eclipse-Sisu.patch | 77 --------------------
aether.spec | 19 ++++--
sources | 2 +-
4 files changed, 15 insertions(+), 84 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5563398..a73a911 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/epl-v10.html
/aether-0.9.0.M2.tar.bz2
/aether-0.9.0.M3.tar.bz2
+/aether-0.9.0.M4.tar.bz2
diff --git a/aether.spec b/aether.spec
index 3aea9e2..9a7e299 100644
--- a/aether.spec
+++ b/aether.spec
@@ -1,9 +1,9 @@
-%global vertag M3
+%global vertag M4
Name: aether
Epoch: 1
Version: 0.9.0
-Release: 0.4.%{vertag}%{?dist}
+Release: 0.5.%{vertag}%{?dist}
Summary: Library to resolve, install and deploy artifacts the Maven way
License: EPL
URL: http://eclipse.org/aether
@@ -12,15 +12,19 @@ BuildArch: noarch
Source0: http://git.eclipse.org/c/%{name}/%{name}-core.git/snapshot/%{name}-%{version}.%{vertag}.tar.bz2
BuildRequires: maven-local
+BuildRequires: mvn(com.google.inject:guice::no_aop:)
BuildRequires: mvn(javax.inject:javax.inject)
+BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.apache.httpcomponents:httpclient)
BuildRequires: mvn(org.apache.maven.wagon:wagon-provider-api)
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) >= 1.7
BuildRequires: mvn(org.codehaus.plexus:plexus-classworlds)
BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations)
+BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin)
+BuildRequires: mvn(org.hamcrest:hamcrest-library)
BuildRequires: mvn(org.slf4j:jcl-over-slf4j)
BuildRequires: mvn(org.slf4j:slf4j-api)
@@ -143,10 +147,9 @@ rm -rf aether-transport-http/src/test
%pom_remove_plugin :maven-enforcer-plugin
-# Workaround for rhbz#911365
-%pom_xpath_inject pom:project "<dependencies/>"
-%pom_add_dep cglib:cglib:any:test
-%pom_add_dep aopalliance:aopalliance:any:test
+# Upstream uses Sisu 0.0.0.M4, but Fedora has 0.0.0.M5. In M5 scope
+# of Guice dependency was changed from "compile" to "provided".
+%pom_add_dep com.google.inject:guice::provided . "<classifier>no_aop</classifier>"
%build
%mvn_build -s
@@ -176,6 +179,10 @@ rm -rf aether-transport-http/src/test
%doc epl-v10.html notice.html
%changelog
+* Mon Jan 6 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 1:0.9.0-0.5.M4
+- Update to upstream version 0.9.0.M4
+- Remove workaround for rhbz#911365
+
* Wed Aug 14 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 1:0.9.0-0.4.M3
- Add missing Obsoletes: aether-connector-file
- Resolves: rhbz#996764
diff --git a/sources b/sources
index d0e616c..b65fc40 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c81ef36155719a0cdc1473654e2f0d3b aether-0.9.0.M3.tar.bz2
+99a4baf37db10571489ce22cf406b21a aether-0.9.0.M4.tar.bz2
More information about the scm-commits
mailing list