From db8b98c624585efb5ea2835578b5a4c93b64448e Mon Sep 17 00:00:00 2001
From: Tomas Radej <tradej@redhat.com>
Date: Sep 07 2011 08:19:04 +0000
Subject: Revert "Updated to 1.2.1, copy license files"


This reverts commit e700695f3edbd4c38ab86c2d127dbd9d907cb485.

---

diff --git a/.gitignore b/.gitignore
index 6677bcd..d1aba0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
 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
diff --git a/maven-remote-resources-plugin-project-transitivity-filter.patch b/maven-remote-resources-plugin-project-transitivity-filter.patch
deleted file mode 100644
index 85b224c..0000000
--- a/maven-remote-resources-plugin-project-transitivity-filter.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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 c62de1f..512ebd2 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
-@@ -47,7 +47,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
-             depArtifacts = project.getDependencyArtifacts();
-         }
- 
--        filter.addFilter( new TransitivityFilter( depArtifacts, this.excludeTransitive ) );
-+        filter.addFilter( new ProjectTransitivityFilter( depArtifacts, this.excludeTransitive ) );
-         filter.addFilter( new ScopeFilter( this.includeScope, this.excludeScope ) );
-         filter.addFilter( new GroupIdFilter( this.includeGroupIds, this.excludeGroupIds ) );
-         filter.addFilter( new ArtifactIdFilter( this.includeArtifactIds, this.excludeArtifactIds ) );
diff --git a/maven-remote-resources-plugin.spec b/maven-remote-resources-plugin.spec
index 2ab14cf..cee8135 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:        1%{?dist}
+Version:        1.2
+Release:        3%{?dist}
 Summary:        Maven Remote Resources Plugin
 
 Group:          Development/Libraries
@@ -10,8 +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.
-# Version 1.2.1: created new patch with identical functionality
-Patch0:        %{name}-project-transitivity-filter.patch
+Patch0:        ProcessRemoteResourcesMojo.java.patch
 
 BuildArch: noarch
 
@@ -24,7 +23,7 @@ BuildRequires: maven-jar-plugin
 BuildRequires: maven-javadoc-plugin
 BuildRequires: maven-resources-plugin
 BuildRequires: maven-surefire-plugin
-BuildRequires: maven-filtering
+BuildRequires: maven-shared-filtering
 BuildRequires: plexus-container-default
 BuildRequires: velocity
 BuildRequires: maven-shared-artifact-resolver
@@ -47,7 +46,6 @@ Requires:       jpackage-utils
 Requires:       maven-wagon
 Requires:       maven-shared-artifact-resolver
 Requires:       maven-shared-downloader
-Requires:       maven-filtering
 
 Obsoletes:      maven2-plugin-remote-resources <= 0:2.0.8
 Provides:       maven2-plugin-remote-resources = 1:%{version}-%{release}
@@ -71,14 +69,14 @@ API documentation for %{name}.
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p0
 
 %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:aggregate
+mvn-rpmbuild -Dmaven.test.skip=true install javadoc:javadoc
 
 %install
 # jars
@@ -94,21 +92,14 @@ install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 
 %files
-%doc DEPENDENCIES LICENSE NOTICE
 %{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%doc DEPENDENCIES LICENSE NOTICE
 %{_javadocdir}/%{name}
 
-
 %changelog
-* Tue Sep 06 2011 Tomas Radej <tradej@redhat.com> - 1.2.1-1
-- Updated to 1.2.1
-- Fixed patch
-
 * Tue Jul 5 2011 Alexander Kurtakov <akurtako@redhat.com> 1.2-3
 - BR modello.
 
diff --git a/sources b/sources
index cfe3239..d3a36fa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9b799cd77a6f65c0c13304d53f0c5367  maven-remote-resources-plugin-1.2.1-source-release.zip
+681e1c7ed5841ef6ee68cffa11e61849  maven-remote-resources-plugin-1.2-source-release.zip