[java-sig-commits] [maven-resources-plugin] Update to 2.5 + Guideline fixes

[Tomas Radej]

commit a449acca824c361219111f060917c881ebd5d181
Author: Tomas Radej <tradej at redhat.com>
Date:   Mon Aug 22 09:53:04 2011 +0200

    Update to 2.5 + Guideline fixes

 .gitignore                  |    1 +
 maven-resources-plugin.spec |   26 ++++++++++++--------------
 sources                     |    2 +-
 3 files changed, 14 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8b42e26..f4c0ded 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 maven-resources-plugin-2.2.tar.gz
 /maven-resources-plugin-2.4.3.tar.gz
+/maven-resources-plugin-2.5.tar.gz
diff --git a/maven-resources-plugin.spec b/maven-resources-plugin.spec
index 94cf8fc..22a0092 100644
--- a/maven-resources-plugin.spec
+++ b/maven-resources-plugin.spec
@@ -1,13 +1,13 @@
 Name:           maven-resources-plugin
-Version:        2.4.3
-Release:        4%{?dist}
+Version:        2.5
+Release:        1%{?dist}
 Summary:        Maven Resources Plugin
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-resources-plugin
-#svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-resources-plugin-2.4.3 maven-resources-plugin-2.4.3
-#tar zcf maven-resources-plugin-2.4.3.tar.gz maven-resources-plugin-2.4.3/
+#svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-resources-plugin-2.5 maven-resources-plugin-2.5
+#tar zcf maven-resources-plugin-2.5.tar.gz maven-resources-plugin-2.5/
 Source0:        %{name}-%{version}.tar.gz
 
 BuildArch: noarch
@@ -30,6 +30,7 @@ BuildRequires: plexus-interpolation
 BuildRequires: plexus-digest
 BuildRequires: maven-project
 BuildRequires: maven-monitor
+BuildRequires: maven-filtering
 
 Requires: plexus-build-api
 Requires: plexus-containers-container-default
@@ -42,8 +43,6 @@ Requires: maven-project
 Requires: maven-monitor
 Requires:       jpackage-utils
 Requires:       java
-Requires(post):       jpackage-utils
-Requires(postun):     jpackage-utils
 
 Provides:       maven2-plugin-resources = %{version}-%{release}
 Obsoletes:      maven2-plugin-resources <= 0:2.0.8
@@ -67,29 +66,23 @@ API documentation for %{name}.
 %build
 mvn-rpmbuild \
         -Dmaven.test.failure.ignore=true \
-        install javadoc:javadoc
+        install javadoc:aggregate
 
 %install
 # jars
 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-resources-plugin %{version} JPP maven-resources-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
 %{_javadir}/*
@@ -100,6 +93,11 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Aug 29 2011 Tomas Radej <tradej at redhat.com> - 2.5-1
+- Update to 2.5
+- Guideline fixes
+- Added maven-filtering dep
+
 * Thu Jun 23 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.4.3-4
 - Add several packages to BR/R as stated in pom.xml
 
diff --git a/sources b/sources
index 2d382cc..5417ea9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c0ab5e32bd8b70a0e3e55ce472f68e55  maven-resources-plugin-2.4.3.tar.gz
+a1ed763c6c5e4776a5a33a35f7875cd1  maven-resources-plugin-2.5.tar.gz