[gradle] 01/05: Moved aether dependencies changes to eclipse-aether.diff

[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 ed08b52b3128b6b7385ed1dfc2a76d200c5f8934
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Mar 2 12:50:03 2016 +0100

    Moved aether dependencies changes to eclipse-aether.diff
---
 debian/changelog                        |  1 +
 debian/patches/eclipse-aether.diff      | 19 +++++++++++++++++++
 debian/patches/use_local_artifacts.diff | 17 +++--------------
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ea1c29d..597dbcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ gradle (2.10-2) UNRELEASED; urgency=medium
   * Removed disable_java9.diff (no longer required)
   * Removed 26_disable_commitid.diff (not required)
   * Replaced disable_release_notes.diff with a task exclusion parameter
+  * Moved aether dependencies changes to eclipse-aether.diff
   * Standards-Version updated to 3.9.7 (no changes)
   * Use a secure Vcs-Git URL
 
diff --git a/debian/patches/eclipse-aether.diff b/debian/patches/eclipse-aether.diff
index e9b5d68..0766399 100644
--- a/debian/patches/eclipse-aether.diff
+++ b/debian/patches/eclipse-aether.diff
@@ -2,6 +2,25 @@ Description: Maven module originally uses aether which is deprecated. This
              patch changes it to use eclipse-aether.
 Author: Kai-Chung Yan <seamlikok at gmail.com>
 Last-Update: 2015-09-30
+--- a/gradle/dependencies.gradle
++++ b/gradle/dependencies.gradle
+@@ -130,11 +130,11 @@
+     dependency 'org.apache.maven.wagon:wagon-http-shared-2.x'
+ 
+     //eather:
+-    dependency "org.sonatype.aether:aether-api:1.13.1 at jar"
+-    dependency "org.sonatype.aether:aether-impl:1.13.1 at jar"
+-    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"
++    dependency "org.eclipse.aether:eclipse-aether-impl"
++    dependency "org.eclipse.aether:eclipse-aether-spi"
++    dependency "org.eclipse.aether:eclipse-aether-util"
++    dependency 'org.eclipse.aether:eclipse-aether-connector-basic'
+ }
+ 
+ libraries.spock = [
 --- a/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/SnapshotVersionManager.java
 +++ b/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/SnapshotVersionManager.java
 @@ -16,13 +16,13 @@
diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff
index 3af0e1f..fa71b5a 100644
--- a/debian/patches/use_local_artifacts.diff
+++ b/debian/patches/use_local_artifacts.diff
@@ -115,7 +115,7 @@ Last-Update: 2015-07-08
  libraries.jetty_util = dependencies.module("org.mortbay.jetty:jetty-util:6.1.25") {
      dependency libraries.slf4j_api
      dependency libraries.servlet_api
-@@ -74,72 +74,72 @@
+@@ -74,58 +74,58 @@
      dependency "org.apache.httpcomponents:httpcore:4.2.2 at jar"
      dependency libraries.jcl_to_slf4j
      dependency "commons-codec:commons-codec:1.6 at jar"
@@ -201,19 +201,8 @@ Last-Update: 2015-07-08
 +    dependency 'org.apache.maven.wagon:wagon-http-shared-2.x'
  
      //eather:
--    dependency "org.sonatype.aether:aether-api:1.13.1 at jar"
--    dependency "org.sonatype.aether:aether-impl:1.13.1 at jar"
--    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"
-+    dependency "org.eclipse.aether:eclipse-aether-impl"
-+    dependency "org.eclipse.aether:eclipse-aether-spi"
-+    dependency "org.eclipse.aether:eclipse-aether-util"
-+    dependency 'org.eclipse.aether:eclipse-aether-connector-basic'
- }
- 
- libraries.spock = [
+     dependency "org.sonatype.aether:aether-api:1.13.1 at jar"
+@@ -139,7 +139,7 @@
      'org.spockframework:spock-core:0.7-groovy-2.0 at jar',
      libraries.groovy,
      libraries.objenesis,

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