[maven-remote-resources-plugin] Update to upstream 1.2 release.
Alexander Kurtakov
akurtakov at fedoraproject.org
Thu Mar 17 11:41:05 UTC 2011
commit 19274529b3064952878ea3545e90b845402cec22
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Thu Mar 17 13:40:18 2011 +0200
Update to upstream 1.2 release.
.gitignore | 1 +
0001-Fix-velocity-dep.patch | 27 ----------------------
ProcessRemoteResourcesMojo.java.patch | 40 ++++++++++++++++----------------
maven-remote-resources-plugin.spec | 37 +++++++++---------------------
sources | 2 +-
5 files changed, 33 insertions(+), 74 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3568adf..d1aba0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
maven-remote-resources-plugin-1.1.tar.bz2
+maven-remote-resources-plugin-1.2-source-release.zip
diff --git a/ProcessRemoteResourcesMojo.java.patch b/ProcessRemoteResourcesMojo.java.patch
index 37c50b1..424ccfa 100644
--- a/ProcessRemoteResourcesMojo.java.patch
+++ b/ProcessRemoteResourcesMojo.java.patch
@@ -1,20 +1,20 @@
---- src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java.orig 2009-09-12 06:23:41.000000000 +0800
-+++ src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java 2010-06-02 18:15:05.000000000 +0800
-@@ -47,7 +47,7 @@
- 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;
-@@ -609,7 +609,7 @@
- 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 ) );
+--- 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
+@@ -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 ) );
diff --git a/maven-remote-resources-plugin.spec b/maven-remote-resources-plugin.spec
index 8f0db54..c87444d 100644
--- a/maven-remote-resources-plugin.spec
+++ b/maven-remote-resources-plugin.spec
@@ -1,34 +1,28 @@
Name: maven-remote-resources-plugin
-Version: 1.1
-Release: 8%{?dist}
+Version: 1.2
+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/
-#svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-remote-resources-plugin-1.1/
-#tar jcf maven-remote-resources-plugin-1.1.tar.bz2 maven-remote-resources-plugin-1.1/
-Source0: %{name}-%{version}.tar.bz2
+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: ProcessRemoteResourcesMojo.java.patch
-# TODO: upstream
-Patch1: 0001-Fix-velocity-dep.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: maven2
+BuildRequires: maven
BuildRequires: maven-plugin-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
BuildRequires: maven-shared-filtering
BuildRequires: plexus-container-default
BuildRequires: velocity
@@ -45,7 +39,7 @@ BuildRequires: maven-wagon
BuildRequires: maven-shared-verifier
BuildRequires: maven-surefire-provider-junit
-Requires: maven2
+Requires: maven
Requires: java
Requires: jpackage-utils
Requires: maven-wagon
@@ -77,29 +71,17 @@ API documentation for %{name}.
%prep
%setup -q
%patch0 -p0
-%patch1 -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
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
- -e \
- -Dmaven2.jpp.mode=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven.test.skip=true \
- install javadoc:javadoc
+mvn-rpmbuild -Dmaven.test.skip=true install javadoc:javadoc
%install
-rm -rf %{buildroot}
-
# jars
-install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
%add_to_maven_depmap org.apache.maven.plugins %{name} %{version} JPP %{name}
@@ -133,6 +115,9 @@ rm -rf %{buildroot}
%{_javadocdir}/%{name}
%changelog
+* Thu Mar 17 2011 Alexander Kurtakov <akurtako at redhat.com> 1.2-1
+- Update to upstream 1.2 release.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 8410a83..d3a36fa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b1cd13fa6534a92498a0eeb9b740ace0 maven-remote-resources-plugin-1.1.tar.bz2
+681e1c7ed5841ef6ee68cffa11e61849 maven-remote-resources-plugin-1.2-source-release.zip
More information about the scm-commits
mailing list