Replace pom.xml patches with pom macros
This commit is contained in:
Mikolaj Izdebski
parent
cbe70781f3
commit
4a60b7b09a
4 changed files with 14 additions and 180 deletions
|
|
@ -1,46 +0,0 @@
|
||||||
From d03b97292c144260f824c4918174b153b632aa02 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
|
|
||||||
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 @@
|
|
||||||
<artifactId>aether-test-util</artifactId>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
- <dependency>
|
|
||||||
- <groupId>org.sonatype.sisu</groupId>
|
|
||||||
- <artifactId>sisu-inject-plexus</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.4.1</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.7.6
|
|
||||||
|
|
||||||
|
|
@ -1,85 +0,0 @@
|
||||||
From ff3882c600b2c3b376eed773de39f135e81c129f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
|
|
||||||
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 @@
|
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
|
||||||
<artifactId>animal-sniffer-maven-plugin</artifactId>
|
|
||||||
</plugin>
|
|
||||||
- <plugin>
|
|
||||||
- <groupId>org.codehaus.mojo</groupId>
|
|
||||||
- <artifactId>clirr-maven-plugin</artifactId>
|
|
||||||
- </plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
</project>
|
|
||||||
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 @@
|
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
|
||||||
<artifactId>animal-sniffer-maven-plugin</artifactId>
|
|
||||||
</plugin>
|
|
||||||
- <plugin>
|
|
||||||
- <groupId>org.codehaus.mojo</groupId>
|
|
||||||
- <artifactId>clirr-maven-plugin</artifactId>
|
|
||||||
- </plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
</project>
|
|
||||||
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 @@
|
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
|
||||||
<artifactId>animal-sniffer-maven-plugin</artifactId>
|
|
||||||
</plugin>
|
|
||||||
- <plugin>
|
|
||||||
- <groupId>org.codehaus.mojo</groupId>
|
|
||||||
- <artifactId>clirr-maven-plugin</artifactId>
|
|
||||||
- </plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
</project>
|
|
||||||
diff --git a/pom.xml b/pom.xml
|
|
||||||
index 1f13aa4..02cc979 100644
|
|
||||||
--- a/pom.xml
|
|
||||||
+++ b/pom.xml
|
|
||||||
@@ -211,20 +211,6 @@
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
- <groupId>org.codehaus.mojo</groupId>
|
|
||||||
- <artifactId>clirr-maven-plugin</artifactId>
|
|
||||||
- <version>2.3</version>
|
|
||||||
- <executions>
|
|
||||||
- <execution>
|
|
||||||
- <id>check-api-compat</id>
|
|
||||||
- <phase>verify</phase>
|
|
||||||
- <goals>
|
|
||||||
- <goal>check-no-fork</goal>
|
|
||||||
- </goals>
|
|
||||||
- </execution>
|
|
||||||
- </executions>
|
|
||||||
- </plugin>
|
|
||||||
- <plugin>
|
|
||||||
<groupId>org.codehaus.plexus</groupId>
|
|
||||||
<artifactId>plexus-component-metadata</artifactId>
|
|
||||||
<version>1.5.5</version>
|
|
||||||
--
|
|
||||||
1.7.7.6
|
|
||||||
|
|
||||||
|
|
@ -1,40 +0,0 @@
|
||||||
From 88ce9b79cc96d44df4eaaecb6565d67d7f75faed Mon Sep 17 00:00:00 2001
|
|
||||||
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
|
|
||||||
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 @@
|
|
||||||
<groupId>org.sonatype.sisu</groupId>
|
|
||||||
<artifactId>sisu-inject-plexus</artifactId>
|
|
||||||
</dependency>
|
|
||||||
- <dependency>
|
|
||||||
- <groupId>org.sonatype.aether</groupId>
|
|
||||||
- <artifactId>aether-test-util</artifactId>
|
|
||||||
- <scope>test</scope>
|
|
||||||
- </dependency>
|
|
||||||
- <dependency>
|
|
||||||
- <groupId>org.apache.maven.wagon</groupId>
|
|
||||||
- <artifactId>wagon-http-lightweight</artifactId>
|
|
||||||
- <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.7.6
|
|
||||||
|
|
||||||
23
aether.spec
23
aether.spec
|
|
@ -1,6 +1,6 @@
|
||||||
Name: aether
|
Name: aether
|
||||||
Version: 1.13.1
|
Version: 1.13.1
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: Sonatype library to resolve, install and deploy artifacts the Maven way
|
Summary: Sonatype library to resolve, install and deploy artifacts the Maven way
|
||||||
|
|
||||||
Group: Development/Libraries
|
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
|
# git archive --prefix="aether-1.11/" --format=tar aether-1.11 | bzip2 > aether-1.11.tar.bz2
|
||||||
Source0: %{name}-%{version}.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
|
BuildArch: noarch
|
||||||
|
|
||||||
BuildRequires: maven
|
BuildRequires: maven
|
||||||
|
|
@ -56,12 +53,17 @@ Requires: jpackage-utils
|
||||||
|
|
||||||
# we'd need org.sonatype.http-testing-harness so let's remove async
|
# we'd need org.sonatype.http-testing-harness so let's remove async
|
||||||
# and wagon http tests (leave others enabled)
|
# and wagon http tests (leave others enabled)
|
||||||
%patch0 -p1
|
for module in asynchttpclient wagon; do (
|
||||||
%patch1 -p1
|
cd ./aether-connector-$module
|
||||||
%patch2 -p1
|
rm -rf src/test
|
||||||
|
# Removes all dependencies with test scope
|
||||||
|
%pom_xpath_remove "pom:dependency[pom:scope[text()='test']]"
|
||||||
|
) done
|
||||||
|
|
||||||
rm -rf aether-connector-asynchttpclient/src/test
|
# Remove clirr plugin
|
||||||
rm -rf aether-connector-wagon/src/test
|
%pom_remove_plugin :clirr-maven-plugin
|
||||||
|
%pom_remove_plugin :clirr-maven-plugin aether-api
|
||||||
|
%pom_remove_plugin :clirr-maven-plugin aether-spi
|
||||||
|
|
||||||
%build
|
%build
|
||||||
mvn-rpmbuild install javadoc:aggregate
|
mvn-rpmbuild install javadoc:aggregate
|
||||||
|
|
@ -98,6 +100,9 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-parent.pom
|
||||||
%{_javadocdir}/%{name}
|
%{_javadocdir}/%{name}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jun 28 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.13.1-3
|
||||||
|
- Replace pom.xml patches with pom macros
|
||||||
|
|
||||||
* Thu Apr 19 2012 Alexander Kurtakov <akurtako@redhat.com> 1.13.1-2
|
* Thu Apr 19 2012 Alexander Kurtakov <akurtako@redhat.com> 1.13.1-2
|
||||||
- Install aether-connector-asynchttpclient - it was build but not installed.
|
- Install aether-connector-asynchttpclient - it was build but not installed.
|
||||||
|
|
||||||
|
|
|
||||||
Reference in a new issue