[wagon] 59/62: Depend on libplexus-container-default1.5-java instead of libplexus-containers-java and libplexus-container-default-java

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master-1.x
in repository wagon.

commit 4eae36c44fa17f6979c674cb37c1df40add1007b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Aug 30 11:40:06 2017 +0200

    Depend on libplexus-container-default1.5-java instead of libplexus-containers-java and libplexus-container-default-java
---
 debian/changelog   | 8 ++++++++
 debian/control     | 5 +----
 debian/maven.rules | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3ffb745..26e0cbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+wagon (1.0.0-10) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Depend on libplexus-container-default1.5-java instead of
+    libplexus-containers-java and libplexus-container-default-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 30 Aug 2017 11:33:37 +0200
+
 wagon (1.0.0-9) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index ebd53a0..c38d1cc 100644
--- a/debian/control
+++ b/debian/control
@@ -22,10 +22,7 @@ Build-Depends-Indep: default-jdk-doc,
                      libjsoup-java,
                      libmaven-enforcer-plugin-java,
                      libmaven-javadoc-plugin-java,
-                     libplexus-container-default-java,
-                     libplexus-container-default-java-doc,
-                     libplexus-containers-java,
-                     libplexus-containers-java-doc,
+                     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 072b973..c19933a 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -35,7 +35,7 @@ org.apache.maven.wagon wagon-ssh jar s/.*/debian/ * *
 org.apache.maven.wagon wagon-tck-http jar s/.*/debian/ * *
 org.apache.maven.wagon wagon-tcks pom s/.*/debian/ * *
 org.apache.maven.wagon wagon pom s/.*/debian/ * *
-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.jsoup jsoup jar s/.*/debian/ * *
 commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *
 s/easymock/org.easymock/ easymock * s/.*/debian/ * *

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