Port to maven-dependency-tree 3.0
This commit is contained in:
parent
93deb7fb6b
commit
1582e14e68
25
0001-Port-to-maven-dependency-tree-3.0.patch
Normal file
25
0001-Port-to-maven-dependency-tree-3.0.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From b46da1e532f31f5c3ca46867f3026142eeaefc22 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(-)
|
||||
|
||||
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
|
||||
--- 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
|
||||
List<Dependency> transitiveDeps )
|
||||
throws DependencyGraphBuilderException
|
||||
{
|
||||
- DependencyNode node = dependencyGraphBuilder.buildDependencyGraph( project, null );
|
||||
+ DependencyNode node = dependencyGraphBuilder.buildDependencyGraph( new DefaultProjectBuildingRequest(), null, Collections.singleton( project ) );
|
||||
boolean modified = false;
|
||||
for ( DependencyNode n2 : node.getChildren() )
|
||||
{
|
||||
--
|
||||
2.4.3
|
||||
|
@ -1,6 +1,6 @@
|
||||
Name: maven-shade-plugin
|
||||
Version: 2.4.1
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?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}
|
||||
@ -8,6 +8,8 @@ BuildArch: noarch
|
||||
|
||||
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
||||
|
||||
Patch0: 0001-Port-to-maven-dependency-tree-3.0.patch
|
||||
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(com.google.guava:guava)
|
||||
BuildRequires: mvn(commons-io:commons-io)
|
||||
@ -43,6 +45,7 @@ Summary: API documentation for %{name}
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
rm src/test/jars/plexus-utils-1.4.1.jar
|
||||
ln -s $(build-classpath plexus/utils) src/test/jars/plexus-utils-1.4.1.jar
|
||||
|
||||
@ -60,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-2
|
||||
- Port to maven-dependency-tree 3.0
|
||||
|
||||
* Thu Jul 23 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4.1-1
|
||||
- Update to upstream version 2.4.1
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user