[maven-assembly-plugin] Update to upstream version 2.5

[Mikolaj Izdebski]

commit fd584d9b831933d7810ed7bffdd36c62fd4065ad
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Fri Oct 24 12:34:43 2014 +0200

    Update to upstream version 2.5

 .gitignore                                         |    1 +
 ...plexus-archiver-2.6.1-and-plexus-io-2.1.1.patch |  306 --------------------
 maven-assembly-plugin.spec                         |   10 +-
 sources                                            |    2 +-
 4 files changed, 7 insertions(+), 312 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fd7ddbc..d017eba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ maven-assembly-plugin-2.2.2-source-release.zip
 /maven-assembly-plugin-2.3-source-release.zip
 /maven-assembly-plugin-2.4-source-release.zip
 /maven-assembly-plugin-2.4.1-source-release.zip
+/maven-assembly-plugin-2.5-source-release.zip
diff --git a/maven-assembly-plugin.spec b/maven-assembly-plugin.spec
index bc8a199..8536ff5 100644
--- a/maven-assembly-plugin.spec
+++ b/maven-assembly-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-assembly-plugin
-Version:        2.4.1
-Release:        3%{?dist}
+Version:        2.5
+Release:        1%{?dist}
 Summary:        Maven Assembly Plugin
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-assembly-plugin/
@@ -8,8 +8,6 @@ BuildArch:      noarch
 
 Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
 
-Patch0:         0001-Update-to-plexus-archiver-2.6.1-and-plexus-io-2.1.1.patch
-
 BuildRequires:  maven-local
 BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-plugins:pom:)
@@ -44,7 +42,6 @@ This package provides %{summary}.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 # Tests need easymockclassextension version 2.x, which is incompatible
@@ -62,6 +59,9 @@ This package provides %{summary}.
 %doc LICENSE NOTICE
 
 %changelog
+* Fri Oct 24 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.5-1
+- Update to upstream version 2.5
+
 * Tue Oct 14 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.4.1-3
 - Remove legacy Obsoletes/Provides for maven2 plugin
 
diff --git a/sources b/sources
index ce9c458..620507a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b929adb55a2ce8c1ee45e602ef49f71a  maven-assembly-plugin-2.4.1-source-release.zip
+526faee4321d0558f86b87da680d8dd2  maven-assembly-plugin-2.5-source-release.zip