From 941b22c66df5dd207f5c1fe5216f132ca5931287 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 2 Apr 2013 15:38:49 +0100 Subject: [PATCH] Fix FTBFS rhbz #914586 --- xml-maven-plugin.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/xml-maven-plugin.spec b/xml-maven-plugin.spec index a093b7b..8188879 100644 --- a/xml-maven-plugin.spec +++ b/xml-maven-plugin.spec @@ -1,6 +1,6 @@ Name: xml-maven-plugin Version: 1.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Maven XML Plugin Group: Development/Libraries License: ASL 2.0 @@ -14,6 +14,8 @@ BuildRequires: mojo-parent BuildRequires: apache-rat-plugin BuildRequires: maven-local BuildRequires: maven-changes-plugin +BuildRequires: maven-checkstyle-plugin +BuildRequires: maven-clean-plugin BuildRequires: maven-compiler-plugin BuildRequires: maven-enforcer-plugin BuildRequires: maven-install-plugin @@ -21,7 +23,6 @@ BuildRequires: maven-invoker-plugin BuildRequires: maven-jar-plugin BuildRequires: maven-javadoc-plugin BuildRequires: maven-plugin-testing-harness -BuildRequires: maven-surefire-plugin BuildRequires: maven-plugin-cobertura BuildRequires: plexus-component-api @@ -59,8 +60,13 @@ done rm -rf src/it/it8 rm -rf src/it/mojo-1438-validate +# In maven 3, the functionality we need has been moved to maven-core +%pom_remove_dep org.apache.maven:maven-project +%pom_add_dep org.apache.maven:maven-core + %build -mvn-rpmbuild -DskipTests -Dmaven.test.skip=true -DskipITs install javadoc:aggregate +mvn-rpmbuild -Dmojo.java.target=1.5 -Dmaven.test.skip=true -DskipITs \ + install javadoc:aggregate %install mkdir -p %{buildroot}%{_javadir} @@ -87,6 +93,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/xml-maven-plugin %doc LICENSE.txt NOTICE.txt %changelog +* Tue Mar 02 2013 Mat Booth - 1.0-7 +- Fix FTBFS rhbz #914586 + * Fri Feb 15 2013 Fedora Release Engineering - 1.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild