commit 5f6ae673b5f7bc71002c15a764e11af75be903e8 Author: Mikolaj Izdebski mizdebsk@redhat.com Date: Mon Jan 19 05:38:09 2015 +0100
Update to upstream version 3.2.5
.gitignore | 1 + 0001-MNG-5696-Remove-dependency-on-Easymock.patch | 152 ---------------- 0002-Update-Aether-to-0.9.0.M3.patch | 95 ---------- 0003-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch | 197 --------------------- maven.spec | 18 +-- sources | 2 +- 6 files changed, 7 insertions(+), 458 deletions(-) --- diff --git a/.gitignore b/.gitignore index 6f6581e..3b44c55 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /apache-maven-3.2.1-src.tar.gz /apache-maven-3.2.2-src.tar.gz /apache-maven-3.2.3-src.tar.gz +/apache-maven-3.2.5-src.tar.gz diff --git a/maven.spec b/maven.spec index 126afa4..c8d5fff 100644 --- a/maven.spec +++ b/maven.spec @@ -1,6 +1,6 @@ Name: maven -Version: 3.2.3 -Release: 4%{?dist} +Version: 3.2.5 +Release: 1%{?dist} Summary: Java project management and project comprehension tool License: ASL 2.0 URL: http://maven.apache.org/ @@ -11,13 +11,6 @@ Source1: maven-bash-completion Source2: mvn.1 Source200: %{name}-script
-# Merged upstream (MNG-5696) -Patch0001: 0001-MNG-5696-Remove-dependency-on-Easymock.patch -# Merged upstream (MNG-5502) -Patch0002: 0002-Update-Aether-to-0.9.0.M3.patch -# Merged upstream (MNG-5534) -Patch0003: 0003-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch - # If XMvn is part of the same RPM transaction then it should be # installed first to avoid triggering rhbz#1014355. OrderWithRequires: xmvn @@ -135,9 +128,6 @@ Group: Documentation
%prep %setup -q -n apache-%{name}-%{version}%{?ver_add} -%patch0001 -p1 -%patch0002 -p1 -%patch0003 -p1
# not really used during build, but a precaution rm maven-ant-tasks-*.jar @@ -157,7 +147,6 @@ sed -i -e s:'-classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar':'-classpath
# Disable QA plugins which are not useful for us %pom_remove_plugin :animal-sniffer-maven-plugin -%pom_remove_plugin :maven-enforcer-plugin %pom_remove_plugin :apache-rat-plugin
# logback is not really needed by maven in typical use cases, so set @@ -263,6 +252,9 @@ ln -sf $(build-classpath plexus/classworlds) \
%changelog +* Mon Jan 19 2015 Mikolaj Izdebski mizdebsk@redhat.com - 3.2.5-1 +- Update to upstream version 3.2.5 + * Sat Dec 6 2014 Ville Skyttä ville.skytta@iki.fi - 3.2.3-4 - Fix bash completion filename
diff --git a/sources b/sources index 50981f2..1dcbed6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d1991e64c7a9f6f294ec17d2eab362d6 apache-maven-3.2.3-src.tar.gz +ed598fe30acc52738cc5f62ef7869538 apache-maven-3.2.5-src.tar.gz
java-sig-commits@lists.fedoraproject.org