[plexus-mail-sender] Build with maven 3.x

[Alexander Kurtakov]

commit 50502027e05e2bd67dc30fa569af17e179723dd2
Author: Alexander Kurtakov <akurtakov at gmail.com>
Date:   Sun Jun 12 15:07:38 2011 +0300

    Build with maven 3.x

 maven2-settings.xml            |   36 -----
 plexus-mail-sender-mapdeps.xsl |  328 ----------------------------------------
 plexus-mail-sender.spec        |   24 +--
 3 files changed, 9 insertions(+), 379 deletions(-)
---
diff --git a/plexus-mail-sender.spec b/plexus-mail-sender.spec
index b087c1c..004a22d 100644
--- a/plexus-mail-sender.spec
+++ b/plexus-mail-sender.spec
@@ -32,7 +32,7 @@
 
 Name:           plexus-mail-sender
 Version:        1.0
-Release:        0.a2.18%{?dist}.1
+Release:        0.a2.19%{?dist}
 Epoch:          0
 Summary:        Plexus Mail Sender
 License:        MIT and ASL 1.1
@@ -44,16 +44,14 @@ URL:            http://plexus.codehaus.org/
 # tar czf plexus-mail-sender-1.0-a2-src.tar.gz plexus-mail-sender-1.0-a2
 Source0:        plexus-mail-sender-%{version}-a2-src.tar.gz
 
-Source1:        %{name}-mapdeps.xsl
 Source2:        %{name}-jpp-depmap.xml
-Source3:        maven2-settings.xml
 
 # http://jira.codehaus.org/browse/PLX-417
 # http://fisheye.codehaus.org/rdiff/plexus?csid=8336&u&N
 Patch0:         %{name}-clarifylicense.patch
 
 BuildRequires:  jpackage-utils >= 0:1.6
-BuildRequires:  maven2 >= 0:2.0.4
+BuildRequires:  maven
 BuildRequires:  maven-compiler-plugin
 BuildRequires:  maven-install-plugin
 BuildRequires:  maven-jar-plugin
@@ -102,13 +100,8 @@ find . -name release-pom.xml -exec \
      sed -i 's:<groupId>plexus</groupId>:<groupId>org.codehaus.plexus</groupId>:' \{\} \;
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp \
-        -e \
-        -Dmaven2.jpp.depmap.file="%{SOURCE2}" \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild \
+        -Dmaven.local.depmap.file="%{SOURCE2}" \
         -Dmaven.test.skip=true \
         install javadoc:aggregate
 
@@ -119,7 +112,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 pushd plexus-mail-senders
 for mod in javamail simple test;do
     pushd %{name}-$mod
-    install -pm 644 target/%{name}-$mod-%{namedversion}-SNAPSHOT.jar \
+    install -pm 644 target/%{name}-$mod-%{namedversion}.jar \
             $RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-$mod.jar
     install -pm 644 release-pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.plexus-mail-sender-$mod.pom
     %add_to_maven_depmap org.codehaus.plexus %{name}-$mod %{version} JPP/plexus mail-sender-$mod
@@ -129,7 +122,7 @@ done
 popd
 
 install -pm 644 \
-  %{name}-api/target/%{name}-api-%{namedversion}-SNAPSHOT.jar \
+  %{name}-api/target/%{name}-api-%{namedversion}.jar \
   $RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-api.jar
 install -pm 644 %{name}-api/release-pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.plexus-mail-sender-api.pom
 %add_to_maven_depmap org.codehaus.plexus %{name}-api %{version} JPP/plexus mail-sender-api
@@ -149,16 +142,17 @@ cp -pr target/site/apidocs/* \
 
 
 %files
-%defattr(-,root,root,-)
 %{_mavendepmapfragdir}/%{name}
 %{_mavenpomdir}/*pom
 %{_javadir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/*
 
 %changelog
+* Sun Jun 12 2011 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.a2.19
+- Build with maven 3.x
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-0.a2.18.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild