[apache-commons-parent] Updated to 20 Fixed Rs for maven 3
spike
spike at fedoraproject.org
Fri Apr 15 02:08:47 UTC 2011
commit db0a21ef30991651c88c8f75ea1b793d7035e395
Author: spike <spike at fedoraproject.org>
Date: Fri Apr 15 04:08:32 2011 +0200
Updated to 20
Fixed Rs for maven 3
.gitignore | 1 +
apache-commons-parent-remove-build-plugin.patch | 28 ++++------------------
apache-commons-parent.spec | 20 ++++++++--------
sources | 1 +
4 files changed, 17 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0457a09..8428af2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/commons-parent-15.tar.xz
+/commons-parent-20.tar.xz
diff --git a/apache-commons-parent-remove-build-plugin.patch b/apache-commons-parent-remove-build-plugin.patch
index 2acbea3..a0667dd 100644
--- a/apache-commons-parent-remove-build-plugin.patch
+++ b/apache-commons-parent-remove-build-plugin.patch
@@ -1,9 +1,6 @@
---- pom.xml 2010-04-20 03:00:29.000000000 +0200
-+++ pom.xml 2010-11-06 15:59:59.509445003 +0100
-@@ -251,14 +251,6 @@
- </plugin>
- <!-- Other plugins, alpha order by groupId and artifactId -->
- <plugin>
+--- pom.xml.orig 2011-04-15 03:47:04.754033753 +0200
++++ pom.xml 2011-04-15 03:48:50.270963406 +0200
+@@ -242,8 +241,0 @@
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-build-plugin</artifactId>
- <version>1.3</version>
@@ -12,24 +9,12 @@
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <!-- version 1.4.x is required for JDK 1.4 compatibilty -->
-@@ -363,10 +355,6 @@
- </execution>
- </executions>
- </plugin>
+@@ -353,4 +344,0 @@
- <plugin>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-build-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
-@@ -740,14 +728,6 @@
- <commons.surefire.java />
- <commons.surefire.version>2.5</commons.surefire.version>
-
+@@ -812,8 +799,0 @@
- <!-- Default values for the download-page generation by commons-build-plugin -->
- <commons.release.name>${project.artifactId}-${commons.release.version}</commons.release.name>
- <commons.release.desc />
@@ -38,6 +23,3 @@
- <commons.release.2.desc />
- <commons.release.2.binary.suffix>-bin</commons.release.2.binary.suffix>
-
- <!-- Commons Component Id -->
- <commons.componentid>${project.artifactId}</commons.componentid>
-
diff --git a/apache-commons-parent.spec b/apache-commons-parent.spec
index b97b212..521e990 100644
--- a/apache-commons-parent.spec
+++ b/apache-commons-parent.spec
@@ -2,15 +2,15 @@
%global short_name commons-%{base_name}
Name: apache-%{short_name}
-Version: 15
-Release: 3%{?dist}
+Version: 20
+Release: 1%{?dist}
Summary: Apache Commons Parent Pom
Group: Development/Libraries
License: ASL 2.0
URL: http://svn.apache.org/repos/asf/commons/proper/%{short_name}/tags/%{short_name}-%{version}/
-# svn export http://svn.apache.org/repos/asf/commons/proper/commons-parent/tags/commons-parent-15
-# tar caf commons-parent-15.tar.xz commons-parent-15
+# svn export http://svn.apache.org/repos/asf/commons/proper/commons-parent/tags/commons-parent-20
+# tar caf commons-parent-20.tar.xz commons-parent-20
Source0: %{short_name}-%{version}.tar.xz
#common-build-plugin not in fedora yet
@@ -23,9 +23,8 @@ BuildRequires: jpackage-utils
Requires: java >= 1:1.6.0
Requires: jpackage-utils
-Requires: maven2 >= 2.2.1
+Requires: maven
Requires: maven-antrun-plugin
-Requires: maven-assembly-plugin
Requires: maven-compiler-plugin
Requires: maven-idea-plugin
Requires: maven-install-plugin
@@ -73,11 +72,12 @@ rm -rf %{buildroot}
%{_mavendepmapfragdir}/*
%changelog
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 15-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+* Fri Apr 15 2011 Chris Spike <spike at fedoraproject.org> 20-1
+- Updated to 20
+- Fixed Rs for maven 3
-* Sat Nov 6 2010 Chris Spike <chris.spike at arcor.de> 15-2
+* Sat Nov 6 2010 Chris Spike <spike at fedoraproject.org> 15-2
- Added patch to remove commons-build-plugin from pom file
-* Wed Oct 20 2010 Chris Spike <chris.spike at arcor.de> 15-1
+* Wed Oct 20 2010 Chris Spike <spike at fedoraproject.org> 15-1
- Initial version of the package
diff --git a/sources b/sources
index b28b59e..4f86134 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
a9db3e7746d9fe624379d9d55eb56052 commons-parent-15.tar.xz
+c9da81a4ff73aedabb3afc8f7825afb8 commons-parent-20.tar.xz
More information about the scm-commits
mailing list