Updated to 1.2.1, copy license files
This commit is contained in:
parent
6d9f4c734e
commit
e700695f3e
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
|
||||
|
||||
@ -0,0 +1,22 @@
|
||||
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 ) );
|
||||
@ -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
|
||||
@ -10,7 +10,8 @@ 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
|
||||
# Version 1.2.1: created new patch with identical functionality
|
||||
Patch0: %{name}-project-transitivity-filter.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
@ -23,7 +24,7 @@ BuildRequires: maven-jar-plugin
|
||||
BuildRequires: maven-javadoc-plugin
|
||||
BuildRequires: maven-resources-plugin
|
||||
BuildRequires: maven-surefire-plugin
|
||||
BuildRequires: maven-shared-filtering
|
||||
BuildRequires: maven-filtering
|
||||
BuildRequires: plexus-container-default
|
||||
BuildRequires: velocity
|
||||
BuildRequires: maven-shared-artifact-resolver
|
||||
@ -46,6 +47,7 @@ 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}
|
||||
@ -69,14 +71,14 @@ 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 -Dmaven.test.skip=true install javadoc:aggregate
|
||||
|
||||
%install
|
||||
# jars
|
||||
@ -92,14 +94,21 @@ 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.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user