diff --git a/.gitignore b/.gitignore index 44b91de..a93121e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /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 +/aether-1.13.1.tar.bz2 diff --git a/0001-Remove-sonatype-test-dependencies.patch b/0001-Remove-sonatype-test-dependencies.patch index 252e087..958f90f 100644 --- a/0001-Remove-sonatype-test-dependencies.patch +++ b/0001-Remove-sonatype-test-dependencies.patch @@ -1,22 +1,26 @@ -From 960a03beb37d00534156154ae0dfafe981e6e1da Mon Sep 17 00:00:00 2001 +From d03b97292c144260f824c4918174b153b632aa02 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Fri, 25 Feb 2011 14:52:23 +0100 -Subject: [PATCH] Remove sonatype test dependencies +Subject: [PATCH 1/3] Remove sonatype test dependencies --- - aether-connector-asynchttpclient/pom.xml | 18 ------------------ - aether-connector-wagon/pom.xml | 6 ------ - 2 files changed, 0 insertions(+), 24 deletions(-) + aether-connector-asynchttpclient/pom.xml | 23 ----------------------- + 1 files changed, 0 insertions(+), 23 deletions(-) diff --git a/aether-connector-asynchttpclient/pom.xml b/aether-connector-asynchttpclient/pom.xml -index 069655b..b242494 100644 +index f9ee05d..2dd2849 100644 --- a/aether-connector-asynchttpclient/pom.xml +++ b/aether-connector-asynchttpclient/pom.xml -@@ -56,24 +56,6 @@ +@@ -52,29 +52,6 @@ aether-test-util test - +- org.sonatype.sisu +- sisu-inject-plexus +- test +- +- - org.mortbay.jetty - jetty - 6.1.25 @@ -37,23 +41,6 @@ index 069655b..b242494 100644 -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 @@ - ${wagonVersion} - test - -- -- org.sonatype.http-testing-harness -- server-provider -- 0.4.1 -- test -- - - - -- -1.7.4 +1.7.7.6 diff --git a/0002-Remove-clirr-plugin.patch b/0002-Remove-clirr-plugin.patch new file mode 100644 index 0000000..2b99489 --- /dev/null +++ b/0002-Remove-clirr-plugin.patch @@ -0,0 +1,85 @@ +From ff3882c600b2c3b376eed773de39f135e81c129f Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky +Date: Tue, 31 Jan 2012 12:46:44 +0100 +Subject: [PATCH 2/3] Remove clirr plugin + +--- + aether-api/pom.xml | 4 ---- + aether-spi/pom.xml | 4 ---- + aether-util/pom.xml | 4 ---- + pom.xml | 14 -------------- + 4 files changed, 0 insertions(+), 26 deletions(-) + +diff --git a/aether-api/pom.xml b/aether-api/pom.xml +index bd34644..a2a7bc1 100644 +--- a/aether-api/pom.xml ++++ b/aether-api/pom.xml +@@ -38,10 +38,6 @@ + org.codehaus.mojo + animal-sniffer-maven-plugin + +- +- org.codehaus.mojo +- clirr-maven-plugin +- + + + +diff --git a/aether-spi/pom.xml b/aether-spi/pom.xml +index 3b19a36..53fb5e0 100644 +--- a/aether-spi/pom.xml ++++ b/aether-spi/pom.xml +@@ -37,10 +37,6 @@ + org.codehaus.mojo + animal-sniffer-maven-plugin + +- +- org.codehaus.mojo +- clirr-maven-plugin +- + + + +diff --git a/aether-util/pom.xml b/aether-util/pom.xml +index e52c2f8..ae3d218 100644 +--- a/aether-util/pom.xml ++++ b/aether-util/pom.xml +@@ -47,10 +47,6 @@ + org.codehaus.mojo + animal-sniffer-maven-plugin + +- +- org.codehaus.mojo +- clirr-maven-plugin +- + + + +diff --git a/pom.xml b/pom.xml +index 1f13aa4..02cc979 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -211,20 +211,6 @@ + + + +- org.codehaus.mojo +- clirr-maven-plugin +- 2.3 +- +- +- check-api-compat +- verify +- +- check-no-fork +- +- +- +- +- + org.codehaus.plexus + plexus-component-metadata + 1.5.5 +-- +1.7.7.6 + diff --git a/0003-Remove-some-test-deps-for-skipped-tests.patch b/0003-Remove-some-test-deps-for-skipped-tests.patch new file mode 100644 index 0000000..931ef7d --- /dev/null +++ b/0003-Remove-some-test-deps-for-skipped-tests.patch @@ -0,0 +1,40 @@ +From 88ce9b79cc96d44df4eaaecb6565d67d7f75faed Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky +Date: Tue, 31 Jan 2012 12:52:01 +0100 +Subject: [PATCH 3/3] Remove some test deps for skipped tests + +--- + aether-connector-wagon/pom.xml | 17 ----------------- + 1 files changed, 0 insertions(+), 17 deletions(-) + +diff --git a/aether-connector-wagon/pom.xml b/aether-connector-wagon/pom.xml +index 465e811..dfd9f60 100644 +--- a/aether-connector-wagon/pom.xml ++++ b/aether-connector-wagon/pom.xml +@@ -65,23 +65,6 @@ + org.sonatype.sisu + sisu-inject-plexus + +- +- org.sonatype.aether +- aether-test-util +- test +- +- +- org.apache.maven.wagon +- wagon-http-lightweight +- ${wagonVersion} +- test +- +- +- org.sonatype.http-testing-harness +- server-provider +- 0.4.1 +- test +- + + + +-- +1.7.7.6 + diff --git a/aether.spec b/aether.spec index 49deb5a..68490e5 100644 --- a/aether.spec +++ b/aether.spec @@ -1,6 +1,6 @@ Name: aether -Version: 1.11 -Release: 4%{?dist} +Version: 1.13.1 +Release: 1%{?dist} Summary: Sonatype library to resolve, install and deploy artifacts the Maven way Group: Development/Libraries @@ -11,7 +11,8 @@ URL: https://docs.sonatype.org/display/AETHER/Home Source0: %{name}-%{version}.tar.bz2 Patch0: 0001-Remove-sonatype-test-dependencies.patch - +Patch1: 0002-Remove-clirr-plugin.patch +Patch2: 0003-Remove-some-test-deps-for-skipped-tests.patch BuildArch: noarch BuildRequires: maven @@ -29,11 +30,12 @@ BuildRequires: mojo-parent BuildRequires: async-http-client >= 1.6.1 BuildRequires: sonatype-oss-parent +# required by netty really, but we push this dep on level higer +BuildRequires: jboss-parent +Requires: jboss-parent Requires: async-http-client >= 1.6.1 Requires: java >= 1:1.6.0 -Requires(post): jpackage-utils -Requires(postun): jpackage-utils %description @@ -55,6 +57,9 @@ Requires: jpackage-utils # we'd need org.sonatype.http-testing-harness so let's remove async # and wagon http tests (leave others enabled) %patch0 -p1 +%patch1 -p1 +%patch2 -p1 + rm -rf aether-connector-asynchttpclient/src/test rm -rf aether-connector-wagon/src/test @@ -73,7 +78,7 @@ pushd $module install -m 644 target/$module-*.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$jarname.jar install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-$jarname.pom - %add_to_maven_depmap org.sonatype.aether $module %{version} JPP/%{name} $jarname + %add_maven_depmap JPP.%{name}-$jarname.pom %{name}/$jarname.jar popd done @@ -81,13 +86,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-parent.pom -%add_to_maven_depmap org.sonatype.aether %{name}-parent %{version} JPP/%{name} parent - -%post -%update_maven_depmap - -%postun -%update_maven_depmap +%add_maven_depmap JPP.%{name}-parent.pom %files %doc README.md @@ -99,6 +98,10 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-parent.pom %{_javadocdir}/%{name} %changelog +* Tue Jan 31 2012 Stanislav Ochotnicky - 1.13.1-1 +- Update to latest upstream +- Update spec to latest guidelines + * Thu Jan 12 2012 Fedora Release Engineering - 1.11-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index f69c5c5..db9c1d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -109d640aca6ae62beeedf57205ae34ec aether-1.11.tar.bz2 +a02f091d4e00e8fe6f35508ba60d95e6 aether-1.13.1.tar.bz2