From 4c71870058acda2949c09525c9ffd7ed68501948 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Thu, 2 Jul 2015 12:21:16 +0200
Subject: [PATCH] Port to current plexus-archiver

---
 0001-Port-to-current-plexus-archiver.patch | 60 ++++++++++++++++++++++
 maven-assembly-plugin.spec                 |  9 +++-
 2 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 0001-Port-to-current-plexus-archiver.patch

diff --git a/0001-Port-to-current-plexus-archiver.patch b/0001-Port-to-current-plexus-archiver.patch
new file mode 100644
index 0000000..12d8c5f
--- /dev/null
+++ b/0001-Port-to-current-plexus-archiver.patch
@@ -0,0 +1,60 @@
+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
+
diff --git a/maven-assembly-plugin.spec b/maven-assembly-plugin.spec
index be7d174..9d9667d 100644
--- a/maven-assembly-plugin.spec
+++ b/maven-assembly-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-assembly-plugin
 Version:        2.5.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Maven Assembly Plugin
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-assembly-plugin/
@@ -8,6 +8,8 @@ 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:)
@@ -43,6 +45,8 @@ 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.
@@ -59,6 +63,9 @@ This package provides %{summary}.
 %license LICENSE NOTICE
 
 %changelog
+* Thu Jul 02 2015 Michael Simacek <msimacek@redhat.com> - 2.5.5-3
+- Port to current plexus-archiver
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild