[plexus-active-collections] Build with maven 3.x.

[Alexander Kurtakov]

commit 36c625d4e0c9287220f3100ce6d5c6c4b04f72ef
Author: Alexander Kurtakov <akurtakov at gmail.com>
Date:   Sun Jun 12 14:07:36 2011 +0300

    Build with maven 3.x.

 plexus-active-collections.spec |   62 +++++++++++++++-------------------------
 1 files changed, 23 insertions(+), 39 deletions(-)
---
diff --git a/plexus-active-collections.spec b/plexus-active-collections.spec
index 7cbfe25..ba6bd23 100644
--- a/plexus-active-collections.spec
+++ b/plexus-active-collections.spec
@@ -1,8 +1,8 @@
-%define project_version 1.0-beta-2
+%global project_version 1.0-beta-2
 
 Name:           plexus-active-collections
 Version:        1.0
-Release:        0.3.beta2%{?dist}
+Release:        0.4.beta2%{?dist}
 Summary:        Plexus Container-Backed Active Collections
 
 Group:          Development/Libraries
@@ -11,26 +11,25 @@ URL:            http://plexus.codehaus.org/
 #svn export http://svn.codehaus.org/plexus/tags/plexus-active-collections-1.0-beta-2/
 #tar zcf plexus-active-collections-1.0-beta-2.tar.gz plexus-active-collections-1.0-beta-2/
 Source0:        plexus-active-collections-1.0-beta-2.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
 
 BuildRequires:  java >= 1:1.6.0
 BuildRequires:  jpackage-utils >= 0:1.7.2
-BuildRequires:  ant, ant-nodeps
-BuildRequires:  maven2 >= 0:2.0.4-9
-BuildRequires:  maven2-plugin-assembly
-BuildRequires:  maven2-plugin-compiler
-BuildRequires:  maven2-plugin-install
-BuildRequires:  maven2-plugin-jar
-BuildRequires:  maven2-plugin-resources
-BuildRequires:  maven2-plugin-site
-BuildRequires:  maven2-plugin-plugin
-BuildRequires:  maven-surefire-maven-plugin
+BuildRequires:  ant
+BuildRequires:  maven
+BuildRequires:  maven-assembly-plugin
+BuildRequires:  maven-compiler-plugin
+BuildRequires:  maven-install-plugin
+BuildRequires:  maven-jar-plugin
+BuildRequires:  maven-resources-plugin
+BuildRequires:  maven-site-plugin
+BuildRequires:  maven-plugin-plugin
+BuildRequires:  maven-surefire-plugin
 BuildRequires:  maven-surefire-provider-junit
-BuildRequires:  maven2-plugin-javadoc
+BuildRequires:  maven-javadoc-plugin
 BuildRequires:  maven-shared-reporting-impl
-BuildRequires:  maven-shared-plugin-testing-harness
+BuildRequires:  maven-plugin-testing-harness
 BuildRequires:  maven-doxia
 BuildRequires:  maven-doxia-sitetools
 BuildRequires:  plexus-maven-plugin
@@ -54,8 +53,7 @@ Plexus Container-Backed Active Collections
 %package javadoc
 Group:          Documentation
 Summary:        Javadoc for %{name}
-
-Requires:          plexus-utils
+Requires:       jpackage-utils
 
 %description javadoc
 API documentation for %{name}.
@@ -65,23 +63,14 @@ API documentation for %{name}.
 %setup -q -n %{name}-%{project_version}
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
-        -e \
-        -Dmaven2.jpp.mode=true \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-        -Dmaven.test.skip=true \
+mvn-rpmbuild \
+        -Dmaven.test.failure.ignore=true \
         install javadoc:javadoc
 
 %install
-rm -rf %{buildroot}
-
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}/plexus
-install -m 644 target/%{name}-%{project_version}.jar %{buildroot}%{_javadir}/plexus
-
-(cd %{buildroot}%{_javadir}/plexus && for jar in *-%{project_version}*; \
-    do ln -sf ${jar} `echo $jar| sed "s|-%{project_version}||g"`; done)
+install -m 644 target/%{name}-%{project_version}.jar %{buildroot}%{_javadir}/plexus/%{name}.jar
 
 %add_to_maven_depmap org.codehaus.plexus %{name} %{project_version} JPP/plexus %{name}
 
@@ -91,10 +80,8 @@ install -pm 644 pom.xml \
     %{buildroot}%{_mavenpomdir}/JPP.plexus-%{name}.pom
 
 # javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/plexus/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/plexus/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/plexus/%{name}
-rm -rf target/site/api*
+install -d -m 0755 %{buildroot}%{_javadocdir}/plexus/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/plexus/%{name}/
 
 %post
 %update_maven_depmap
@@ -102,21 +89,18 @@ rm -rf target/site/api*
 %postun
 %update_maven_depmap
 
-%clean
-rm -rf %{buildroot}
-
 %files
-%defattr(-,root,root,-)
 %{_javadir}/plexus/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/plexus/%{name}-%{version}
 %{_javadocdir}/plexus/%{name}
 
 %changelog
+* Sun Jun 12 2011 Alexander Kurtakov <akurtako at redhat.com> 1.0-0.4.beta2
+- Build with maven 3.x.
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.3.beta2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild