[maven-remote-resources-plugin] Update to upstream 1.2 release.
by Alexander Kurtakov
commit 19274529b3064952878ea3545e90b845402cec22
Author: Alexander Kurtakov <akurtako(a)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...
-#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}...
#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(a)redhat.com> 1.2-1
+- Update to upstream 1.2 release.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)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
13 years, 1 month
[maven-assembly-plugin] Update to upstream 2.2.1 release.
by Alexander Kurtakov
commit 90ecb626004283939b21f8d29fb95d1d576f9b6c
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Thu Mar 17 13:24:56 2011 +0200
Update to upstream 2.2.1 release.
.gitignore | 1 +
maven-assembly-plugin.spec | 22 ++++++++++------------
sources | 3 +--
3 files changed, 12 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2622ee9..0c2b711 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
maven-assembly-plugin-2.2-beta-5-src.tar.gz
maven-assembly-plugin-2.2-source-release.zip
+maven-assembly-plugin-2.2.1-source-release.zip
diff --git a/maven-assembly-plugin.spec b/maven-assembly-plugin.spec
index 74c854b..8736fc1 100644
--- a/maven-assembly-plugin.spec
+++ b/maven-assembly-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-assembly-plugin
-Version: 2.2
-Release: 2%{?dist}
+Version: 2.2.1
+Release: 1%{?dist}
Summary: Maven Assembly Plugin
Group: Development/Libraries
@@ -16,8 +16,8 @@ Provides: maven2-plugin-assembly = 1:%{version}-%{release}
BuildRequires: java >= 1:1.6.0
BuildRequires: jpackage-utils >= 0:1.7.2
-BuildRequires: ant, ant-nodeps
-BuildRequires: maven2 >= 0:2.0.4-9
+BuildRequires: ant
+BuildRequires: maven
BuildRequires: maven-assembly-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
@@ -25,7 +25,7 @@ BuildRequires: maven-jar-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-site-plugin
BuildRequires: maven-plugin-plugin
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-shared-filtering
@@ -88,19 +88,14 @@ mkdir -p target/classes/
cp -pr src/main/resources/META-INF/ target/classes/
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
# seems koji don't have easymockclassextension
-mvn-jpp \
+mvn-rpmbuild \
-e \
- -Dmaven2.jpp.mode=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven2.jpp.depmap.file=%{SOURCE1} \
+ -Dmaven.local.depmap.file=%{SOURCE1} \
-Dmaven.test.skip=true \
install javadoc:javadoc
%install
-rm -rf %{buildroot}
-
# jars
install -d -m 0755 %{buildroot}%{_javadir}
install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
@@ -134,6 +129,9 @@ rm -rf target/site/api*
%{_javadocdir}/%{name}
%changelog
+* Thu Mar 17 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.2.1-1
+- Update to upstream 2.2.1 release.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index b70937d..b673bd6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-db8cff1a3bf57fca8ba3899d053d48f2 maven-assembly-plugin-2.2-beta-5-src.tar.gz
-eec14f1ba55f53710542e85562a7b003 maven-assembly-plugin-2.2-source-release.zip
+62c1483e35a3d231c1fd1de614ec6e46 maven-assembly-plugin-2.2.1-source-release.zip
13 years, 1 month
[apache-commons-collections] Drop tomcat5 subpackage.
by Alexander Kurtakov
commit ca16e9f5baed2b39b541e823c2082df026609acb
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Mar 16 16:53:40 2011 +0200
Drop tomcat5 subpackage.
apache-commons-collections.spec | 52 +++++++-------------------------------
1 files changed, 10 insertions(+), 42 deletions(-)
---
diff --git a/apache-commons-collections.spec b/apache-commons-collections.spec
index 66a58b0..cdf1c56 100644
--- a/apache-commons-collections.spec
+++ b/apache-commons-collections.spec
@@ -3,23 +3,21 @@
Name: apache-%{short_name}
Version: 3.2.1
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Provides new interfaces, implementations and utilities for Java Collections
License: ASL 2.0
Group: Development/Libraries
URL: http://commons.apache.org/%{base_name}/
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{ve...
-Source6: collections-tomcat5-build.xml
Patch0: jakarta-%{short_name}-javadoc-nonet.patch
Patch4: commons-collections-3.2-build_xml.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: java-devel
BuildRequires: jpackage-utils
-BuildRequires: maven2
+BuildRequires: maven
BuildRequires: maven-antrun-plugin
BuildRequires: maven-assembly-plugin
BuildRequires: maven-compiler-plugin
@@ -43,6 +41,7 @@ Requires(postun): jpackage-utils
Provides: jakarta-%{short_name} = %{version}-%{release}
Obsoletes: jakarta-%{short_name} < %{version}-%{release}
+Obsoletes: %{name}-tomcat5 < %{version}-%{release}
%description
The introduction of the Collections API by Sun in JDK 1.2 has been a
@@ -80,15 +79,6 @@ Obsoletes: jakarta-%{short_name}-javadoc < %{version}-%{release}
%description javadoc
%{summary}.
-%package tomcat5
-Summary: Jakarta Commons Collection dependency for Tomcat5
-Group: Development/Libraries
-Provides: jakarta-%{short_name}-tomcat5 = %{version}-%{release}
-Obsoletes: jakarta-%{short_name}-tomcat5 < %{version}-%{release}
-
-%description tomcat5
-A package that is specifically designed to fulfill to a Tomcat5 dependency.
-
%package testframework-javadoc
Summary: Javadoc for %{name}-testframework
Group: Documentation
@@ -107,7 +97,6 @@ find . -name "*.jar" -exec rm -f {} \;
%patch0 -p1
%patch4 -b .sav
-cp %{SOURCE6} .
# Fix file eof
%{__sed} -i 's/\r//' LICENSE.txt
@@ -118,34 +107,21 @@ cp %{SOURCE6} .
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp -Dmaven.repo.local=$MAVEN_REPO_LOCAL install javadoc:javadoc
-
-export MAVEN_HOME_LOCAL=$(pwd)/.maven
+mvn-rpmbuild install javadoc:aggregate
ant tf.javadoc
-# commons-collections-tomcat5
-ant -f collections-tomcat5-build.xml
-
%install
-rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom
%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
-install -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-install -m 644 target/%{short_name}-testframework-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-testframework-%{version}.jar
-
-# tomcat5
-install -m 644 collections-tomcat5/%{short_name}-tomcat5.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tomcat5-%{version}.jar
+install -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -m 644 target/%{short_name}-testframework-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-testframework.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|apache-||g"`; done)
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *; do ln -sf ${jar} `echo $jar| sed "s|apache-||g"`; done)
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -158,8 +134,6 @@ install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-testframework-%{version}
cp -pr build/docs/testframework/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-testframework-%{version}
ln -s %{name}-testframework-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-testframework
-%clean
-rm -rf $RPM_BUILD_ROOT
%post
%update_maven_depmap
@@ -172,23 +146,14 @@ rm -rf $RPM_BUILD_ROOT
%doc PROPOSAL.html README.txt LICENSE.txt RELEASE-NOTES.html NOTICE.txt
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
-%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}.jar
-%{_javadir}/%{short_name}-%{version}.jar
%{_javadir}/%{short_name}.jar
%files testframework
%defattr(-,root,root,-)
-%{_javadir}/%{name}-testframework-%{version}.jar
%{_javadir}/%{name}-testframework.jar
-%{_javadir}/%{short_name}-testframework-%{version}.jar
%{_javadir}/%{short_name}-testframework.jar
-%files tomcat5
-%defattr(-,root,root,-)
-%{_javadir}/*-tomcat5*.jar
-%doc LICENSE.txt NOTICE.txt
-
%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}
@@ -200,6 +165,9 @@ rm -rf $RPM_BUILD_ROOT
%{_javadocdir}/%{name}-testframework
%changelog
+* Wed Mar 16 2011 Alexander Kurtakov <akurtako(a)redhat.com> 3.2.1-10
+- Drop tomcat5 subpackage.
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.2.1-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
13 years, 1 month