[aether] Update to latest version
Stanislav Ochotnicky
sochotni at fedoraproject.org
Fri Feb 25 15:35:33 UTC 2011
commit 2763116485d043ea0e51c86767253eb10a08048b
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Fri Feb 25 15:18:40 2011 +0100
Update to latest version
- Add ASL 2.0 back as optional license
.gitignore | 1 +
0001-Remove-sonatype-test-dependencies.patch | 54 +++++++++++++++++---------
aether.spec | 30 +++++++-------
sources | 2 +-
4 files changed, 53 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 86b0936..44b91de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/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
+/aether-1.11.tar.bz2
diff --git a/0001-Remove-sonatype-test-dependencies.patch b/0001-Remove-sonatype-test-dependencies.patch
index 05ce82b..252e087 100644
--- a/0001-Remove-sonatype-test-dependencies.patch
+++ b/0001-Remove-sonatype-test-dependencies.patch
@@ -1,41 +1,59 @@
-From f4e4ddbf486dd3222a5cd114c92bc71f8cc42064 Mon Sep 17 00:00:00 2001
+From 960a03beb37d00534156154ae0dfafe981e6e1da Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky at redhat.com>
-Date: Fri, 28 Jan 2011 16:21:02 +0100
+Date: Fri, 25 Feb 2011 14:52:23 +0100
Subject: [PATCH] Remove sonatype test dependencies
---
aether-connector-asynchttpclient/pom.xml | 18 ------------------
- 1 files changed, 0 insertions(+), 18 deletions(-)
+ aether-connector-wagon/pom.xml | 6 ------
+ 2 files changed, 0 insertions(+), 24 deletions(-)
diff --git a/aether-connector-asynchttpclient/pom.xml b/aether-connector-asynchttpclient/pom.xml
-index b14ff86..398d5cb 100644
+index 069655b..b242494 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>
+@@ -56,24 +56,6 @@
+ <artifactId>aether-test-util</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
+- <groupId>org.mortbay.jetty</groupId>
+- <artifactId>jetty</artifactId>
+- <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>
+- <version>0.4.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.sonatype.http-testing-harness</groupId>
- <artifactId>server-provider</artifactId>
-- <version>0.3</version>
+- <version>0.4.1</version>
- <scope>test</scope>
-- <exclusions>
-- <exclusion>
-- <groupId>ch.qos.logback</groupId>
-- <artifactId>logback-classic</artifactId>
-- </exclusion>
-- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
+ </dependencies>
+
+ <build>
+diff --git a/aether-connector-wagon/pom.xml b/aether-connector-wagon/pom.xml
+index 572e6b0..0b50db3 100644
+--- a/aether-connector-wagon/pom.xml
++++ b/aether-connector-wagon/pom.xml
+@@ -80,12 +80,6 @@
+ <version>${wagonVersion}</version>
+ <scope>test</scope>
+ </dependency>
+- <dependency>
+- <groupId>org.sonatype.http-testing-harness</groupId>
+- <artifactId>server-provider</artifactId>
+- <version>0.4.1</version>
+- <scope>test</scope>
+- </dependency>
+ </dependencies>
+
+ <build>
--
-1.7.3.5
+1.7.4
diff --git a/aether.spec b/aether.spec
index 9f29fdb..0fe249b 100644
--- a/aether.spec
+++ b/aether.spec
@@ -1,19 +1,14 @@
-%global full_name sonatype-aether
-%global githash g23f7474
-
Name: aether
-Version: 1.9
-Release: 2%{?dist}
+Version: 1.11
+Release: 1%{?dist}
Summary: Sonatype library to resolve, install and deploy artifacts the Maven way
Group: Development/Libraries
-License: EPL
+License: EPL or ASL 2.0
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.9
-# click "downloads" in upper right corner
-# click "download .tar.gz"
-Source0: sonatype-%{full_name}-%{name}-%{version}-0-%{githash}.tar.gz
+# git clone https://github.com/sonatype/sonatype-aether.git
+# git archive --prefix="aether-1.11/" --format=tar aether-1.11 | bzip2 > aether-1.11.tar.bz2
+Source0: %{name}-%{version}.tar.bz2
Patch0: 0001-Remove-sonatype-test-dependencies.patch
@@ -31,11 +26,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: async-http-client >= 1.6.1
BuildRequires: sonatype-oss-parent
-Requires: async-http-client
+Requires: async-http-client >= 1.6.1
Requires: maven2
Requires: java >= 1:1.6.0
Requires(post): jpackage-utils
@@ -56,12 +51,13 @@ Requires: jpackage-utils
%prep
# last part will have to change every time
-%setup -q -n sonatype-%{full_name}-333a944
+%setup -q
# we'd need org.sonatype.http-testing-harness so let's remove async
-# http tests (leave others enabled)
+# and wagon http tests (leave others enabled)
%patch0 -p1
rm -rf aether-connector-asynchttpclient/src/test
+rm -rf aether-connector-wagon/src/test
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
@@ -115,6 +111,10 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-parent.pom
%changelog
+* Fri Feb 25 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.11-1
+- Update to latest version
+- Add ASL 2.0 back as optional license
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index dfbf8c3..f69c5c5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0f94521fe8f01eb433e24c113611cbcb sonatype-sonatype-aether-aether-1.9-0-g23f7474.tar.gz
+109d640aca6ae62beeedf57205ae34ec aether-1.11.tar.bz2
More information about the scm-commits
mailing list