[maven-scm] 31/34: Depend on libplexus-container-default1.5-java instead of 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
in repository maven-scm.

commit f90a9ea7860ae439a3899b4b2a433c91faa70008
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jul 26 15:02:06 2017 +0200

    Depend on libplexus-container-default1.5-java instead of libplexus-container-default-java
---
 debian/changelog                                   |  2 ++
 debian/control                                     |  5 ++--
 debian/maven.rules                                 |  2 +-
 .../01-plexus-container-compatibility.patch        | 28 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 5 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3f88b89..804dee0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ maven-scm (1.9.5-1) UNRELEASED; urgency=medium
       maven-scm-provider-integrity and maven-scm-provider-jazz modules
     - Depend on libplexus-utils2-java instead of libplexus-utils-java
     - Removed the dependency on libregexp-java
+  * Depend on libplexus-container-default1.5-java
+    instead of libplexus-container-default-java
   * Standards-Version updated to 4.0.0
   * Switch to debhelper level 10
 
diff --git a/debian/control b/debian/control
index 04a3239..4aa70d7 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,7 @@ Build-Depends:
  libmodello-maven-plugin-java,
  libnetbeans-cvsclient-java,
  libplexus-component-metadata-java,
- libplexus-container-default-java,
- libplexus-container-default-java-doc,
+ libplexus-container-default1.5-java,
  libplexus-utils2-java,
  maven-debian-helper (>= 1.4),
  subversion
@@ -27,7 +26,7 @@ Homepage: http://maven.apache.org/scm/
 
 Package: libmaven-scm-java
 Architecture: all
-Depends: ${misc:Depends}, libplexus-container-default-java, libplexus-utils2-java
+Depends: ${misc:Depends}, libplexus-container-default1.5-java, libplexus-utils2-java
 Suggests: libmaven-scm-java-doc
 Description: Maven SCM - Common API for SCM operations (Core API)
  Maven SCM supports Maven 2.x plugins and other tools by providing them
diff --git a/debian/maven.rules b/debian/maven.rules
index 9733b5a..32691ff 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -48,7 +48,7 @@ org.apache.maven.scm maven-scm-providers-svn pom s/.*/debian/ * *
 org.apache.maven.scm maven-scm-providers pom s/.*/debian/ * *
 org.apache.maven.scm maven-scm-test jar s/.*/debian/ * *
 org.apache.maven.scm maven-scm 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/ * *
 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/01-plexus-container-compatibility.patch b/debian/patches/01-plexus-container-compatibility.patch
new file mode 100644
index 0000000..9714749
--- /dev/null
+++ b/debian/patches/01-plexus-container-compatibility.patch
@@ -0,0 +1,28 @@
+Description: Fixes the compatibility with the version of plexus-container-default in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
++++ b/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
+@@ -77,6 +77,11 @@
+         scmManager = null;
+     }
+ 
++    protected java.io.InputStream getCustomConfiguration() throws Exception
++    {
++        return null;
++    }
++
+     protected String getModule()
+     {
+         fail( "getModule() must be overridden." );
+--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumerTest.java
++++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumerTest.java
+@@ -57,7 +57,7 @@
+     {
+         super.setUp();
+ 
+-        logger = getContainer().getLogger();
++        logger = ((org.codehaus.plexus.MutablePlexusContainer) getContainer()).getLogger();
+         consumer = new SvnChangeLogConsumer( new DefaultLog(), null );
+     }
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..72f5b69
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-plexus-container-compatibility.patch

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