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

[Alexander Kurtakov]

commit d067b097fed7019b06d049998e1f097c04b849c5
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Fri Jun 3 16:28:42 2011 +0300

    Build with maven v3.
    
    Adapt to current guidelines.

 maven-verifier-plugin.spec |   45 ++++++++++++++-----------------------------
 1 files changed, 15 insertions(+), 30 deletions(-)
---
diff --git a/maven-verifier-plugin.spec b/maven-verifier-plugin.spec
index 44f496b..6b9a121 100644
--- a/maven-verifier-plugin.spec
+++ b/maven-verifier-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-verifier-plugin
 Version:        1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Maven Verifier Plugin
 
 Group:          Development/Libraries
@@ -9,27 +9,26 @@ URL:            http://maven.apache.org/plugins/maven-verifier-plugin/
 #svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-verifier-plugin-1.0/
 #tar -zcf maven-verifier-plugin-1.0.tar.gz maven-verifier-plugin-1.0/
 Source0:        %{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
 
 BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: jpackage-utils
-BuildRequires: maven2
+BuildRequires: maven
 BuildRequires: maven-plugin-plugin
 BuildRequires: maven-compiler-plugin
 BuildRequires: maven-install-plugin
 BuildRequires: maven-jar-plugin
 BuildRequires: maven-javadoc-plugin
 BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
 BuildRequires: junit
 BuildRequires: plexus-utils
 BuildRequires: maven-surefire-provider-junit
 
-Requires:       maven2
-Requires:       java
-Requires:       jpackage-utils
+Requires: maven
+Requires: java
+Requires: jpackage-utils
 Requires: junit
 Requires: plexus-utils
 
@@ -56,21 +55,11 @@ API documentation for %{name}.
 %setup -q 
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
-        -e \
-        -Dmaven2.jpp.mode=true \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-        install javadoc:javadoc
+mvn-rpmbuild install javadoc:javadoc
 
 %install
-rm -rf %{buildroot}
-
 # jars
-install -Dpm 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 -Dpm 644 target/%{name}-%{version}.jar  %{buildroot}%{_javadir}/%{name}.jar
 
 %add_to_maven_depmap org.apache.maven.plugins maven-verifier-plugin %{version} JPP maven-verifier-plugin
 
@@ -78,10 +67,8 @@ install -Dpm 644 target/%{name}-%{version}.jar  %{buildroot}%{_javadir}/%{name}-
 install -Dpm 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
@@ -89,21 +76,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}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri Jun 3 2011 Alexander Kurtakov <akurtako at redhat.com> 1.0-4
+- Build with maven v3.
+- Adapt to current guidelines.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
@@ -111,4 +96,4 @@ rm -rf %{buildroot}
 - Add missing requires maven2
 
 * Wed Jun 02 2010 Hui Wang <huwang at redhat.com> - 1.0-1
-- Initial version of the package
\ No newline at end of file
+- Initial version of the package