[gradle] 01/01: Use the maven-resolver jars instead of eclipse-aether

[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 7a2b6cbb693f6855040c82b33b8795099d11e867
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Sep 8 11:14:14 2017 +0200

    Use the maven-resolver jars instead of eclipse-aether
---
 debian/changelog                             |  7 +++++++
 debian/control                               |  4 ++--
 debian/patches/eclipse-aether.diff           | 12 ++++++------
 debian/patches/maven-3.3-compatibility.patch |  6 +++---
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7d10ade..1f066af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gradle (3.2.1-3) unstable; urgency=medium
+
+  * Team upload.
+  * Use the maven-resolver jars instead of eclipse-aether
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 08 Sep 2017 11:00:16 +0200
+
 gradle (3.2.1-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 5e1fe32..35eb3ec 100644
--- a/debian/control
+++ b/debian/control
@@ -51,7 +51,7 @@ Build-Depends: ant,
                libjsoup-java,
                libkryo-java,
                liblogback-java,
-               libmaven3-core-java (>= 3.3.3),
+               libmaven3-core-java (>= 3.5.0),
                libnative-platform-java (>= 0.11),
                libnekohtml-java,
                libobjenesis-java,
@@ -162,7 +162,7 @@ Depends: ant-optional,
          libjetty9-java,
          libjetty9-extra-java,
          libjs-jquery,
-         libmaven3-core-java (>= 3.3.3),
+         libmaven3-core-java (>= 3.5.0),
          libobjenesis-java,
          libplexus-component-annotations-java,
          libplexus-container-default1.5-java,
diff --git a/debian/patches/eclipse-aether.diff b/debian/patches/eclipse-aether.diff
index 9e06c68..fe8e93c 100644
--- a/debian/patches/eclipse-aether.diff
+++ b/debian/patches/eclipse-aether.diff
@@ -1,5 +1,5 @@
 Description: Maven module originally uses aether which is deprecated. This
-             patch changes it to use eclipse-aether.
+             patch changes it to use eclipse-aether/maven-resolver.
 Author: Kai-Chung Yan (殷啟聰)
 Last-Update: 2016-10-20
 Forwarded: no
@@ -14,11 +14,11 @@ Forwarded: no
 -    dependency "org.sonatype.aether:aether-spi:1.13.1 at jar"
 -    dependency "org.sonatype.aether:aether-util:1.13.1 at jar"
 -    dependency 'org.sonatype.aether:aether-connector-wagon:1.13.1 at jar'
-+    dependency 'org.eclipse.aether:eclipse-aether-api:1.13.1 at jar'
-+    dependency 'org.eclipse.aether:eclipse-aether-impl:1.13.1 at jar'
-+    dependency 'org.eclipse.aether:eclipse-aether-spi:1.13.1 at jar'
-+    dependency 'org.eclipse.aether:eclipse-aether-util:1.13.1 at jar'
-+    dependency 'org.eclipse.aether:eclipse-aether-connector-basic:1.13.1 at jar'
++    dependency 'org.eclipse.aether:maven-resolver-api:1.13.1 at jar'
++    dependency 'org.eclipse.aether:maven-resolver-impl:1.13.1 at jar'
++    dependency 'org.eclipse.aether:maven-resolver-spi:1.13.1 at jar'
++    dependency 'org.eclipse.aether:maven-resolver-util:1.13.1 at jar'
++    dependency 'org.eclipse.aether:maven-resolver-connector-basic:1.13.1 at jar'
  }
  
  libraries.spock = [
diff --git a/debian/patches/maven-3.3-compatibility.patch b/debian/patches/maven-3.3-compatibility.patch
index 76f0f3d..c80929d 100644
--- a/debian/patches/maven-3.3-compatibility.patch
+++ b/debian/patches/maven-3.3-compatibility.patch
@@ -29,9 +29,9 @@ Forwarded: no
      //somewhat core:
      dependency "org.apache.maven:maven-artifact-3.x:${versions.maven}@jar"
 @@ -139,6 +146,8 @@
-     dependency 'org.eclipse.aether:eclipse-aether-spi:1.13.1 at jar'
-     dependency 'org.eclipse.aether:eclipse-aether-util:1.13.1 at jar'
-     dependency 'org.eclipse.aether:eclipse-aether-connector-basic:1.13.1 at jar'
+     dependency 'org.eclipse.aether:maven-resolver-spi:1.13.1 at jar'
+     dependency 'org.eclipse.aether:maven-resolver-util:1.13.1 at jar'
+     dependency 'org.eclipse.aether:maven-resolver-connector-basic:1.13.1 at jar'
 +
 +    dependency "org.apache.commons:commons-lang3"
  }

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