[maven-pmd-plugin] Adapt to current guidelines

[Michal Srb]

commit 781df09f9016921a8d4519af97d3844da598170d
Author: Michal Srb <msrb at redhat.com>
Date:   Tue Aug 6 14:05:58 2013 +0200

    Adapt to current guidelines

 maven-pmd-plugin.spec |   79 +++++++++++++++++--------------------------------
 1 files changed, 27 insertions(+), 52 deletions(-)
---
diff --git a/maven-pmd-plugin.spec b/maven-pmd-plugin.spec
index b535b5b..39c486c 100644
--- a/maven-pmd-plugin.spec
+++ b/maven-pmd-plugin.spec
@@ -1,43 +1,32 @@
 Name:           maven-pmd-plugin
 Version:        3.0.1
-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/
 Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
 
 BuildArch: noarch
 
-BuildRequires: pmd >= 5.0.4-2
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: jpackage-utils
-BuildRequires: maven-local
-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-plugin
-BuildRequires: maven-surefire-provider-junit4
-BuildRequires: maven-doxia-sitetools
-BuildRequires: maven-plugin-testing-harness
-BuildRequires: maven-archiver
-BuildRequires: plexus-archiver
-BuildRequires: apache-commons-lang
-BuildRequires: plexus-resources
-BuildRequires: plexus-utils
-BuildRequires: junit
-BuildRequires: modello
-Requires: maven
-Requires: plexus-utils
-Requires: maven-plugin-testing-harness
-Requires: pmd >= 5.0.4-2
-Requires: java
-Requires: jpackage-utils
-Requires: junit
+BuildRequires:  maven-local
+BuildRequires:  mvn(net.sf.cglib:cglib)
+BuildRequires:  mvn(net.sourceforge.pmd:pmd)
+BuildRequires:  mvn(org.apache.maven.doxia:doxia-decoration-model)
+BuildRequires:  mvn(org.apache.maven.doxia:doxia-sink-api)
+BuildRequires:  mvn(org.apache.maven.doxia:doxia-site-renderer)
+BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-plugins)
+BuildRequires:  mvn(org.apache.maven.reporting:maven-reporting-api)
+BuildRequires:  mvn(org.apache.maven.reporting:maven-reporting-impl)
+BuildRequires:  mvn(org.apache.maven:maven-artifact)
+BuildRequires:  mvn(org.apache.maven:maven-core)
+BuildRequires:  mvn(org.apache.maven:maven-model)
+BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
+BuildRequires:  mvn(org.apache.maven:maven-project)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-resources)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires:  mvn(org.eclipse.aether:aether-api)
 
 Provides:       maven2-plugin-pmd = %{version}-%{release}
 Obsoletes:      maven2-plugin-pmd <= 0:2.0.8
@@ -49,9 +38,7 @@ fail the build based on these metrics.
   
 
 %package javadoc
-Group:          Documentation
 Summary:        Javadoc for %{name}
-Requires:       jpackage-utils
 
 %description javadoc
 API documentation for %{name}.
@@ -64,41 +51,29 @@ API documentation for %{name}.
 %pom_remove_plugin org.codehaus.mojo:animal-sniffer-maven-plugin
 
 # add missing test time deps
-%pom_add_dep org.sonatype.aether:aether-api
+%pom_add_dep org.eclipse.aether:aether-api
 %pom_add_dep org.apache.maven:maven-core
 %pom_add_dep net.sf.cglib:cglib
 
 %build
 # ignore test failures
 # all tests fail, so this is probably environmental but I'm not sure what's missing
-mvn-rpmbuild \
-        -Dmaven.test.failure.ignore=true \
-        install javadoc:javadoc
+%mvn_build -f
 
 %install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}.jar
-
-# 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}/
+%mvn_install
 
 %files -f .mfiles
+%dir %{_javadir}/%{name}
 %doc LICENSE NOTICE
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE NOTICE
-%{_javadocdir}/%{name}
 
 %changelog
+* Tue Aug 06 2013 Michal Srb <msrb at redhat.com> - 3.0.1-3
+- Adapt to current guidelines
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild