Update to upstream version 2.6

.gitignore

@@ -11,3 +11,4 @@ maven-assembly-plugin-2.2.2-source-release.zip
 /maven-assembly-plugin-2.5.3-source-release.zip
 /maven-assembly-plugin-2.5.4-source-release.zip
 /maven-assembly-plugin-2.5.5-source-release.zip
+/maven-assembly-plugin-2.6-source-release.zip

0001-Port-to-current-plexus-archiver.patch

@@ -1,60 +0,0 @@
-From 2bfde7f0f54c2daeae92dbdcaf33fef5ac7235fd Mon Sep 17 00:00:00 2001
-From: Michael Simacek <msimacek@redhat.com>
-Date: Thu, 2 Jul 2015 10:55:56 +0200
-Subject: [PATCH] Port to current plexus-archiver
-
----
- .../assembly/archive/archiver/AssemblyProxyArchiver.java     | 12 ++++--------
- 1 file changed, 4 insertions(+), 8 deletions(-)
-
-diff --git a/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java b/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
-index 55a10d6..3e8acc7 100644
---- a/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
-+++ b/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
-@@ -147,9 +147,8 @@ public class AssemblyProxyArchiver
-         inPublicApi.set( Boolean.TRUE );
-         try
-         {
--            final DefaultArchivedFileSet fs = new DefaultArchivedFileSet();
-+            final DefaultArchivedFileSet fs = new DefaultArchivedFileSet(archiveFile);
- 
--            fs.setArchive( archiveFile );
-             fs.setIncludes( includes );
-             fs.setExcludes( excludes );
-             fs.setPrefix( rootPrefix + prefix );
-@@ -181,9 +180,8 @@ public class AssemblyProxyArchiver
-         inPublicApi.set( Boolean.TRUE );
-         try
-         {
--            final DefaultArchivedFileSet fs = new DefaultArchivedFileSet();
-+            final DefaultArchivedFileSet fs = new DefaultArchivedFileSet(archiveFile);
- 
--            fs.setArchive( archiveFile );
-             fs.setPrefix( rootPrefix + prefix );
-             fs.setFileSelectors( selectors );
- 
-@@ -205,9 +203,8 @@ public class AssemblyProxyArchiver
-         inPublicApi.set( Boolean.TRUE );
-         try
-         {
--            final DefaultArchivedFileSet fs = new DefaultArchivedFileSet();
-+            final DefaultArchivedFileSet fs = new DefaultArchivedFileSet(archiveFile);
- 
--            fs.setArchive( archiveFile );
-             fs.setIncludes( includes );
-             fs.setExcludes( excludes );
-             fs.setPrefix( rootPrefix );
-@@ -231,9 +228,8 @@ public class AssemblyProxyArchiver
-         inPublicApi.set( Boolean.TRUE );
-         try
-         {
--            final DefaultArchivedFileSet fs = new DefaultArchivedFileSet();
-+            final DefaultArchivedFileSet fs = new DefaultArchivedFileSet(archiveFile);
- 
--            fs.setArchive( archiveFile );
-             fs.setPrefix( rootPrefix );
-             fs.setFileSelectors( selectors );
- 
--- 
-2.1.0
-

maven-assembly-plugin.spec

@@ -1,6 +1,6 @@
 Name:           maven-assembly-plugin
-Version:        2.5.5
+Version:        2.6
-Release:        3%{?dist}
+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-Port-to-current-plexus-archiver.patch
-
 BuildRequires:  maven-local
 BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-plugins:pom:)
@@ -45,8 +43,6 @@ This package provides %{summary}.
 %prep
 %setup -q
 
-%patch0 -p1
-
 %build
 # Tests need easymockclassextension version 2.x, which is incompatible
 # with easymockclassextension version 3.x we have in Fedora.
@@ -63,6 +59,9 @@ This package provides %{summary}.
 %license LICENSE NOTICE
 
 %changelog
+* Mon Oct 12 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6-1
+- Update to upstream version 2.6
+
 * Thu Jul 02 2015 Michael Simacek <msimacek@redhat.com> - 2.5.5-3
 - Port to current plexus-archiver
 

sources

@@ -1 +1 @@
-da934870dfdd6a4f470fe60422750de5  maven-assembly-plugin-2.5.5-source-release.zip
+8e4e47876a8ddb566d040592dc279392  maven-assembly-plugin-2.6-source-release.zip