diff --git a/.gitignore b/.gitignore index 428ccdc..aa3d291 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,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 +/maven-remote-resources-plugin-1.4-source-release.zip diff --git a/maven-remote-resources-plugin-mojo.patch b/maven-remote-resources-plugin-mojo.patch deleted file mode 100644 index 42d2651..0000000 --- a/maven-remote-resources-plugin-mojo.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 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.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(); - } - -- 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 5da5e33..c617393 100644 --- a/maven-remote-resources-plugin.spec +++ b/maven-remote-resources-plugin.spec @@ -1,16 +1,12 @@ Name: maven-remote-resources-plugin -Version: 1.3 -Release: 2%{?dist} +Version: 1.4 +Release: 1%{?dist} Summary: Maven Remote Resources Plugin Group: Development/Libraries License: ASL 2.0 URL: http://maven.apache.org/plugins/maven-remote-resources-plugin/ Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip -#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: %{name}-mojo.patch BuildArch: noarch @@ -40,13 +36,20 @@ BuildRequires: maven-shared-verifier BuildRequires: maven-surefire-provider-junit BuildRequires: modello -Requires: maven Requires: java -Requires: jpackage-utils -Requires: maven-wagon -Requires: maven-shared-artifact-resolver -Requires: maven-shared-downloader +Requires: maven +Requires: maven-artifact-resolver +Requires: maven-common-artifact-filters +Requires: maven-filtering +Requires: maven-monitor +Requires: maven-plugin-annotations +Requires: maven-project +Requires: plexus-containers-container-default +Requires: plexus-interpolation Requires: plexus-resources +Requires: plexus-utils +Requires: plexus-velocity +Requires: velocity Obsoletes: maven2-plugin-remote-resources <= 0:2.0.8 Provides: maven2-plugin-remote-resources = 1:%{version}-%{release} @@ -71,7 +74,10 @@ API documentation for %{name}. %prep %setup -q -%patch0 -p1 +#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. +sed -i "s/TransitivityFilter/Project&/" `find -name ProcessRemoteResourcesMojo.java` %build # fix 613582 @@ -104,6 +110,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/ %{_javadocdir}/%{name} %changelog +* Tue Jan 15 2013 Mikolaj Izdebski - 1.4-1 +- Update to upstream version 1.4 + * Thu Jul 19 2012 Fedora Release Engineering - 1.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index e0116fe..39ca71b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -14113a010145be97d4258adb27ef6a7a maven-remote-resources-plugin-1.3-source-release.zip +41931941e90d94e6698346a95f6c76c3 maven-remote-resources-plugin-1.4-source-release.zip