[gradle] 02/03: Depend on plexus-classworlds instead of plexus-classworlds2

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository gradle.

commit 6f87d097693a06be7d567e87ad03c3ed3cb97a61
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Nov 11 10:13:18 2017 +0100

    Depend on plexus-classworlds instead of plexus-classworlds2
---
 debian/changelog                             |  1 +
 debian/patches/maven-3.3-compatibility.patch |  2 +-
 debian/patches/use_local_artifacts.diff      | 11 ++---------
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 57ac8f7..c79b796 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ gradle (3.2.1-5) UNRELEASED; urgency=medium
 
   * Team upload.
   * No longer use the wagon2 artifacts
+  * Depend on plexus-classworlds instead of plexus-classworlds2
 
  -- Emmanuel Bourg <ebourg at apache.org>  Sat, 11 Nov 2017 10:10:22 +0100
 
diff --git a/debian/patches/maven-3.3-compatibility.patch b/debian/patches/maven-3.3-compatibility.patch
index 6609603..da03ba6 100644
--- a/debian/patches/maven-3.3-compatibility.patch
+++ b/debian/patches/maven-3.3-compatibility.patch
@@ -8,7 +8,7 @@ Forwarded: no
      dependency "org.codehaus.plexus:plexus-interpolation:1.14 at jar"
      dependency "org.codehaus.plexus:plexus-component-annotations:1.5.5 at jar"
 -    dependency "org.codehaus.plexus:plexus-container-default:1.5.5 at jar"
-     dependency "org.codehaus.plexus:plexus-classworlds2:2.x at jar"
+     dependency "org.codehaus.plexus:plexus-classworlds:2.4 at jar"
  
 +    // Maven 3.3 compatibility
 +    dependency 'aopalliance:aopalliance:debian'
diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff
index 44a7a9a..27a415b 100644
--- a/debian/patches/use_local_artifacts.diff
+++ b/debian/patches/use_local_artifacts.diff
@@ -109,7 +109,7 @@ Last-Update: 2016-10-20
          xmlunit: 'xmlunit:xmlunit:1.3',
          nekohtml: 'net.sourceforge.nekohtml:nekohtml:1.9.14',
          xbean: 'org.apache.xbean:xbean-reflect:3.4 at jar', //required by maven3 classes
-@@ -99,37 +99,37 @@
+@@ -99,9 +99,9 @@
          jsoup:'org.jsoup:jsoup:1.6.3'
  ]
  
@@ -122,14 +122,7 @@ Last-Update: 2016-10-20
  
      //plexus:
      dependency "org.codehaus.plexus:plexus-utils:2.0.6 at jar"
-     dependency "org.codehaus.plexus:plexus-interpolation:1.14 at jar"
-     dependency "org.codehaus.plexus:plexus-component-annotations:1.5.5 at jar"
-     dependency "org.codehaus.plexus:plexus-container-default:1.5.5 at jar"
--    dependency "org.codehaus.plexus:plexus-classworlds:2.4 at jar"
-+    dependency "org.codehaus.plexus:plexus-classworlds2:2.x at jar"
- 
-     //sonatype plexus
-     dependency "org.sonatype.plexus:plexus-cipher:1.7 at jar"
+@@ -115,21 +115,21 @@
      dependency "org.sonatype.plexus:plexus-sec-dispatcher:1.3 at jar"
  
      //core:

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