[java-sig-commits] [maven-stage-plugin] Build with maven v3.

[Alexander Kurtakov]

commit 019ec210e1dbd59c820d0bfd05c2afc6204bc8b4
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Fri Jun 3 16:36:09 2011 +0300

    Build with maven v3.
    
    Adapt to current guidelines.

 maven-stage-plugin.spec |   46 +++++++++++++++-------------------------------
 1 files changed, 15 insertions(+), 31 deletions(-)
---
diff --git a/maven-stage-plugin.spec b/maven-stage-plugin.spec
index a7be007..733e25c 100644
--- a/maven-stage-plugin.spec
+++ b/maven-stage-plugin.spec
@@ -1,7 +1,7 @@
-%define project_version 1.0-alpha-2
+%global project_version 1.0-alpha-2
 Name:           maven-stage-plugin
 Version:        1.0
-Release:        0.2.alpha2%{?dist}
+Release:        0.3.alpha2%{?dist}
 Summary:        Plugin to copy artifacts from one repository to another
 
 Group:          Development/Libraries
@@ -11,26 +11,24 @@ 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
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch: noarch
 
 BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: plexus-utils
-BuildRequires: ant-nodeps
-BuildRequires: maven2
+BuildRequires: ant
+BuildRequires: maven
 BuildRequires: maven-install-plugin
 BuildRequires: maven-compiler-plugin
 BuildRequires: maven-plugin-plugin
 BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-maven-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
-Requires: ant-nodeps
-Requires: maven2
+Requires: ant
+Requires: maven
 Requires: jpackage-utils
 Requires: java
 Requires(post): jpackage-utils
@@ -57,24 +55,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 \
+mvn-rpmbuild \
         -Dmaven.test.failure.ignore=true \
         install javadoc:javadoc
 
 %install
-rm -rf %{buildroot}
-
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{project_version}.jar   %{buildroot}%{_javadir}/%{name}-%{project_version}.jar
-
-(cd %{buildroot}%{_javadir} && 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}/%{name}.jar
 
 %add_to_maven_depmap org.apache.maven.plugins %{name} %{project_version} JPP %{name}
 
@@ -84,10 +72,8 @@ install -pm 644 pom.xml \
     %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
 # javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{project_version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{project_version}/
-ln -s %{name}-%{project_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
@@ -95,21 +81,19 @@ 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}-%{project_version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri Jun 3 2011 Alexander Kurtakov <akurtako at redhat.com> 1.0-0.3.alpha2
+- Build with maven v3.
+- Adapt to current guidelines.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.2.alpha2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild