From f94aa463137a484d126b915d3dc8f5555e18a0d9 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Jan 05 2016 08:55:06 +0000
Subject: Port to Maven Shared IO 3.0.0


---

diff --git a/0001-Port-to-Maven-Filtering-3.0.0.patch b/0001-Port-to-Maven-Filtering-3.0.0.patch
index db6e976..1bdbec7 100644
--- a/0001-Port-to-Maven-Filtering-3.0.0.patch
+++ b/0001-Port-to-Maven-Filtering-3.0.0.patch
@@ -1,7 +1,7 @@
 From 350af4a332d6997562e3f6615202a4bdcb6bca4d Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Tue, 10 Nov 2015 07:15:10 +0100
-Subject: [PATCH] Port to Maven Filtering 3.0.0
+Subject: [PATCH 1/2] Port to Maven Filtering 3.0.0
 
 ---
  .../java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java   | 2 +-
diff --git a/0002-Port-to-Maven-Shared-IO-3.0.0.patch b/0002-Port-to-Maven-Shared-IO-3.0.0.patch
new file mode 100644
index 0000000..02e01dd
--- /dev/null
+++ b/0002-Port-to-Maven-Shared-IO-3.0.0.patch
@@ -0,0 +1,25 @@
+From be43efd76b419807c183f691c7b52849f9a48211 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Tue, 5 Jan 2016 09:53:09 +0100
+Subject: [PATCH 2/2] Port to Maven Shared IO 3.0.0
+
+---
+ .../java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java b/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java
+index 1030ed8..f8681fa 100644
+--- a/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java
++++ b/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java
+@@ -137,7 +137,7 @@ public class DefaultAssemblyReader
+         if ( ( descriptorSourceDirectory != null ) && descriptorSourceDirectory.isDirectory() )
+         {
+             locator.setStrategies(
+-                Collections.singletonList( new RelativeFileLocatorStrategy( descriptorSourceDirectory ) ) );
++                Collections.<LocatorStrategy>singletonList( new RelativeFileLocatorStrategy( descriptorSourceDirectory ) ) );
+ 
+             final DirectoryScanner scanner = new DirectoryScanner();
+             scanner.setBasedir( descriptorSourceDirectory );
+-- 
+2.5.0
+
diff --git a/maven-assembly-plugin.spec b/maven-assembly-plugin.spec
index 7a1e2ef..4648230 100644
--- a/maven-assembly-plugin.spec
+++ b/maven-assembly-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-assembly-plugin
 Version:        2.6
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Maven Assembly Plugin
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-assembly-plugin/
@@ -9,15 +9,16 @@ BuildArch:      noarch
 Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
 
 Patch0:         0001-Port-to-Maven-Filtering-3.0.0.patch
+Patch1:         0002-Port-to-Maven-Shared-IO-3.0.0.patch
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-plugins:pom:)
 BuildRequires:  mvn(org.apache.maven.shared:file-management)
 BuildRequires:  mvn(org.apache.maven.shared:maven-common-artifact-filters)
-BuildRequires:  mvn(org.apache.maven.shared:maven-filtering)
+BuildRequires:  mvn(org.apache.maven.shared:maven-filtering) >= 3.0.0
 BuildRequires:  mvn(org.apache.maven.shared:maven-repository-builder)
-BuildRequires:  mvn(org.apache.maven.shared:maven-shared-io)
+BuildRequires:  mvn(org.apache.maven.shared:maven-shared-io) >= 3.0.0
 BuildRequires:  mvn(org.apache.maven:maven-archiver)
 BuildRequires:  mvn(org.apache.maven:maven-artifact)
 BuildRequires:  mvn(org.apache.maven:maven-core)
@@ -45,6 +46,7 @@ This package provides %{summary}.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 # Tests need easymockclassextension version 2.x, which is incompatible
@@ -62,6 +64,9 @@ This package provides %{summary}.
 %license LICENSE NOTICE
 
 %changelog
+* Tue Jan  5 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6-5
+- Port to Maven Shared IO 3.0.0
+
 * Wed Dec  2 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6-4
 - Rebuild for maven-common-artifact-filters ABI change