From 4a60b7b09a59bfac9abfe1794de0c057bf52f3c0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Jun 28 2012 13:22:17 +0000 Subject: Replace pom.xml patches with pom macros --- diff --git a/0001-Remove-sonatype-test-dependencies.patch b/0001-Remove-sonatype-test-dependencies.patch deleted file mode 100644 index 958f90f..0000000 --- a/0001-Remove-sonatype-test-dependencies.patch +++ /dev/null @@ -1,46 +0,0 @@ -From d03b97292c144260f824c4918174b153b632aa02 Mon Sep 17 00:00:00 2001 -From: Stanislav Ochotnicky -Date: Fri, 25 Feb 2011 14:52:23 +0100 -Subject: [PATCH 1/3] Remove sonatype test dependencies - ---- - 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 f9ee05d..2dd2849 100644 ---- a/aether-connector-asynchttpclient/pom.xml -+++ b/aether-connector-asynchttpclient/pom.xml -@@ -52,29 +52,6 @@ - aether-test-util - test - -- -- org.sonatype.sisu -- sisu-inject-plexus -- test -- -- -- org.mortbay.jetty -- jetty -- 6.1.25 -- test -- -- -- org.sonatype.http-testing-harness -- junit-runner -- 0.4.1 -- test -- -- -- org.sonatype.http-testing-harness -- server-provider -- 0.4.1 -- test -- - - - --- -1.7.7.6 - diff --git a/0002-Remove-clirr-plugin.patch b/0002-Remove-clirr-plugin.patch deleted file mode 100644 index 2b99489..0000000 --- a/0002-Remove-clirr-plugin.patch +++ /dev/null @@ -1,85 +0,0 @@ -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 deleted file mode 100644 index 931ef7d..0000000 --- a/0003-Remove-some-test-deps-for-skipped-tests.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 121807f..d3630b3 100644 --- a/aether.spec +++ b/aether.spec @@ -1,6 +1,6 @@ Name: aether Version: 1.13.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Sonatype library to resolve, install and deploy artifacts the Maven way Group: Development/Libraries @@ -10,9 +10,6 @@ URL: https://docs.sonatype.org/display/AETHER/Home # 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 -Patch1: 0002-Remove-clirr-plugin.patch -Patch2: 0003-Remove-some-test-deps-for-skipped-tests.patch BuildArch: noarch BuildRequires: maven @@ -56,12 +53,17 @@ 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 +for module in asynchttpclient wagon; do ( + cd ./aether-connector-$module + rm -rf src/test + # Removes all dependencies with test scope + %pom_xpath_remove "pom:dependency[pom:scope[text()='test']]" +) done + +# Remove clirr plugin +%pom_remove_plugin :clirr-maven-plugin +%pom_remove_plugin :clirr-maven-plugin aether-api +%pom_remove_plugin :clirr-maven-plugin aether-spi %build mvn-rpmbuild install javadoc:aggregate @@ -98,6 +100,9 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-parent.pom %{_javadocdir}/%{name} %changelog +* Thu Jun 28 2012 Mikolaj Izdebski - 1.13.1-3 +- Replace pom.xml patches with pom macros + * Thu Apr 19 2012 Alexander Kurtakov 1.13.1-2 - Install aether-connector-asynchttpclient - it was build but not installed.