Fix Maven 3 patch
This commit is contained in:
parent
ef1606bb9f
commit
a72e09f25d
@ -1,17 +1,17 @@
|
||||
From 3bdc75e42411a5bdeed165608dd913e4c51f9f27 Mon Sep 17 00:00:00 2001
|
||||
From 1b54b0ba9268a9abcf7d8b12bc631ea965690666 Mon Sep 17 00:00:00 2001
|
||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||
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<Dependency> transitiveDeps )
|
||||
throws DependencyGraphBuilderException
|
||||
{
|
||||
@ -20,7 +20,8 @@ index 8e9d895..b9bf3b9 100644
|
||||
+ new DefaultProjectBuildingRequest( session.getProjectBuildingRequest() );
|
||||
+ projectBuildingRequest.setLocalRepository( localRepository );
|
||||
+ projectBuildingRequest.setRemoteRepositories( remoteArtifactRepositories );
|
||||
+ DependencyNode node = dependencyGraphBuilder.buildDependencyGraph( projectBuildingRequest, null, Collections.singleton( project ) );
|
||||
+ projectBuildingRequest.setProject( project );
|
||||
+ DependencyNode node = dependencyGraphBuilder.buildDependencyGraph( projectBuildingRequest, null );
|
||||
boolean modified = false;
|
||||
for ( DependencyNode n2 : node.getChildren() )
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user