[gradle] 01/03: No longer use the wagon2 artifacts

[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 b53362a633e6955826575bd2a0b3cc60639f3bf2
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Nov 11 10:10:57 2017 +0100

    No longer use the wagon2 artifacts
---
 debian/changelog                        |  7 +++++++
 debian/control                          |  5 +++++
 debian/maven.rules                      |  6 +-----
 debian/patches/eclipse-aether.diff      |  2 +-
 debian/patches/use_local_artifacts.diff | 16 ++++++----------
 5 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 418e25a..57ac8f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gradle (3.2.1-5) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * No longer use the wagon2 artifacts
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Sat, 11 Nov 2017 10:10:22 +0100
+
 gradle (3.2.1-4) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 437a998..dd7e2ef 100644
--- a/debian/control
+++ b/debian/control
@@ -67,6 +67,9 @@ Build-Depends: ant,
                libslf4j-java,
                libspock-java (>= 0.7),
                libtomcat8-java,
+               libwagon-file-java,
+               libwagon-http-java,
+               libwagon2-java,
                libxalan2-java,
                libxbean-reflect-java,
                libxerces2-java,
@@ -173,6 +176,8 @@ Depends: ant-optional,
          libservlet3.1-java,
          libsimple-http-java,
          libtomcat8-java,
+         libwagon-file-java,
+         libwagon-http-java,
          libxerces2-java,
          testng,
          ${misc:Depends}
diff --git a/debian/maven.rules b/debian/maven.rules
index d179d54..72ceba1 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -13,12 +13,8 @@ org.apache.maven       s/maven-plugin-api-3.x/maven-plugin-api/
 org.apache.maven       s/maven-repository-metadata-3.x/maven-repository-metadata/        * * * *
 org.apache.maven       s/maven-settings-3.x/maven-settings/                              * * * *
 org.apache.maven       s/maven-settings-builder-3.x/maven-settings-builder/              * * * *
-org.apache.maven.wagon s/wagon-file-2\.x/wagon-file/                                     * * * *
-org.apache.maven.wagon s/wagon-http-2\.x/wagon-http/                                     * * * *
-org.apache.maven.wagon s/wagon-http-shared-2\.x/wagon-http-shared/                       * * * *
-org.apache.maven.wagon s/wagon-provider-api-2\.x/wagon-provider-api/                     * * * *
 org.codehaus.plexus    s/plexus-classworlds2/plexus-classworlds/                         * * * *
 org.codehaus.plexus    s/plexus-component-annotations-1\.5/plexus-component-annotations/ * * * *
 org.eclipse.sisu       s/sisu-inject/org.eclipse.sisu.inject/                            * * * *
 org.eclipse.sisu       s/sisu-plexus/org.eclipse.sisu.plexus/                            * * * *
-org.testng             testng                                                            * s/.*/6\.x/ * *
\ No newline at end of file
+org.testng             testng                                                            * s/.*/6\.x/ * *
diff --git a/debian/patches/eclipse-aether.diff b/debian/patches/eclipse-aether.diff
index fe8e93c..77f38cf 100644
--- a/debian/patches/eclipse-aether.diff
+++ b/debian/patches/eclipse-aether.diff
@@ -6,7 +6,7 @@ Forwarded: no
 --- a/gradle/dependencies.gradle
 +++ b/gradle/dependencies.gradle
 @@ -134,11 +134,11 @@
-     dependency 'org.apache.maven.wagon:wagon-http-shared-2.x:2.x at jar'
+     dependency 'org.apache.maven.wagon:wagon-http-shared:2.4 at jar'
  
      //eather:
 -    dependency "org.sonatype.aether:aether-api:1.13.1 at jar"
diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff
index e741e34..44a7a9a 100644
--- a/debian/patches/use_local_artifacts.diff
+++ b/debian/patches/use_local_artifacts.diff
@@ -147,20 +147,16 @@ Last-Update: 2016-10-20
 -    dependency "org.apache.maven:maven-repository-metadata:${versions.maven}@jar"
 -    dependency "org.apache.maven:maven-plugin-api:${versions.maven}@jar"
 -    dependency "org.apache.maven:maven-aether-provider:${versions.maven}@jar"
--
--    dependency 'org.apache.maven.wagon:wagon-file:2.4 at jar'
--    dependency 'org.apache.maven.wagon:wagon-http:2.4 at jar'
--    dependency 'org.apache.maven.wagon:wagon-provider-api:2.4 at jar'
--    dependency 'org.apache.maven.wagon:wagon-http-shared4:2.4 at jar'
 +    dependency "org.apache.maven:maven-artifact-3.x:${versions.maven}@jar"
 +    dependency "org.apache.maven:maven-repository-metadata-3.x:${versions.maven}@jar"
 +    dependency "org.apache.maven:maven-plugin-api-3.x:${versions.maven}@jar"
 +    dependency "org.apache.maven:maven-aether-provider-3.x:${versions.maven}@jar"
-+
-+    dependency 'org.apache.maven.wagon:wagon-file-2.x:2.x at jar'
-+    dependency 'org.apache.maven.wagon:wagon-http-2.x:2.x at jar'
-+    dependency 'org.apache.maven.wagon:wagon-provider-api-2.x:2.x at jar'
-+    dependency 'org.apache.maven.wagon:wagon-http-shared-2.x:2.x at jar'
+ 
+     dependency 'org.apache.maven.wagon:wagon-file:2.4 at jar'
+     dependency 'org.apache.maven.wagon:wagon-http:2.4 at jar'
+     dependency 'org.apache.maven.wagon:wagon-provider-api:2.4 at jar'
+-    dependency 'org.apache.maven.wagon:wagon-http-shared4:2.4 at jar'
++    dependency 'org.apache.maven.wagon:wagon-http-shared:2.4 at jar'
  
      //eather:
      dependency "org.sonatype.aether:aether-api:1.13.1 at jar"

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