[maven-wagon-ahc] Disable 2 test deps, and 1 plugin from POM to build on f19+

Gerard Ryan galileo at fedoraproject.org
Wed Apr 10 22:25:39 UTC 2013


commit 2672a3f95d6d24fce22f7dfd2d814b72b22f555e
Author: Gerard Ryan <gerard at ryan.lt>
Date:   Wed Apr 10 23:25:12 2013 +0100

    Disable 2 test deps, and 1 plugin from POM to build on f19+

 maven-wagon-ahc.spec |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/maven-wagon-ahc.spec b/maven-wagon-ahc.spec
index cb0d739..925c185 100644
--- a/maven-wagon-ahc.spec
+++ b/maven-wagon-ahc.spec
@@ -1,6 +1,6 @@
 Name:		maven-wagon-ahc
 Version:	1.2.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	A wagon provider for HTTP transfers
 
 Group:		Development/Libraries
@@ -15,7 +15,6 @@ Source2:	http://www.apache.org/licenses/LICENSE-2.0.txt
 
 BuildArch:	noarch
 
-BuildRequires:	animal-sniffer
 BuildRequires:	async-http-client
 BuildRequires:	easymock2
 BuildRequires:	forge-parent
@@ -32,12 +31,6 @@ BuildRequires:	maven-wagon
 BuildRequires:	plexus-containers-container-default
 BuildRequires:	plexus-utils
 
-Requires:	async-http-client
-Requires:	java
-Requires:	jpackage-utils
-Requires:	maven-wagon
-Requires:	plexus-utils
-
 
 %description
 A wagon provider for HTTP transfers based on the async-http-client.
@@ -45,7 +38,6 @@ A wagon provider for HTTP transfers based on the async-http-client.
 %package javadoc
 Summary:	Javadocs for %{name}
 Group:		Documentation
-Requires:	jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -58,6 +50,14 @@ find -name '*.jar' -delete
 
 cp %{SOURCE1} .
 
+# We're not testing yet so these aren't necessary
+%pom_remove_dep org.apache.maven.wagon:wagon-provider-test
+%pom_remove_dep ch.qos.logback:logback-classic
+
+# This plugin breaks build on f19+
+# It's just checking for compatibility with older JDK API
+%pom_remove_plugin org.codehaus.mojo:animal-sniffer-maven-plugin
+
 %build
 # we don't have all test deps, so tests fail
 mvn-rpmbuild package javadoc:aggregate -Dmaven.test.skip=true
@@ -86,6 +86,10 @@ install -p -m 0644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 
 
 %changelog
+* Wed Apr 10 2013 Gerard Ryan <galileo at fedoraproject.org> - 1.2.1-6
+- Disable 2 test deps, and 1 plugin from POM to build on f19+
+- Remove requires
+
 * Wed Apr 10 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.2.1-5
 - Don't build-require plexus-container-default
 - Resolves: rhbz#950513


More information about the scm-commits mailing list