[maven-ant-helper] 01/03: Updated the Maven classpath

[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-ant-helper.

commit 3d0793f4e05f958e768a0399d87581f737810255
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Nov 11 21:47:09 2017 +0100

    Updated the Maven classpath
---
 debian/changelog               |  7 +++++++
 maven-build.xml                | 10 +++++-----
 src/main/java/ModelloTask.java |  4 ++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 83a85a4..19b4b0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+maven-ant-helper (8.2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Updated the Maven classpath
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Sat, 11 Nov 2017 21:43:46 +0100
+
 maven-ant-helper (8.1) unstable; urgency=medium
 
   * Team upload.
diff --git a/maven-build.xml b/maven-build.xml
index 7dddafe..ec1ecbc 100644
--- a/maven-build.xml
+++ b/maven-build.xml
@@ -99,7 +99,7 @@
         <path id="maven.classpath">
           <pathelement location="/usr/share/maven-ant-helper/bootstrap"/>
           <fileset dir="/usr/share/java">
-            <include name="plexus-classworlds2.jar"/>
+            <include name="plexus-classworlds.jar"/>
             <include name="aopalliance.jar"/>
             <include name="cdi-api.jar"/>
             <include name="commons-cli.jar"/>
@@ -131,16 +131,16 @@
             <include name="maven-shared-utils.jar"/>
             <include name="maven3-slf4j-provider.jar"/>
             <include name="plexus-cipher.jar"/>
-            <include name="plexus-component-annotations-1.5.jar"/>
+            <include name="plexus-component-annotations.jar"/>
             <include name="plexus-interpolation.jar"/>
             <include name="plexus-sec-dispatcher.jar"/>
             <include name="plexus-utils2.jar"/>
             <include name="sisu-inject.jar"/>
             <include name="sisu-plexus.jar"/>
             <include name="slf4j-api.jar"/>
-            <include name="wagon-file-2.x.jar"/>
-            <include name="wagon-http-shaded-2.x.jar"/>
-            <include name="wagon-provider-api-2.x.jar"/>
+            <include name="wagon-file.jar"/>
+            <include name="wagon-http-shaded.jar"/>
+            <include name="wagon-provider-api.jar"/>
           </fileset>
         </path>
 
diff --git a/src/main/java/ModelloTask.java b/src/main/java/ModelloTask.java
index 5841c77..887282e 100644
--- a/src/main/java/ModelloTask.java
+++ b/src/main/java/ModelloTask.java
@@ -67,8 +67,8 @@ public class ModelloTask extends Task {
 
         addToClassPath("/usr/share/java/plexus-build-api.jar");
         addToClassPath("/usr/share/java/plexus-utils2.jar");
-        addToClassPath("/usr/share/java/plexus-classworlds2.jar");
-        addToClassPath("/usr/share/java/plexus-container-default-1.5.jar");
+        addToClassPath("/usr/share/java/plexus-classworlds.jar");
+        addToClassPath("/usr/share/java/plexus-container-default.jar");
         addToClassPath("/usr/share/java/modello-core.jar");
         addToClassPath("/usr/share/java/modello-plugin-converters.jar");
         addToClassPath("/usr/share/java/modello-plugin-dom4j.jar");

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