[gradle] 06/08: Refresh patches

[Kai-Chung Yan]

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

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

commit e55b34c1dcf7671a5e97f868f787eeaac6b2c145
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Wed Jul 8 20:48:34 2015 +0800

    Refresh patches
---
 debian/patches/disable_tests.diff       |  2 +-
 debian/patches/jcommander.diff          |  2 +-
 debian/patches/use_local_artifacts.diff | 37 ++++++++++++++++++++++++++-------
 3 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/debian/patches/disable_tests.diff b/debian/patches/disable_tests.diff
index 4e6ade0..4e54726 100644
--- a/debian/patches/disable_tests.diff
+++ b/debian/patches/disable_tests.diff
@@ -243,7 +243,7 @@ Last-Update: 2015-07-02
 --- a/subprojects/maven/maven.gradle
 +++ b/subprojects/maven/maven.gradle
 @@ -29,12 +29,6 @@
-     compile "org.codehaus.plexus:plexus-component-annotations:1.5.2 at jar"
+     compile "org.codehaus.plexus:plexus-component-annotations-1.5"
  
      testCompile libraries.xmlunit
 -
diff --git a/debian/patches/jcommander.diff b/debian/patches/jcommander.diff
index 6569925..2aba2a0 100644
--- a/debian/patches/jcommander.diff
+++ b/debian/patches/jcommander.diff
@@ -4,7 +4,7 @@ Last-Update: 2015-07-03
 --- a/subprojects/maven/maven.gradle
 +++ b/subprojects/maven/maven.gradle
 @@ -29,6 +29,8 @@
-     compile "org.codehaus.plexus:plexus-component-annotations:1.5.2 at jar"
+     compile "org.codehaus.plexus:plexus-component-annotations-1.5"
  
      testCompile libraries.xmlunit
 +
diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff
index 5c008dd..6323680 100644
--- a/debian/patches/use_local_artifacts.diff
+++ b/debian/patches/use_local_artifacts.diff
@@ -88,7 +88,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
-@@ -73,30 +73,30 @@
+@@ -73,36 +73,36 @@
      dependency "org.apache.httpcomponents:httpcore:4.2.2 at jar"
      dependency libraries.jcl_to_slf4j
      dependency "commons-codec:commons-codec:1.6 at jar"
@@ -130,6 +130,14 @@ Last-Update: 2015-07-08
  
      //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-component-annotations-1.5"
++    dependency "org.codehaus.plexus:plexus-container-default-1.5"
+     dependency "org.codehaus.plexus:plexus-classworlds:2.4 at jar"
+ 
+     //sonatype plexus
 @@ -110,28 +110,28 @@
      dependency "org.sonatype.plexus:plexus-sec-dispatcher:1.3 at jar"
  
@@ -148,16 +156,20 @@ Last-Update: 2015-07-08
 -    dependency "org.apache.maven:maven-repository-metadata:3.0.4 at jar"
 -    dependency "org.apache.maven:maven-plugin-api:3.0.4 at jar"
 -    dependency "org.apache.maven:maven-aether-provider:3.0.4 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:maven3-artifact"
 +    dependency "org.apache.maven:maven3-repository-metadata"
 +    dependency "org.apache.maven:maven3-plugin-api"
 +    dependency "org.apache.maven:maven3-aether-provider"
- 
-     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'
++
++    dependency 'org.apache.maven.wagon:wagon-file-2.x'
++    dependency 'org.apache.maven.wagon:wagon-http-2.x'
++    dependency 'org.apache.maven.wagon:wagon-provider-api-2.x'
++    dependency 'org.apache.maven.wagon:wagon-http-shared-2.x'
  
      //eather:
 -    dependency "org.sonatype.aether:aether-api:1.13.1 at jar"
@@ -367,3 +379,14 @@ Last-Update: 2015-07-08
  dependencies {
      compile project(":core")
      compile project(":resources")
+--- a/subprojects/maven/maven.gradle
++++ b/subprojects/maven/maven.gradle
+@@ -26,7 +26,7 @@
+     compile libraries.maven3
+     compile "org.sonatype.pmaven:pmaven-common:0.8-20100325 at jar"
+     compile "org.sonatype.pmaven:pmaven-groovy:0.8-20100325 at jar"
+-    compile "org.codehaus.plexus:plexus-component-annotations:1.5.2 at jar"
++    compile "org.codehaus.plexus:plexus-component-annotations-1.5"
+ 
+     testCompile libraries.xmlunit
+ 

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