[plexus-i18n] 29/31: Depend on libplexus-container-default1.5-java instead of 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-i18n.

commit 5140870976a43636fb20be7a0e0b847cf24d8876
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Aug 30 10:11:40 2017 +0200

    Depend on libplexus-container-default1.5-java instead of libplexus-containers-java
---
 debian/changelog                                   |  2 ++
 debian/control                                     |  3 ++-
 debian/maven.rules                                 |  2 ++
 ...ssing-dependency-plexus-container-default.patch | 22 ++++++++++------------
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9e7fc4e..961f932 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 plexus-i18n (1.0-beta-10-4) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Depend on libplexus-container-default1.5-java instead of
+    libplexus-containers-java
   * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Standards-Version updated to 4.1.0
diff --git a/debian/control b/debian/control
index fe4ae4e..019175e 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,9 @@ Build-Depends:
  debhelper (>= 10),
  default-jdk,
  default-jdk-doc,
+ junit4,
  libmaven-javadoc-plugin-java,
- libplexus-containers-java,
+ libplexus-container-default1.5-java,
  libplexus-maven-plugin-java,
  libplexus-utils-java,
  libplexus-utils-java-doc,
diff --git a/debian/maven.rules b/debian/maven.rules
index dd7c92d..b4bf573 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -16,4 +16,6 @@
 # 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-i18n jar s/.*/debian/ * *
+org.codehaus.plexus plexus-container-default * s/.*/1.5.5/ * *
diff --git a/debian/patches/0001-add-missing-dependency-plexus-container-default.patch b/debian/patches/0001-add-missing-dependency-plexus-container-default.patch
index 95f02b9..2d70f7c 100644
--- a/debian/patches/0001-add-missing-dependency-plexus-container-default.patch
+++ b/debian/patches/0001-add-missing-dependency-plexus-container-default.patch
@@ -1,16 +1,9 @@
-From: Torsten Werner <twerner at debian.org>
-Date: Fri, 26 Aug 2011 15:55:08 +0200
-Subject: [PATCH] add missing dependency plexus-container-default
-
----
- pom.xml |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index 78e7ea8..6cdf579 100644
+Description Add missing dependency plexus-container-default
+Author: Torsten Werner <twerner at debian.org>
+Forwarded: no
 --- a/pom.xml
 +++ b/pom.xml
-@@ -51,6 +51,11 @@
+@@ -51,6 +51,17 @@
        <artifactId>plexus-utils</artifactId>
        <version>1.4.5</version>
      </dependency>
@@ -19,7 +12,12 @@ index 78e7ea8..6cdf579 100644
 +      <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>
--- 

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