[plexus-cli] 02/04: Depend on libplexus-container-default1.5-java instead of libplexus-container-default-java and libplexus-containers-java

[Emmanuel Bourg]

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

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

commit 427ecc8fcdc47da776caaf293931718fbd041dbb
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Aug 29 22:45:00 2017 +0200

    Depend on libplexus-container-default1.5-java instead of libplexus-container-default-java and libplexus-containers-java
---
 debian/changelog                           |  2 ++
 debian/control                             |  4 +---
 debian/maven.rules                         |  3 ++-
 debian/patches/0002-junit-dependency.patch | 18 ++++++++++++++++++
 debian/patches/series                      |  1 +
 5 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b1c77b4..74f2c00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 plexus-cli (1.2-7) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Depend on libplexus-container-default1.5-java instead of
+    libplexus-container-default-java and libplexus-containers-java
   * Depend on libplexus-utils2-java intead of libplexus-utils2-java
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 04 Aug 2017 00:09:48 +0200
diff --git a/debian/control b/debian/control
index 05a1485..0b89176 100644
--- a/debian/control
+++ b/debian/control
@@ -11,9 +11,7 @@ Build-Depends:
  libcommons-cli-java,
  libguava-java,
  libmaven-javadoc-plugin-java,
- libplexus-container-default-java,
- libplexus-container-default-java-doc,
- libplexus-containers-java,
+ libplexus-container-default1.5-java,
  libplexus-utils2-java,
  libplexus-utils2-java-doc,
  maven-debian-helper (>= 1.4)
diff --git a/debian/maven.rules b/debian/maven.rules
index b3f35b0..6514cd8 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -16,6 +16,7 @@
 # and version starting with 3., replacing the version with 3.x
 #   junit junit jar s/3\\..*/3.x/
 
+junit junit * s/.*/4.x/ * *
 org.codehaus.plexus plexus-cli jar 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.codehaus.plexus plexus-utils * s/.*/2.x/ * *
diff --git a/debian/patches/0002-junit-dependency.patch b/debian/patches/0002-junit-dependency.patch
new file mode 100644
index 0000000..4b9e033
--- /dev/null
+++ b/debian/patches/0002-junit-dependency.patch
@@ -0,0 +1,18 @@
+Description: Adds the dependency on junit (no longer provided by plexus-container-default)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/pom.xml
++++ b/pom.xml
+@@ -42,6 +42,12 @@
+       <artifactId>plexus-container-default</artifactId>
+       <version>1.0-beta-3.0.7</version>
+     </dependency>
++    <dependency>
++      <groupId>junit</groupId>
++      <artifactId>junit</artifactId>
++      <version>4.12</version>
++      <scope>test</scope>
++    </dependency>
+   </dependencies>
+ 
+   <scm>
diff --git a/debian/patches/series b/debian/patches/series
index 5a7b82f..793d30c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-add-dependency-plexus-container-default-to-pom.xml.patch
+0002-junit-dependency.patch

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