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/0001-Port-from-Sonatype-Sisu-to-Eclipse-Sisu.patch b/0001-Port-from-Sonatype-Sisu-to-Eclipse-Sisu.patch deleted file mode 100644 index a96506a..0000000 --- a/0001-Port-from-Sonatype-Sisu-to-Eclipse-Sisu.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 625bb36df9da578eb5bf552bd6123aaa07ebb71f Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Thu, 25 Jul 2013 07:32:20 +0200 -Subject: [PATCH] Port from Sonatype Sisu to Eclipse Sisu - ---- - aether-connector-file/pom.xml | 4 ++-- - aether-connector-wagon/pom.xml | 4 ++-- - aether-impl/pom.xml | 4 ++-- - pom.xml | 6 +++--- - 4 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/aether-connector-file/pom.xml b/aether-connector-file/pom.xml -index a194621..7fe06af 100644 ---- a/aether-connector-file/pom.xml -+++ b/aether-connector-file/pom.xml -@@ -54,8 +54,8 @@ - true - - -- org.sonatype.sisu -- sisu-inject-plexus -+ org.eclipse.sisu -+ org.eclipse.sisu.plexus - test - - -diff --git a/aether-connector-wagon/pom.xml b/aether-connector-wagon/pom.xml -index ba5b90e..0601fa9 100644 ---- a/aether-connector-wagon/pom.xml -+++ b/aether-connector-wagon/pom.xml -@@ -72,8 +72,8 @@ - true - - -- org.sonatype.sisu -- sisu-inject-plexus -+ org.eclipse.sisu -+ org.eclipse.sisu.plexus - true - - -diff --git a/aether-impl/pom.xml b/aether-impl/pom.xml -index 58c5773..c5fdbd6 100644 ---- a/aether-impl/pom.xml -+++ b/aether-impl/pom.xml -@@ -54,8 +54,8 @@ - true - - -- org.sonatype.sisu -- sisu-inject-plexus -+ org.eclipse.sisu -+ org.eclipse.sisu.plexus - provided - true - -diff --git a/pom.xml b/pom.xml -index ff9ce8f..6d7f7f7 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -208,9 +208,9 @@ - - - -- org.sonatype.sisu -- sisu-inject-plexus -- 2.3.0 -+ org.eclipse.sisu -+ org.eclipse.sisu.plexus -+ 0.0.0.M2a - - - --- -1.8.1.4 - 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 "" -%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 . "no_aop" %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 - 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 - 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