[maven-shade-plugin] 01/01: Build with 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 fba3cb949bf40ce320feea0782b4fa508e1c0896
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Sep 4 17:55:04 2017 +0200

    Build with maven-dependency-tree (>= 3.0)
---
 debian/changelog                                           |  7 +++++++
 debian/control                                             |  2 +-
 .../patches/01-maven-dependency-tree-compatibility.patch   | 14 ++++++++++++++
 debian/patches/series                                      |  1 +
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f561b2f..9322251 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+maven-shade-plugin (3.1.0-2) unstable; urgency=medium
+
+  * Team upload.
+  * Build with maven-dependency-tree (>= 3.0)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 04 Sep 2017 17:54:43 +0200
+
 maven-shade-plugin (3.1.0-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index d701fb8..56f7f15 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends-Indep: junit4,
                      libjdependency-java,
                      libjdom1-java (>= 1.0),
                      libmaven-artifact-transfer-java,
-                     libmaven-dependency-tree-java,
+                     libmaven-dependency-tree-java (>= 3.0),
                      libmaven-plugin-tools-java,
                      libmaven3-core-java,
                      libmockito-java,
diff --git a/debian/patches/01-maven-dependency-tree-compatibility.patch b/debian/patches/01-maven-dependency-tree-compatibility.patch
new file mode 100644
index 0000000..4e6c5ea
--- /dev/null
+++ b/debian/patches/01-maven-dependency-tree-compatibility.patch
@@ -0,0 +1,14 @@
+Description: Fixes the compatibility with the version of maven-dependency-tree in Debian
+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 @@
+                                          List<Dependency> transitiveDeps )
+                                              throws DependencyGraphBuilderException
+     {
+-        DependencyNode node = dependencyGraphBuilder.buildDependencyGraph( project, null );
++        DependencyNode node = dependencyGraphBuilder.buildDependencyGraph( session.getProjectBuildingRequest(), null );
+         boolean modified = false;
+         for ( DependencyNode n2 : node.getChildren() )
+         {
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9687ef2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-maven-dependency-tree-compatibility.patch

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