[maven-dependency-plugin] 03/09: Depend on libplexus-classworlds2-java instead of libclassworlds-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-dependency-plugin.

commit 6e1f6d699f6024760841a2c64f7ba88b7c60c65c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Aug 31 17:10:14 2017 +0200

    Depend on libplexus-classworlds2-java instead of libclassworlds-java
---
 debian/changelog                                  |  1 +
 debian/maven.rules                                |  1 +
 debian/patches/03-classworlds-compatibility.patch | 14 ++++++++++++++
 debian/patches/series                             |  1 +
 4 files changed, 17 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0951bab..9e2b1ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ maven-dependency-plugin (2.8-2) UNRELEASED; urgency=medium
   * Build depend on junit4 instead of junit (Closes: #869012)
   * Depend on libplexus-utils2-java instead of libplexus-utils-java
     (Closes: #871135)
+  * Depend on libplexus-classworlds2-java instead of libclassworlds-java
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 31 Aug 2017 14:43:58 +0200
 
diff --git a/debian/maven.rules b/debian/maven.rules
index 99c06d8..f744233 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -24,3 +24,4 @@ s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-
 s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing * s/.*/debian/ * *
 s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-test-tools * s/.*/debian/ * *
 commons-collections commons-collections * s/.*/3.x/ * *
+s/classworlds/org.codehaus.plexus/ s/classworlds/plexus-classworlds/ * s/.*/2.x/ * *
diff --git a/debian/patches/03-classworlds-compatibility.patch b/debian/patches/03-classworlds-compatibility.patch
new file mode 100644
index 0000000..265ab36
--- /dev/null
+++ b/debian/patches/03-classworlds-compatibility.patch
@@ -0,0 +1,14 @@
+Description: Fixes the compatibility with the version of classworlds in Debian
+Author: Emmanuel Bourg <ebourg at apache.or>
+Forwarded: not-needed
+--- a/src/test/java/org/apache/maven/plugin/dependency/its/AbstractDependencyPluginITCase.java
++++ b/src/test/java/org/apache/maven/plugin/dependency/its/AbstractDependencyPluginITCase.java
+@@ -33,7 +33,7 @@
+ import org.apache.maven.shared.test.plugin.PluginTestTool;
+ import org.apache.maven.shared.test.plugin.ProjectTool;
+ import org.apache.maven.shared.test.plugin.TestToolsException;
+-import org.codehaus.classworlds.ClassRealm;
++import org.codehaus.plexus.classworlds.realm.ClassRealm;
+ import org.codehaus.plexus.PlexusContainer;
+ import org.codehaus.plexus.PlexusTestCase;
+ import org.codehaus.plexus.util.StringUtils;
diff --git a/debian/patches/series b/debian/patches/series
index a06606f..87087cd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-fix-plugin-annotations.patch
 02-plexus-utils-compatibility.patch
+03-classworlds-compatibility.patch

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