[java-sig-commits] [maven-remote-resources-plugin/f17] Updated to version 1.3

[Tomas Radej]

commit 15be6a5f99c5e18f73db69f8caa5aa878d27a91b
Author: Tomas Radej <tradej at redhat.com>
Date:   Wed May 23 11:22:26 2012 +0200

    Updated to version 1.3

 .gitignore                                         |    1 +
 ...tch => maven-remote-resources-plugin-mojo.patch |   16 +++++++++-------
 maven-remote-resources-plugin.spec                 |   14 +++++++++-----
 sources                                            |    2 +-
 4 files changed, 20 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c98ec95..428ccdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 maven-remote-resources-plugin-1.1.tar.bz2
 maven-remote-resources-plugin-1.2-source-release.zip
 maven-remote-resources-plugin-1.2.1-source-release.zip
+/maven-remote-resources-plugin-1.3-source-release.zip
diff --git a/ProcessRemoteResourcesMojo.java.patch b/maven-remote-resources-plugin-mojo.patch
similarity index 55%
rename from ProcessRemoteResourcesMojo.java.patch
rename to maven-remote-resources-plugin-mojo.patch
index 176f52e..42d2651 100644
--- a/ProcessRemoteResourcesMojo.java.patch
+++ b/maven-remote-resources-plugin-mojo.patch
@@ -1,15 +1,17 @@
---- src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java.orig	2011-06-14 19:33:34.000000000 +0300
-+++ src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java	2011-09-06 11:12:17.664695979 +0300
-@@ -47,7 +47,7 @@ import org.apache.maven.shared.artifact.
+diff --git a/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java b/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
+index d9b0d2e..175e91c 100644
+--- a/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
++++ b/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
+@@ -48,7 +48,7 @@ import org.apache.maven.shared.artifact.filter.collection.ArtifactIdFilter;
  import org.apache.maven.shared.artifact.filter.collection.FilterArtifacts;
  import org.apache.maven.shared.artifact.filter.collection.GroupIdFilter;
  import org.apache.maven.shared.artifact.filter.collection.ScopeFilter;
 -import org.apache.maven.shared.artifact.filter.collection.TransitivityFilter;
 +import org.apache.maven.shared.artifact.filter.collection.ProjectTransitivityFilter;
- import org.apache.maven.shared.downloader.DownloadException;
- import org.apache.maven.shared.downloader.DownloadNotFoundException;
- import org.apache.maven.shared.downloader.Downloader;
-@@ -628,7 +628,7 @@ public class ProcessRemoteResourcesMojo
+ import org.apache.maven.shared.filtering.MavenFileFilter;
+ import org.apache.maven.shared.filtering.MavenFileFilterRequest;
+ import org.apache.maven.shared.filtering.MavenFilteringException;
+@@ -627,7 +627,7 @@ public class ProcessRemoteResourcesMojo
              depArtifacts = project.getDependencyArtifacts();
          }
  
diff --git a/maven-remote-resources-plugin.spec b/maven-remote-resources-plugin.spec
index 4c9c81a..2b241ea 100644
--- a/maven-remote-resources-plugin.spec
+++ b/maven-remote-resources-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-remote-resources-plugin
-Version:        1.2.1
-Release:        4%{?dist}
+Version:        1.3
+Release:        1%{?dist}
 Summary:        Maven Remote Resources Plugin
 
 Group:          Development/Libraries
@@ -10,7 +10,7 @@ Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%
 #Class org.apache.maven.shared.artifact.filter.collection.TransitivityFilter which ProcessRemoteResourcesMojo.java imports
 #is renamed as org.apache.maven.shared.artifact.filter.collection.ProjectTransitivityFilter in
 #the version 1.3 of maven-shared-common-artifact-filters package.
-Patch0:        ProcessRemoteResourcesMojo.java.patch
+Patch0:        %{name}-mojo.patch
 
 BuildArch: noarch
 
@@ -70,14 +70,15 @@ API documentation for %{name}.
 
 %prep
 %setup -q
-%patch0 -p0
+
+%patch0 -p1
 
 %build
 # fix 613582
 # we now use plexus-velocity which has the correct descriptor with a hint.
 rm -f src/main/resources/META-INF/plexus/components.xml
 
-mvn-rpmbuild -Dmaven.test.skip=true install javadoc:javadoc
+mvn-rpmbuild install javadoc:aggregate -Dmaven.test.skip=true
 
 %install
 # jars
@@ -103,6 +104,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed May 23 2012 Tomas Radej <tradej at redhat.com> - 1.3-1
+- Updated to latest upstream release
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index cfe3239..e0116fe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9b799cd77a6f65c0c13304d53f0c5367  maven-remote-resources-plugin-1.2.1-source-release.zip
+14113a010145be97d4258adb27ef6a7a  maven-remote-resources-plugin-1.3-source-release.zip