Fix Maven 3 patch
This commit is contained in:
parent
1582e14e68
commit
ef1606bb9f
@ -1,22 +1,26 @@
|
||||
From b46da1e532f31f5c3ca46867f3026142eeaefc22 Mon Sep 17 00:00:00 2001
|
||||
From 3bdc75e42411a5bdeed165608dd913e4c51f9f27 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 | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java | 6 +++++-
|
||||
1 file changed, 5 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..375ed65 100644
|
||||
index 8e9d895..b9bf3b9 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,7 @@ public class ShadeMojo
|
||||
@@ -1112,7 +1112,11 @@ public class ShadeMojo
|
||||
List<Dependency> transitiveDeps )
|
||||
throws DependencyGraphBuilderException
|
||||
{
|
||||
- DependencyNode node = dependencyGraphBuilder.buildDependencyGraph( project, null );
|
||||
+ DependencyNode node = dependencyGraphBuilder.buildDependencyGraph( new DefaultProjectBuildingRequest(), null, Collections.singleton( project ) );
|
||||
+ ProjectBuildingRequest projectBuildingRequest =
|
||||
+ new DefaultProjectBuildingRequest( session.getProjectBuildingRequest() );
|
||||
+ projectBuildingRequest.setLocalRepository( localRepository );
|
||||
+ projectBuildingRequest.setRemoteRepositories( remoteArtifactRepositories );
|
||||
+ DependencyNode node = dependencyGraphBuilder.buildDependencyGraph( projectBuildingRequest, null, Collections.singleton( project ) );
|
||||
boolean modified = false;
|
||||
for ( DependencyNode n2 : node.getChildren() )
|
||||
{
|
||||
|
@ -1,6 +1,6 @@
|
||||
Name: maven-shade-plugin
|
||||
Version: 2.4.1
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: This plugin provides the capability to package the artifact in an uber-jar
|
||||
License: ASL 2.0
|
||||
URL: http://maven.apache.org/plugins/%{name}
|
||||
@ -63,6 +63,9 @@ ln -s $(build-classpath plexus/utils) src/test/jars/plexus-utils-1.4.1.jar
|
||||
%license LICENSE NOTICE
|
||||
|
||||
%changelog
|
||||
* Mon Oct 12 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4.1-3
|
||||
- Fix Maven 3 patch
|
||||
|
||||
* Mon Oct 12 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4.1-2
|
||||
- Port to maven-dependency-tree 3.0
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user