[maven2-core] 01/05: 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 maven2-core.

commit fcd36e811bdad1962ada8283adc77446f2db5527
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 27 13:29:29 2017 +0200

    Depend on libplexus-classworlds2-java instead of libclassworlds-java
---
 debian/build.properties | 3 +--
 debian/changelog        | 7 +++++++
 debian/control          | 4 ++--
 debian/maven.rules      | 1 +
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/debian/build.properties b/debian/build.properties
index ea84362..b38a6a8 100644
--- a/debian/build.properties
+++ b/debian/build.properties
@@ -22,13 +22,12 @@ classpath.compile = \
             ${basedir}/maven-script/build/maven-script-${version}.jar:\
 		    /usr/share/java/doxia-sink-api.jar:\
 		    /usr/share/java/bsh.jar:\
-		    /usr/share/java/classworlds.jar:\
             /usr/share/java/commons-cli.jar:\
             /usr/share/java/junit.jar:\
             /usr/share/java/plexus-ant-factory.jar:\
             /usr/share/java/plexus-bsh-factory.jar:\
             /usr/share/java/plexus-archiver.jar:\
-            /usr/share/java/plexus-classworlds.jar:\
+            /usr/share/java/plexus-classworlds2.jar:\
             /usr/share/java/plexus-cipher.jar:\
             /usr/share/java/plexus-container-default-alpha.jar:\
             /usr/share/java/plexus-interactivity-api.jar:\
diff --git a/debian/changelog b/debian/changelog
index 40d3431..11f62db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+maven2-core (2.2.1-28) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Depend on libplexus-classworlds2-java instead of libclassworlds-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 27 Jul 2017 13:28:44 +0200
+
 maven2-core (2.2.1-27) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 9280534..83f8657 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: cdbs (>= 0.4.5.3), debhelper (>= 9), default-jdk
 Build-Depends-Indep: ant,
                      ant-optional,
                      junit,
-                     libclassworlds-java (>= 1.1),
+                     libplexus-classworlds2-java,
                      libcommons-cli-java (>= 1.1),
                      libdoxia-core-java (>= 1.1),
                      libmodello-java (>= 1.0.1),
@@ -31,7 +31,7 @@ Homepage: http://maven.apache.org
 
 Package: libmaven2-core-java
 Architecture: all
-Depends: libclassworlds-java (>= 1.1),
+Depends: libplexus-classworlds2-java,
          libcommons-cli-java (>= 1.1),
          libdoxia-core-java (>= 1.1),
          libplexus-ant-factory-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index 26a7814..524439b 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,3 +1,4 @@
 org.codehaus.plexus plexus-container-default jar s/1\.0-alpha-.*/1.0-alpha/
 s/bsh/org.beanshell/ bsh jar s/.*/debian/
 junit junit jar s/3\..*/3.x/
+s/classworlds/org.codehaus.plexus/ s/classworlds/plexus-classworld/ * s/.*/2.x/ * *

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