[gradle-1.12] 151/211: Resolve more dependencies

[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-1.12.

commit 68b839aa4d428eb8b5dd89ae6d33d71c7219a246
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Mon Jun 8 20:42:27 2015 +0800

    Resolve more dependencies
---
 debian/control                          |  2 +-
 debian/patches/use_local_artifacts.diff | 66 ++++++++++++++++++++++++++++++---
 2 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index ca3380e..97cc3f8 100644
--- a/debian/control
+++ b/debian/control
@@ -71,7 +71,7 @@ Build-Depends: ant (>= 1.8),
                libservlet2.5-java,
                libslf4j-java (>= 1.7.2),
                libspock-java (>= 0.6-groovy-1.8-3~),
-               libwagon-java,
+               libwagon2-java,
                libxalan2-java,
                libxerces2-java,
                libxmlunit-java,
diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff
index a0d0395..af46c65 100644
--- a/debian/patches/use_local_artifacts.diff
+++ b/debian/patches/use_local_artifacts.diff
@@ -5,20 +5,20 @@ Last-Update: 2015-05-24
 +++ b/build.gradle
 @@ -115,7 +115,8 @@
      group = 'org.gradle'
-
+ 
      repositories {
 -        maven { url 'http://repo.gradle.org/gradle/libs' }
 +        flatDir { dirs "/usr/share/java/" }
 +        maven { url "file:///usr/share/maven-repo" }
      }
  }
-
+ 
 --- a/subprojects/docs/docs.gradle
 +++ b/subprojects/docs/docs.gradle
 @@ -30,21 +30,6 @@
  apply plugin: 'jsoup'
  apply plugin: 'javascript-base'
-
+ 
 -repositories {
 -    javaScript.googleApis()
 -
@@ -41,12 +41,68 @@ Last-Update: 2015-05-24
 +++ b/buildSrc/build.gradle
 @@ -21,8 +21,8 @@
  apply plugin: 'eclipse'
-
+ 
  repositories {
 -    maven { url 'http://repo.gradle.org/gradle/libs' }
 -    mavenCentral()
 +    flatDir { dirs "/usr/share/java" }
 +    maven { url "file:///usr/share/maven-repo" }
  }
-
+ 
  dependencies {
+--- a/gradle/dependencies.gradle
++++ b/gradle/dependencies.gradle
+@@ -95,9 +95,9 @@
+         jsoup:'org.jsoup:jsoup:1.6.3'
+ ]
+ 
+-libraries.maven3 = dependencies.module("org.apache.maven:maven-core:3.0.4") {
+-    dependency "org.apache.maven:maven-settings:3.0.4 at jar"
+-    dependency "org.apache.maven:maven-settings-builder:3.0.4 at jar"
++libraries.maven3 = dependencies.module("org.apache.maven:maven-core:[3.0.4, )") {
++    dependency "org.apache.maven:maven-settings:[3.0.4, )@jar"
++    dependency "org.apache.maven:maven-settings-builder:[3.0.4, )@jar"
+ 
+     //plexus:
+     dependency "org.codehaus.plexus:plexus-utils:2.0.6 at jar"
+@@ -111,20 +111,20 @@
+     dependency "org.sonatype.plexus:plexus-sec-dispatcher:1.3 at jar"
+ 
+     //core:
+-    dependency "org.apache.maven:maven-core:3.0.4 at jar"
+-    dependency "org.apache.maven:maven-model-builder:3.0.4 at jar"
+-    dependency "org.apache.maven:maven-model:3.0.4 at jar"
++    dependency "org.apache.maven:maven-core:[3.0.4, )@jar"
++    dependency "org.apache.maven:maven-model-builder:[3.0.4, )@jar"
++    dependency "org.apache.maven:maven-model:[3.0.4, )@jar"
+ 
+     //somewhat core:
+-    dependency "org.apache.maven:maven-artifact:3.0.4 at jar"
+-    dependency "org.apache.maven:maven-compat:3.0.4 at jar"
+-    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:maven-artifact:[3.0.4, )@jar"
++    dependency "org.apache.maven:maven-compat:[3.0.4, )@jar"
++    dependency "org.apache.maven:maven-repository-metadata:[3.0.4, )@jar"
++    dependency "org.apache.maven:maven-plugin-api:[3.0.4, )@jar"
++    dependency "org.apache.maven:maven-aether-provider:[3.0.4, )@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"
+--- a/subprojects/core-impl/core-impl.gradle
++++ b/subprojects/core-impl/core-impl.gradle
+@@ -63,7 +63,7 @@
+     //I'm removing the components.xml file from the sec-dispatcher jar.
+     //This file contains only single component so I think we can remove it.
+     task.doLast {
+-        def plexusSec = "$outputDir/jarjar-plexus-sec-dispatcher-1.3.jar"
++        def plexusSec = "$outputDir/jarjar-plexus-sec-dispatcher.jar"
+         def plexusSecNoComps = "$plexusSec-noComps"
+         ant {
+             zip(destfile: plexusSecNoComps, update: true) {

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