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

[Alexander Kurtakov]

commit 8ee873212676930c448d167c9a5702c33568b2f8
Author: Alexander Kurtakov <akurtakov at gmail.com>
Date:   Thu Jun 9 22:34:53 2011 +0300

    Build with maven 3.x.
    
    Guideline fixes.

 maven-checkstyle-plugin.spec |   29 ++++++++++-------------------
 1 files changed, 10 insertions(+), 19 deletions(-)
---
diff --git a/maven-checkstyle-plugin.spec b/maven-checkstyle-plugin.spec
index a09577f..345c7c9 100644
--- a/maven-checkstyle-plugin.spec
+++ b/maven-checkstyle-plugin.spec
@@ -1,31 +1,30 @@
 Name:             maven-checkstyle-plugin
 Version:          2.6
-Release:          3%{?dist}
+Release:          4%{?dist}
 Summary:          Plugin that generates a report regarding the code style used by the developers
 Group:            Development/Libraries
 License:          ASL 2.0
 URL:              http://maven.apache.org/plugins/%{name}
 
 Source0:          http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:        noarch
 
 BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    jpackage-utils
-BuildRequires:    maven2 >= 2.2.1
+BuildRequires:    maven
 BuildRequires:    maven-plugin-plugin >= 2.5.1
 BuildRequires:    plexus-containers-component-metadata >= 1.5.1
 BuildRequires:    maven-javadoc-plugin
 BuildRequires:    maven-resources-plugin
 BuildRequires:    maven-compiler-plugin >= 2.0.2
-BuildRequires:    maven-surefire-maven-plugin
+BuildRequires:    maven-surefire-plugin
 BuildRequires:    maven-jar-plugin >= 2.2
 BuildRequires:    maven-install-plugin >= 2.2
 BuildRequires:    checkstyle >= 5.0
 BuildRequires:    plexus-cli >= 1.2
 
-Requires:         maven2 >= 2.2.1
+Requires:         maven
 Requires:         maven-shared-reporting-impl >= 2.0.4.3
 Requires:         maven-doxia >= 1.0
 Requires:         maven-doxia-sitetools >= 1.0
@@ -64,21 +63,14 @@ This package contains the API documentation for %{name}.
 %setup -q
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
-        -e \
-        -Dmaven2.jpp.mode=true \
+mvn-rpmbuild \
         -Dmaven.test.failure.ignore=true \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
         install javadoc:javadoc
 
 %install
-rm -rf %{buildroot}
-
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}
-install -pm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+install -pm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
 
 # pom
 install -d -m 755 %{buildroot}%{_mavenpomdir}
@@ -96,23 +88,22 @@ ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
 %postun
 %update_maven_depmap
 
-%clean
-rm -rf %{buildroot}
-
 %files
-%defattr(-,root,root,-)
 %doc LICENSE
 %{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc LICENSE
 %{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Jun 9 2011 Alexander Kurtakov <akurtako at redhat.com> 2.6-4
+- Build with maven 3.x.
+- Guideline fixes.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild