Merge branch 'master' into f16
This commit is contained in:
commit
1cbf69aa8b
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
||||
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
|
||||
|
||||
@ -1,20 +1,20 @@
|
||||
--- src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java.orig 2011-02-24 20:34:44.000000000 +0200
|
||||
+++ src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java 2011-03-17 13:33:34.175694944 +0200
|
||||
--- 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.
|
||||
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 ) );
|
||||
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 ) );
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: maven-remote-resources-plugin
|
||||
Version: 1.2
|
||||
Release: 3%{?dist}
|
||||
Version: 1.2.1
|
||||
Release: 1%{?dist}
|
||||
Summary: Maven Remote Resources Plugin
|
||||
|
||||
Group: Development/Libraries
|
||||
@ -100,6 +100,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
|
||||
%{_javadocdir}/%{name}
|
||||
|
||||
%changelog
|
||||
* Tue Sep 6 2011 Alexander Kurtakov <akurtako@redhat.com> 1.2.1-1
|
||||
- Update to latest upstream release.
|
||||
|
||||
* Tue Jul 5 2011 Alexander Kurtakov <akurtako@redhat.com> 1.2-3
|
||||
- BR modello.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user