From a72e09f25d3b7aefddf8ecd138563a37dc328172 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 12 Oct 2015 22:28:25 +0200 Subject: [PATCH] Fix Maven 3 patch --- 0001-Port-to-maven-dependency-tree-3.0.patch | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/0001-Port-to-maven-dependency-tree-3.0.patch b/0001-Port-to-maven-dependency-tree-3.0.patch index f5c838b..52288ec 100644 --- a/0001-Port-to-maven-dependency-tree-3.0.patch +++ b/0001-Port-to-maven-dependency-tree-3.0.patch @@ -1,26 +1,27 @@ -From 3bdc75e42411a5bdeed165608dd913e4c51f9f27 Mon Sep 17 00:00:00 2001 +From 1b54b0ba9268a9abcf7d8b12bc631ea965690666 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 12 Oct 2015 16:40:07 +0200 Subject: [PATCH] Port to maven-dependency-tree 3.0 --- - src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) + src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java b/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java -index 8e9d895..b9bf3b9 100644 +index 8e9d895..cb3b7ac 100644 --- a/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java +++ b/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java -@@ -1112,7 +1112,11 @@ public class ShadeMojo +@@ -1112,7 +1112,12 @@ public class ShadeMojo List transitiveDeps ) throws DependencyGraphBuilderException { - DependencyNode node = dependencyGraphBuilder.buildDependencyGraph( project, null ); + ProjectBuildingRequest projectBuildingRequest = + new DefaultProjectBuildingRequest( session.getProjectBuildingRequest() ); -+ projectBuildingRequest.setLocalRepository( localRepository ); -+ projectBuildingRequest.setRemoteRepositories( remoteArtifactRepositories ); -+ DependencyNode node = dependencyGraphBuilder.buildDependencyGraph( projectBuildingRequest, null, Collections.singleton( project ) ); ++ projectBuildingRequest.setLocalRepository( localRepository ); ++ projectBuildingRequest.setRemoteRepositories( remoteArtifactRepositories ); ++ projectBuildingRequest.setProject( project ); ++ DependencyNode node = dependencyGraphBuilder.buildDependencyGraph( projectBuildingRequest, null ); boolean modified = false; for ( DependencyNode n2 : node.getChildren() ) {