[maven-stage-plugin/f17] Fixed build, guidelines fixes, failed tests are no longer ignored

[Tomas Radej]

commit 9256d627d575f114e6b13c48a73c511b79580dd4
Author: Tomas Radej <tradej at redhat.com>
Date:   Tue Apr 24 15:25:45 2012 +0200

    Fixed build, guidelines fixes, failed tests are no longer ignored

 maven-stage-plugin-plexus-maven-plugin.patch |   19 ++++++++++++
 maven-stage-plugin.spec                      |   41 ++++++++++++-------------
 2 files changed, 39 insertions(+), 21 deletions(-)
---
diff --git a/maven-stage-plugin-plexus-maven-plugin.patch b/maven-stage-plugin-plexus-maven-plugin.patch
new file mode 100644
index 0000000..2dee555
--- /dev/null
+++ b/maven-stage-plugin-plexus-maven-plugin.patch
@@ -0,0 +1,19 @@
+diff --git a/pom.xml b/pom.xml
+index a499641..8d01284 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -141,12 +141,12 @@ under the License.
+     <plugins>
+       <plugin>
+         <groupId>org.codehaus.plexus</groupId>
+-        <artifactId>plexus-maven-plugin</artifactId>
++        <artifactId>plexus-component-metadata</artifactId>
+         <version>1.3.8</version>
+         <executions>
+           <execution>
+             <goals>
+-              <goal>descriptor</goal>
++              <goal>generate-metadata</goal>
+             </goals>
+           </execution>
+         </executions>
diff --git a/maven-stage-plugin.spec b/maven-stage-plugin.spec
index b9e1954..789f869 100644
--- a/maven-stage-plugin.spec
+++ b/maven-stage-plugin.spec
@@ -1,7 +1,7 @@
 %global project_version 1.0-alpha-2
 Name:           maven-stage-plugin
 Version:        1.0
-Release:        0.4.alpha2%{?dist}
+Release:        0.5.alpha2%{?dist}
 Summary:        Plugin to copy artifacts from one repository to another
 
 Group:          Development/Libraries
@@ -11,28 +11,30 @@ URL:            http://maven.apache.org/plugins/maven-stage-plugin/
 # tar jcf maven-stage-plugin-1.0-alpha-2.tar.bz2 maven-stage-plugin-1.0-alpha-2/
 Source0:        %{name}-%{project_version}.tar.bz2
 
+# Migrating from plexus-maven-plugin to plexus-containers-component-metadata
+Patch0:         %{name}-plexus-maven-plugin.patch
+
 BuildArch: noarch
 
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: plexus-utils
+BuildRequires: plexus-containers-component-metadata
 BuildRequires: ant
+BuildRequires: java-devel >= 1:1.6.0
+BuildRequires: jpackage-utils
 BuildRequires: maven
-BuildRequires: maven-install-plugin
 BuildRequires: maven-compiler-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
 BuildRequires: maven-plugin-plugin
+BuildRequires: maven-plugin-testing-harness
 BuildRequires: maven-resources-plugin
 BuildRequires: maven-surefire-plugin
 BuildRequires: maven-surefire-provider-junit
-BuildRequires: maven-plugin-testing-harness
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: jpackage-utils
+BuildRequires: plexus-utils
 Requires: ant
 Requires: maven
 Requires: jpackage-utils
 Requires: java
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils 
 
 Obsoletes: maven2-plugin-stage <= 0:2.0.8
 Provides: maven2-plugin-stage = 1:%{version}-%{release}
@@ -53,34 +55,26 @@ API documentation for %{name}.
 
 %prep
 %setup -q -n %{name}-%{project_version}
+%patch0 -p1
 
 %build
-mvn-rpmbuild \
-        -Dmaven.test.failure.ignore=true \
-        install javadoc:javadoc
+mvn-rpmbuild install javadoc:aggregate
 
 %install
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}
 install -m 644 target/%{name}-%{project_version}.jar   %{buildroot}%{_javadir}/%{name}.jar
 
-%add_to_maven_depmap org.apache.maven.plugins %{name} %{project_version} JPP %{name}
-
 # poms
 install -d -m 755 %{buildroot}%{_mavenpomdir}
 install -pm 644 pom.xml \
     %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 # javadoc
 install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 %files
 %{_javadir}/*
 %{_mavenpomdir}/*
@@ -90,6 +84,11 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Apr 24 2012 Tomas Radej <tradej at redhat.com> - 1.0-0.5.alpha2
+- Migrated from plexus-maven-plugin to plexus-containers-component-metadata
+- Guidelines fixes
+- Failed tests are no longer ignored
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.4.alpha2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild