[java-sig-commits] [maven-pmd-plugin] Update to current guidelines.

[Alexander Kurtakov]

commit 5a1dc81da4e844d3785051e9f09c28a0ccd7b2a3
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Tue Apr 26 13:33:43 2011 +0300

    Update to current guidelines.
    
    Use upstream source.

 maven-pmd-plugin-depmap.xml |   25 --------------------
 maven-pmd-plugin.spec       |   52 +++++++++++++++----------------------------
 2 files changed, 18 insertions(+), 59 deletions(-)
---
diff --git a/maven-pmd-plugin-depmap.xml b/maven-pmd-plugin-depmap.xml
index bc2ad44..a24ee7c 100644
--- a/maven-pmd-plugin-depmap.xml
+++ b/maven-pmd-plugin-depmap.xml
@@ -11,30 +11,5 @@
 		<version>4.2.5</version>
 	  </jpp>
 	</dependency>
-	<dependency>
-	  <maven>
-		<groupId>asm</groupId>
-		<artifactId>asm</artifactId>
-		<version>3.1</version>
-	  </maven>
-	  <jpp>
-		<groupId>JPP/objectweb-asm</groupId>
-		<artifactId>asm</artifactId>
-		<version>3.2</version>
-	  </jpp>
-	</dependency>
-	<dependency>
-	  <maven>
-		<groupId>org.apache.maven.shared</groupId>
-		<artifactId>maven-plugin-testing-harness</artifactId>
-		<version>1.1</version>
-	  </maven>
-	  <jpp>
-		<groupId>JPP/maven-plugin-testing</groupId>
-		<artifactId>maven-plugin-testing-harness</artifactId>
-		<version>1.1</version>
-	  </jpp>
-	</dependency>
-	
 </dependencies>
 
diff --git a/maven-pmd-plugin.spec b/maven-pmd-plugin.spec
index 6b0c219..3fb58c7 100644
--- a/maven-pmd-plugin.spec
+++ b/maven-pmd-plugin.spec
@@ -1,26 +1,23 @@
 Name:           maven-pmd-plugin
 Version:        2.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Maven PMD Plugin
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-pmd-plugin/
-#svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-pmd-plugin-2.5 maven-pmd-plugin-2.5
-#tar caf maven-pmd-plugin-2.5.tar.xz maven-pmd-plugin-2.5/
-Source0:        %{name}-%{version}.tar.xz
+Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
 Source1:        maven-pmd-plugin-depmap.xml
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
 
 BuildRequires: pmd
 BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: maven2
-BuildRequires: maven2-plugin-plugin
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-resources
+BuildRequires: maven
+BuildRequires: maven-plugin-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-resources-plugin
 BuildRequires: maven-compiler-plugin
 BuildRequires: maven-javadoc-plugin
 BuildRequires: maven-surefire-maven-plugin
@@ -33,7 +30,7 @@ BuildRequires: apache-commons-lang
 BuildRequires: plexus-resources
 BuildRequires: plexus-utils
 BuildRequires: junit
-Requires: maven2
+Requires: maven
 Requires: plexus-utils
 Requires: maven-plugin-testing-harness
 Requires: pmd
@@ -62,29 +59,18 @@ API documentation for %{name}.
 
 
 %prep
-%setup -q #You may need to update this according to your Source0
+%setup -q 
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL 
-
-mvn-jpp \
-        -e \
-        -Dmaven2.jpp.mode=true \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-        -Dmaven2.jpp.depmap.file=%{SOURCE1} \
+mvn-rpmbuild \
+        -Dmaven.local.depmap.file=%{SOURCE1} \
         -Dmaven.test.failure.ignore=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-pmd-plugin %{version} JPP maven-pmd-plugin
 
@@ -94,10 +80,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
@@ -105,9 +89,6 @@ rm -rf target/site/api*
 %postun
 %update_maven_depmap
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-,root,root,-)
 %{_javadir}/*
@@ -116,10 +97,13 @@ rm -rf %{buildroot}
 
 %files javadoc
 %defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Apr 26 2011 Alexander Kurtakov <akurtako at redhat.com> 2.5-3
+- Update to current guidelines.
+- Use upstream source.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild