[java-sig-commits] [maven-jar-plugin] Build with maven 3.

[Alexander Kurtakov]

commit 6129b01da1b40362332286e4c3f7d66b3b3dcd5c
Author: Alexander Kurtakov <akurtakov(a)gmail.com&gt;
Date:   Fri Jun 17 20:20:55 2011 +0300

    Build with maven 3.

 maven-jar-plugin.spec |   35 ++++++++++-------------------------
 1 files changed, 10 insertions(+), 25 deletions(-)
---
diff --git a/maven-jar-plugin.spec b/maven-jar-plugin.spec
index 5cb69a9..8fc604c 100644
--- a/maven-jar-plugin.spec
+++ b/maven-jar-plugin.spec
@@ -1,18 +1,17 @@
 Name:           maven-jar-plugin
 Version:        2.3.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Maven JAR Plugin
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-jar-plugin/
 Source0:       
http://repo2.maven.org/maven2/org/apache/maven/plugins/maven-jar-plugin/2...
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
 
 BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: maven2
+BuildRequires: maven
 BuildRequires: maven-plugin-plugin
 BuildRequires: maven-jar-plugin
 BuildRequires: maven-install-plugin
@@ -28,7 +27,7 @@ BuildRequires: plexus-archiver
 BuildRequires: apache-commons-lang
 BuildRequires: plexus-utils
 BuildRequires: junit
-Requires: maven2
+Requires: maven
 Requires: maven-archiver
 Requires: plexus-archiver
 Requires: maven-archiver
@@ -63,23 +62,14 @@ API documentation for %{name}.
 sed -i -e "s|plexus-container-default|plexus-container|g" pom.xml
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
-        -e \
-        -Dmaven2.jpp.mode=true \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild \
         -Dmaven.test.skip=true \
         install javadoc:javadoc
 
 %install
-rm -rf %{buildroot}
-
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar  
%{buildroot}%{_javadir}/%{name}-%{version}.jar
-
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
-    do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -m 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}.jar
 
 %add_to_maven_depmap org.apache.maven.plugins maven-jar-plugin %{version} JPP
maven-jar-plugin
 
@@ -89,10 +79,8 @@ install -pm 644 pom.xml \
     %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
 # javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-rm -rf target/site/api*
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 
 %post
 %update_maven_depmap
@@ -100,21 +88,18 @@ rm -rf target/site/api*
 %postun
 %update_maven_depmap
 
-%clean
-rm -rf %{buildroot}
-
 %files
-%defattr(-,root,root,-)
 %{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri Jun 17 2011 Alexander Kurtakov <akurtako(a)redhat.com&gt; 2.3.1-3
+- Build with maven 3.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org&gt; -
2.3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild