[java-sig-commits] [maven-changelog-plugin] Build with maven 3

[Alexander Kurtakov]

commit a03dfb2c493581444770cac2e295aba98d63f3ae
Author: Alexander Kurtakov <akurtakov at gmail.com>
Date:   Fri Jun 17 20:15:10 2011 +0300

    Build with maven 3

 maven-changelog-plugin.spec |   39 ++++++++++++---------------------------
 1 files changed, 12 insertions(+), 27 deletions(-)
---
diff --git a/maven-changelog-plugin.spec b/maven-changelog-plugin.spec
index 7d8de5b..00ff08a 100644
--- a/maven-changelog-plugin.spec
+++ b/maven-changelog-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-changelog-plugin
 Version:        2.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Produce SCM changelog reports
 
 Group:          Development/Libraries
@@ -9,20 +9,19 @@ URL:            http://maven.apache.org/plugins/maven-changelog-plugin/
 #svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-changelog-plugin-2.2/
 #tar jcf maven-changelog-plugin-2.2.tar.bz2 maven-changelog-plugin-2.2/
 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: maven-doxia
 BuildRequires: maven-scm
@@ -32,7 +31,7 @@ BuildRequires: maven-plugin-testing-harness
 BuildRequires: plexus-container-default
 BuildRequires: netbeans-cvsclient
 
-Requires:       maven2
+Requires:       maven
 Requires:       java
 Requires:       jpackage-utils
 Requires:       plexus-utils
@@ -62,23 +61,14 @@ 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 \
+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 %{name} %{version} JPP %{name}
 
@@ -88,10 +78,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
@@ -99,21 +87,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 at redhat.com> 2.2-7
+- Build with maven 3.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
@@ -134,4 +119,4 @@ rm -rf %{buildroot}
 - Add missing requires
 
 * Mon May 31 2010 Hui Wang <huwang at redhat.com> - 2.2-1
-- Initial version of the package
\ No newline at end of file
+- Initial version of the package