[maven-dependency-plugin] 02/09: Depend on libplexus-utils2-java instead of libplexus-utils-java (Closes: #871135)

[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-dependency-plugin.

commit 7dc13a6fa7a8db1a1dd9c1f16bd608c0b1f4f4d1
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Aug 31 17:06:19 2017 +0200

    Depend on libplexus-utils2-java instead of libplexus-utils-java (Closes: #871135)
---
 debian/changelog                                   |  2 ++
 debian/control                                     |  2 +-
 debian/maven.rules                                 |  1 +
 debian/patches/02-plexus-utils-compatibility.patch | 12 ++++++++++++
 debian/patches/series                              |  1 +
 5 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9b5d715..0951bab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ maven-dependency-plugin (2.8-2) UNRELEASED; urgency=medium
 
   * Team upload.
   * Build depend on junit4 instead of junit (Closes: #869012)
+  * Depend on libplexus-utils2-java instead of libplexus-utils-java
+    (Closes: #871135)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 31 Aug 2017 14:43:58 +0200
 
diff --git a/debian/control b/debian/control
index 8d2f38a..46fd60e 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends-Indep: junit4,
                      libplexus-archiver-java,
                      libplexus-container-default-java,
                      libplexus-io-java,
-                     libplexus-utils-java
+                     libplexus-utils2-java
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-java/maven-dependency-plugin.git
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/maven-dependency-plugin.git
diff --git a/debian/maven.rules b/debian/maven.rules
index 8a43ea0..99c06d8 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -18,6 +18,7 @@
 
 junit junit jar s/.*/4.x/ * *
 org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * *
+org.codehaus.plexus plexus-utils * s/.*/2.x/ * *
 s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness * s/.*/debian/ * *
 s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-tools * s/.*/debian/ * *
 s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing * s/.*/debian/ * *
diff --git a/debian/patches/02-plexus-utils-compatibility.patch b/debian/patches/02-plexus-utils-compatibility.patch
new file mode 100644
index 0000000..b499bf0
--- /dev/null
+++ b/debian/patches/02-plexus-utils-compatibility.patch
@@ -0,0 +1,12 @@
+Description: Fixes the compatibility with the version of plexus-utils in Debian
+Author: Emmanuel Bourg <ebourg at apache.or>
+Forwarded: not-needed
+--- a/src/main/java/org/apache/maven/plugin/dependency/utils/DependencySilentLog.java
++++ b/src/main/java/org/apache/maven/plugin/dependency/utils/DependencySilentLog.java
+@@ -324,4 +324,6 @@
+     {
+         return null;
+     }
++
++    public void setThreshold(int value) {};
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 326c5fd..a06606f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-fix-plugin-annotations.patch
+02-plexus-utils-compatibility.patch

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