[maven-shade-plugin] 01/01: Fixed a NPE in ShadeMojo caused by the switch to maven-dependency-tree 3.0

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository maven-shade-plugin.

commit a557520e802f3d09c9b5de870c06c041e27939f6
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Sep 7 00:43:15 2017 +0200

    Fixed a NPE in ShadeMojo caused by the switch to maven-dependency-tree 3.0
---
 debian/changelog                                            | 7 +++++++
 debian/patches/01-maven-dependency-tree-compatibility.patch | 6 ++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9322251..bb91f22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+maven-shade-plugin (3.1.0-3) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed a NPE in ShadeMojo caused by the switch to maven-dependency-tree 3.0
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 07 Sep 2017 00:43:00 +0200
+
 maven-shade-plugin (3.1.0-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/01-maven-dependency-tree-compatibility.patch b/debian/patches/01-maven-dependency-tree-compatibility.patch
index 4e6c5ea..eeb1ad1 100644
--- a/debian/patches/01-maven-dependency-tree-compatibility.patch
+++ b/debian/patches/01-maven-dependency-tree-compatibility.patch
@@ -3,12 +3,14 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: no
 --- a/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
 +++ b/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
-@@ -1138,7 +1138,7 @@
+@@ -1138,7 +1138,9 @@
                                           List<Dependency> transitiveDeps )
                                               throws DependencyGraphBuilderException
      {
 -        DependencyNode node = dependencyGraphBuilder.buildDependencyGraph( project, null );
-+        DependencyNode node = dependencyGraphBuilder.buildDependencyGraph( session.getProjectBuildingRequest(), null );
++        ProjectBuildingRequest pbr = new DefaultProjectBuildingRequest( session.getProjectBuildingRequest() );
++        pbr.setProject( project );
++        DependencyNode node = dependencyGraphBuilder.buildDependencyGraph( pbr, null );
          boolean modified = false;
          for ( DependencyNode n2 : node.getChildren() )
          {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-shade-plugin.git