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

[Alexander Kurtakov]

commit 802d3e8173750241d4598b211926bfb6c4f7f61d
Author: Alexander Kurtakov <akurtakov at gmail.com>
Date:   Thu Jun 9 02:05:22 2011 +0300

    Build with maven 3.x.

 maven-docck-plugin.spec |   42 +++++++++++++-----------------------------
 1 files changed, 13 insertions(+), 29 deletions(-)
---
diff --git a/maven-docck-plugin.spec b/maven-docck-plugin.spec
index ee90df9..35cb051 100644
--- a/maven-docck-plugin.spec
+++ b/maven-docck-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-docck-plugin
 Version:        1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Maven Documentation Checker Plugin
 
 Group:          Development/Libraries
@@ -9,26 +9,25 @@ URL:            http://maven.apache.org/plugins/maven-docck-plugin/
 #svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-docck-plugin-1.0/
 #tar jcf maven-docck-plugin-1.0.tar.bz2 maven-docck-plugin-1.0/
 Source0:        %{name}-%{version}.tar.bz2
-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: maven-shared
-BuildRequires: commons-httpclient
+BuildRequires: jakarta-commons-httpclient
 BuildRequires: maven-plugin-tools
 BuildRequires: plexus-utils
 
-Requires:       maven2
+Requires:       maven
 Requires:       java
 Requires:       jpackage-utils
 Requires:       apache-commons-logging
@@ -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 %{name} %{version} JPP %{name}
 
@@ -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,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
+* Thu Jun 9 2011 Alexander Kurtakov <akurtako at redhat.com> 1.0-5
+- Build with maven 3.x.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
@@ -117,4 +101,4 @@ rm -rf %{buildroot}
 - Used macros in add_to_maven_depmap
 
 * Tue Jun 01 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