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

Alexander Kurtakov akurtakov at fedoraproject.org
Wed Jul 6 07:08:13 UTC 2011


commit d0c7df6a8ced6cac228d12c70bcb6460bae246e1
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed Jul 6 09:54:31 2011 +0300

    Adapt to current guidelines.

 maven-pmd-plugin.spec |   21 +++++++--------------
 sources               |    1 -
 2 files changed, 7 insertions(+), 15 deletions(-)
---
diff --git a/maven-pmd-plugin.spec b/maven-pmd-plugin.spec
index 21589b2..d8ad9d8 100644
--- a/maven-pmd-plugin.spec
+++ b/maven-pmd-plugin.spec
@@ -1,13 +1,12 @@
 Name:           maven-pmd-plugin
 Version:        2.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Maven PMD Plugin
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-pmd-plugin/
 Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
-Source1:        maven-pmd-plugin-depmap.xml
 Patch0:         0001-fix-pmd-artifactId.patch
 
 BuildArch: noarch
@@ -21,7 +20,7 @@ BuildRequires: maven-install-plugin
 BuildRequires: maven-resources-plugin
 BuildRequires: maven-compiler-plugin
 BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
 BuildRequires: maven-surefire-provider-junit4
 BuildRequires: maven-doxia-sitetools
 BuildRequires: maven-plugin-testing-harness
@@ -65,7 +64,6 @@ API documentation for %{name}.
 
 %build
 mvn-rpmbuild \
-        -Dmaven.local.depmap.file=%{SOURCE1} \
         -Dmaven.test.failure.ignore=true \
         install javadoc:javadoc
 
@@ -74,34 +72,29 @@ mvn-rpmbuild \
 install -d -m 0755 %{buildroot}%{_javadir}
 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
-
 # poms
 install -d -m 755 %{buildroot}%{_mavenpomdir}
 install -pm 644 pom.xml \
     %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+
 # javadoc
 install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 %files
-%defattr(-,root,root,-)
 %{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Jul 6 2011 Alexander Kurtakov <akurtako at redhat.com> 2.5-5
+- Adapt to current guidelines.
+
 * Thu Jun 30 2011 Felix Kaechele <heffer at fedoraproject.org> - 2.5-4
 - added patch to fix pmd artifactId in pom.xml
 
diff --git a/sources b/sources
index e1da7e4..101465e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-ce2441d333284be879fb8efeb56bc5fa  maven-pmd-plugin-2.5.tar.xz
 8af1a9a23b126a982a42105341d579e0  maven-pmd-plugin-2.5-source-release.zip


More information about the java-sig-commits mailing list