From 0e0eafb0dd2a03886b207f78fb14bec9f9f40c49 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Wed, 12 Jan 2011 17:43:52 +0100
Subject: [PATCH] Update to version 1.9

---
 .gitignore                                   |  2 +
 0001-Remove-sonatype-test-dependencies.patch | 41 ++++++++++++++++++++
 aether.spec                                  | 26 ++++++++++---
 sources                                      |  2 +-
 4 files changed, 64 insertions(+), 7 deletions(-)
 create mode 100644 0001-Remove-sonatype-test-dependencies.patch

diff --git a/.gitignore b/.gitignore
index fef96a1..86b0936 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 /sonatype-sonatype-aether-aether-1.7-0-g6ef7c04.tar.gz
+/sonatype-sonatype-aether-aether-1.8-0-gaf9a061.tar.gz
+/sonatype-sonatype-aether-aether-1.9-0-g23f7474.tar.gz
diff --git a/0001-Remove-sonatype-test-dependencies.patch b/0001-Remove-sonatype-test-dependencies.patch
new file mode 100644
index 0000000..05ce82b
--- /dev/null
+++ b/0001-Remove-sonatype-test-dependencies.patch
@@ -0,0 +1,41 @@
+From f4e4ddbf486dd3222a5cd114c92bc71f8cc42064 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky@redhat.com>
+Date: Fri, 28 Jan 2011 16:21:02 +0100
+Subject: [PATCH] Remove sonatype test dependencies
+
+---
+ aether-connector-asynchttpclient/pom.xml |   18 ------------------
+ 1 files changed, 0 insertions(+), 18 deletions(-)
+
+diff --git a/aether-connector-asynchttpclient/pom.xml b/aether-connector-asynchttpclient/pom.xml
+index b14ff86..398d5cb 100644
+--- a/aether-connector-asynchttpclient/pom.xml
++++ b/aether-connector-asynchttpclient/pom.xml
+@@ -58,24 +58,6 @@ http://www.eclipse.org/legal/epl-v10.html
+       <version>6.1.25</version>
+       <scope>test</scope>
+     </dependency>
+-    <dependency>
+-      <groupId>org.sonatype.http-testing-harness</groupId>
+-      <artifactId>junit-runner</artifactId>
+-      <version>0.3</version>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.sonatype.http-testing-harness</groupId>
+-      <artifactId>server-provider</artifactId>
+-      <version>0.3</version>
+-      <scope>test</scope>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>ch.qos.logback</groupId>
+-          <artifactId>logback-classic</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+        
+     <dependency>
+       <groupId>org.slf4j</groupId>
+-- 
+1.7.3.5
+
diff --git a/aether.spec b/aether.spec
index 167c3c7..9ae1fc7 100644
--- a/aether.spec
+++ b/aether.spec
@@ -1,20 +1,22 @@
 %global full_name sonatype-aether
-%global githash g6ef7c04
+%global githash g23f7474
 
 Name:           aether
-Version:        1.7
-Release:        3%{?dist}
+Version:        1.9
+Release:        1%{?dist}
 Summary:        Sonatype library to resolve, install and deploy artifacts the Maven way
 
 Group:          Development/Libraries
-License:        ASL 2.0
+License:        EPL
 URL:            https://docs.sonatype.org/display/AETHER/Home
 # it seems github has redirects plus it generates tarball on the fly
-# to get tarball go to http://github.com/sonatype/sonatype-aether/tree/aether-1.7
+# to get tarball go to http://github.com/sonatype/sonatype-aether/tree/aether-1.9
 # click "downloads" in upper right corner
 # click "download .tar.gz"
 Source0:        sonatype-%{full_name}-%{name}-%{version}-0-%{githash}.tar.gz
 
+Patch0:         0001-Remove-sonatype-test-dependencies.patch
+
 BuildArch:      noarch
 
 BuildRequires:  maven2
@@ -29,8 +31,11 @@ BuildRequires:  maven-surefire-provider-junit4
 BuildRequires:  plexus-containers-component-metadata >= 1.5.4-4
 BuildRequires:  animal-sniffer >= 1.6-5
 BuildRequires:  mojo-parent
+BuildRequires:  async-http-client
+BuildRequires:  sonatype-oss-parent
 
 
+Requires:       async-http-client
 Requires:       maven2
 Requires:       java >= 1:1.6.0
 Requires(post): jpackage-utils
@@ -51,8 +56,12 @@ Requires:  jpackage-utils
 
 %prep
 # last part will have to change every time
-%setup -q -n sonatype-%{full_name}-074c2fb
+%setup -q -n sonatype-%{full_name}-333a944
 
+# we'd need org.sonatype.http-testing-harness so let's remove async
+# http tests (leave others enabled)
+%patch0 -p1
+rm -rf aether-connector-asynchttpclient/src/test
 
 %build
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
@@ -106,6 +115,11 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-parent.pom
 
 
 %changelog
+* Wed Jan 19 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.9-1
+- License changed to EPL
+- Add async-http-client to BR/R
+- Update to latest version
+
 * Wed Dec  8 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.7-3
 - Make jars/javadocs versionless
 - Remove buildroot and clean section
diff --git a/sources b/sources
index f1396a8..dfbf8c3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fa9697f1d2e8d9086fb7f287b02cc00d  sonatype-sonatype-aether-aether-1.7-0-g6ef7c04.tar.gz
+0f94521fe8f01eb433e24c113611cbcb  sonatype-sonatype-aether-aether-1.9-0-g23f7474.tar.gz