[shrinkwrap-resolver] Make shrinkwrap-resolver work with Aether

[Marek Goldmann]

commit f6c699fe57f0d80a94417824c22cdf808bb73d88
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Tue Oct 15 13:16:00 2013 +0200

    Make shrinkwrap-resolver work with Aether
    
    - Using upstream git commit 1aba3c1fc9 to make it work with Eclipse
    Aether
    - shrinkwrap-resolver: Update to Eclipse Aether, RHBZ#985707
    - shrinkwrap-resolver: FTBFS in rawhide, RHBZ#993304
    - Unable to update from F19 to RawHide/F20, RHBZ#1016381

 .gitignore                                         |    1 +
 0001-Add-support-for-jetty-8.patch                 |   59 --------------------
 ...Eclipse-Aether-instead-of-Sonatype-Aether.patch |   49 ----------------
 ...-content-type-for-enhanced-repository-man.patch |   39 -------------
 shrinkwrap-resolver.spec                           |   22 ++++----
 sources                                            |    2 +-
 6 files changed, 13 insertions(+), 159 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 07fcb81..51c686a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /shrinkwrap-resolver-1.0.0.beta7.tar.xz
 /2.0.0-cr-1.tar.gz
+/1aba3c1fc97047d1e0f799f9f843b2dcdf9a1279.tar.gz
diff --git a/shrinkwrap-resolver.spec b/shrinkwrap-resolver.spec
index c49d4ec..0083a9c 100644
--- a/shrinkwrap-resolver.spec
+++ b/shrinkwrap-resolver.spec
@@ -1,15 +1,13 @@
-%global namedreltag .cr1
-%global upstreamreltag -cr-1
+%global namedreltag .git1aba3c1fc9
 %global namedversion %{version}%{?namedreltag}
-%global upstreamnamedversion %{version}%{?upstreamreltag}
 
 Name:             shrinkwrap-resolver
-Version:          2.0.0
+Version:          2.0.1
 Release:          0.1%{namedreltag}%{?dist}
 Summary:          ShrinkWrap Resolver
 License:          ASL 2.0
 URL:              http://www.jboss.org/shrinkwrap
-Source0:          https://github.com/shrinkwrap/resolver/archive/2.0.0-cr-1.tar.gz
+Source0:          https://github.com/shrinkwrap/resolver/archive/1aba3c1fc97047d1e0f799f9f843b2dcdf9a1279.tar.gz
 
 BuildArch:        noarch
 
@@ -31,7 +29,6 @@ BuildRequires:    mvn(org.eclipse.aether:aether-api)
 BuildRequires:    mvn(org.eclipse.aether:aether-impl)
 BuildRequires:    mvn(org.eclipse.aether:aether-spi)
 BuildRequires:    mvn(org.eclipse.aether:aether-util)
-BuildRequires:    mvn(org.eclipse.aether:aether-connector-wagon)
 BuildRequires:    mvn(org.mockito:mockito-all)
 BuildRequires:    mvn(org.apache.maven.plugins:maven-invoker-plugin)
 
@@ -45,10 +42,7 @@ Summary:          Javadocs for %{name}
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n resolver-%{upstreamnamedversion}
-
-sed -i "s|org.sonatype.aether|org.eclipse.aether|g" impl-maven/pom.xml
-sed -i "s|org.mortbay.jetty|org.eclipse.jetty|g" impl-maven/pom.xml
+%setup -q -n resolver-1aba3c1fc97047d1e0f799f9f843b2dcdf9a1279
 
 %pom_remove_plugin ":maven-enforcer-plugin"
 
@@ -70,6 +64,12 @@ sed -i "s|org.mortbay.jetty|org.eclipse.jetty|g" impl-maven/pom.xml
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Tue Oct 15 2013 Marek Goldmann <mgoldman at redhat.com> - 2.0.1-0.1.git1aba3c1fc9
+- Using upstream git commit 1aba3c1fc9 to make it work with Eclipse Aether
+- shrinkwrap-resolver: Update to Eclipse Aether, RHBZ#985707
+- shrinkwrap-resolver: FTBFS in rawhide, RHBZ#993304
+- Unable to update from F19 to RawHide/F20, RHBZ#1016381
+
 * Mon Aug 12 2013 Marek Goldmann <mgoldman at redhat.com> - 2.0.0-0.1.cr1
 - Upstream release 2.0.0-cr-1
 
@@ -96,6 +96,6 @@ sed -i "s|org.mortbay.jetty|org.eclipse.jetty|g" impl-maven/pom.xml
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-0.2.beta7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
-* Thu Jun 00 2012 Marek Goldmann <mgoldman at redhat.com> 1.0.0-0.1.beta7
+* Thu Jun 14 2012 Marek Goldmann <mgoldman at redhat.com> 1.0.0-0.1.beta7
 - Initial packaging
 
diff --git a/sources b/sources
index 623a0cb..56f5f98 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f2d51076189623e4eea8eb08ce41f7b0  2.0.0-cr-1.tar.gz
+5ef90f93c0cd76a98e1d51fe2215acf9  1aba3c1fc97047d1e0f799f9f843b2dcdf9a1279.tar.gz