From 821e30152a350b54dd5b7282987d724e82d513ea Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Wed, 11 Sep 2019 13:00:23 +0200
Subject: [PATCH] Port to maven-artifact-transfer 0.11.0

---
 ...grade-maven-artifact-transfer-0.11.0.patch | 51 +++++++++++++++++++
 maven-assembly-plugin.spec                    |  4 ++
 2 files changed, 55 insertions(+)
 create mode 100644 0000-Upgrade-maven-artifact-transfer-0.11.0.patch

diff --git a/0000-Upgrade-maven-artifact-transfer-0.11.0.patch b/0000-Upgrade-maven-artifact-transfer-0.11.0.patch
new file mode 100644
index 0000000..fd1ceb5
--- /dev/null
+++ b/0000-Upgrade-maven-artifact-transfer-0.11.0.patch
@@ -0,0 +1,51 @@
+From 943f668d4326a2ef174bcf6ce86ec347aff3487d Mon Sep 17 00:00:00 2001
+From: Karl Heinz Marbaise <khmarbaise@apache.org>
+Date: Sun, 26 May 2019 12:05:14 +0200
+Subject: [PATCH] [MASSEMBLY-911] - Upgrade maven-artifact-transfer 0.11.0
+
+---
+ pom.xml                                            |  2 +-
+ .../repository/DefaultRepositoryAssembler.java     | 14 +++++++-------
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index e5eb3a34..6acf3c5f 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -116,7 +116,7 @@ under the License.
+     <dependency>
+       <groupId>org.apache.maven.shared</groupId>
+       <artifactId>maven-artifact-transfer</artifactId>
+-      <version>0.9.0</version>
++      <version>0.11.0</version>
+     </dependency>
+ 
+     <dependency>
+diff --git a/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java b/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java
+index 31318b0f..ffc6b120 100644
+--- a/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java
++++ b/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java
+@@ -36,16 +36,16 @@
+ import org.apache.maven.plugins.assembly.repository.model.RepositoryInfo;
+ import org.apache.maven.project.MavenProject;
+ import org.apache.maven.project.ProjectBuildingRequest;
+-import org.apache.maven.shared.artifact.TransferUtils;
+ import org.apache.maven.shared.artifact.filter.PatternExcludesArtifactFilter;
+ import org.apache.maven.shared.artifact.filter.PatternIncludesArtifactFilter;
+ import org.apache.maven.shared.artifact.filter.ScopeArtifactFilter;
+-import org.apache.maven.shared.artifact.resolve.ArtifactResolver;
+-import org.apache.maven.shared.artifact.resolve.ArtifactResolverException;
+-import org.apache.maven.shared.artifact.resolve.ArtifactResult;
+-import org.apache.maven.shared.dependencies.resolve.DependencyResolver;
+-import org.apache.maven.shared.dependencies.resolve.DependencyResolverException;
+-import org.apache.maven.shared.repository.RepositoryManager;
++import org.apache.maven.shared.transfer.artifact.TransferUtils;
++import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
++import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException;
++import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult;
++import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
++import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolverException;
++import org.apache.maven.shared.transfer.repository.RepositoryManager;
+ import org.apache.maven.shared.utils.io.FileUtils;
+ import org.codehaus.plexus.component.annotations.Component;
+ import org.codehaus.plexus.component.annotations.Requirement;
diff --git a/maven-assembly-plugin.spec b/maven-assembly-plugin.spec
index 7798210..65b6c23 100644
--- a/maven-assembly-plugin.spec
+++ b/maven-assembly-plugin.spec
@@ -8,6 +8,8 @@ BuildArch:      noarch
 
 Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
 
+Patch0:         0000-Upgrade-maven-artifact-transfer-0.11.0.patch
+
 BuildRequires:  maven-local
 BuildRequires:  mvn(com.google.code.findbugs:jsr305)
 BuildRequires:  mvn(commons-codec:commons-codec)
@@ -45,6 +47,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.