[wagon2] 09/11: Depend on libplexus-container-default1.5-java instead of libplexus-containers-java and libplexus-container-default-java (Closes: #855959)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository wagon2.

commit af0bd2702de1386435cfb144da330526a3346fca
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Aug 3 12:41:30 2017 +0200

    Depend on libplexus-container-default1.5-java instead of libplexus-containers-java and libplexus-container-default-java (Closes: #855959)
---
 debian/changelog   | 3 +++
 debian/control     | 7 ++-----
 debian/maven.rules | 3 +--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 574576a..f2919d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ wagon2 (2.12-3) UNRELEASED; urgency=medium
   * Fixed the build failure caused by the maven-parent update
   * Depend on libplexus-classworlds2-java instead of libplexus-classworlds-java
   * Depend on libplexus-utils2-java instead of libplexus-utils-java
+  * Depend on libplexus-container-default1.5-java instead of
+    libplexus-containers-java and libplexus-container-default-java
+    (Closes: #855959)
   * Removed the unused dependencies on libbcprov-java and libnekohtml-java
   * Build depend on junit4 instead of junit (Closes: #869004)
   * Standards-Version updated to 4.0.0
diff --git a/debian/control b/debian/control
index cc2ec88..d00f975 100644
--- a/debian/control
+++ b/debian/control
@@ -24,11 +24,8 @@ Build-Depends-Indep: default-jdk-doc,
                      libmaven-scm-java,
                      libmaven-scm-java-doc,
                      libmaven-shade-plugin-java,
-                     libplexus-containers1.5-java,
-                     libplexus-container-default-java,
-                     libplexus-container-default-java-doc,
-                     libplexus-containers-java,
-                     libplexus-containers-java-doc,
+                     libplexus-component-metadata-java,
+                     libplexus-container-default1.5-java,
                      libplexus-interactivity-api-java,
                      libplexus-interactivity-api-java-doc,
                      libplexus-maven-plugin-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index c8830ca..9bcfad3 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -19,8 +19,7 @@
 junit junit jar s/.*/4.x/ * *
 org.apache.maven.wagon wagon* * s/.*/2.x/ * *
 org.codehaus.plexus plexus-classworlds * s/.*/2.x/ * *
-org.codehaus.plexus plexus-component-metadata jar s/.*/1.5.5/ * *
-org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * *
+org.codehaus.plexus plexus-container-default jar s/.*/1.5.5/ * *
 org.codehaus.plexus plexus-utils * s/.*/2.x/ * *
 s/org.eclipse.jetty.aggregate/org.eclipse.jetty/ s/jetty-all/jetty-webapp/ * s/.*/9.x/ * *
 javax.servlet javax.servlet-api * s/.*/3.1/ * *

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