[gradle] 09/09: Use maven.rules to correct the modified dependencies of Maven POMs.

Kai-Chung Yan seamlik-guest at moszumanska.debian.org
Thu Sep 8 07:19:04 UTC 2016


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

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

commit 488f0796d73c630bebba6b119bbae85637a67bf4
Author: Kai-Chung Yan (殷啟聰) <seamlikok at gmail.com>
Date:   Thu Sep 8 15:11:17 2016 +0800

    Use maven.rules to correct the modified dependencies of Maven POMs.
    
    Originally intended to achieve this with Gradle's ResolutionStrategy.
    However the dependency resolver of flatDir wouldn't work with the
    substitution rules. Wondering if it is the bug of the build scripts of Gradle
    itself. Otherwise, use_local_artifacts.diff would have been shorter.
---
 debian/maven.rules                           |  22 ++++++
 debian/patches/disable_tests.diff            |   5 +-
 debian/patches/eclipse-aether.diff           |  13 ++--
 debian/patches/generate_pom.diff             |   5 +-
 debian/patches/jcommander.diff               |   3 +-
 debian/patches/maven-3.3-compatibility.patch |  41 +++++------
 debian/patches/nekohtml.diff                 |   7 +-
 debian/patches/use_local_artifacts.diff      | 100 +++++++++++++--------------
 debian/substituteDependencies.gradle         |  11 +++
 9 files changed, 123 insertions(+), 84 deletions(-)

diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..a194db2
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,22 @@
+commons-collections    s/commons-collections3/commons-collections/                       * * * *
+javax.inject           s/atinject-jsr330-api/javax.inject/                               * * * *
+junit                  s/junit4/junit/                                                   * * * *
+org.apache.maven       s/maven-aether-provider-3.x/maven-aether-provider/                * * * *
+org.apache.maven       s/maven-artifact-3.x/maven-artifact/                              * * * *
+org.apache.maven       s/maven-builder-support-3.x/maven-builder-support/                * * * *
+org.apache.maven       s/maven-compat-3.x/maven-compat/                                  * * * *
+org.apache.maven       s/maven-core-3.x/maven-core/                                      * * * *
+org.apache.maven       s/maven-model-3.x/maven-model/                                    * * * *
+org.apache.maven       s/maven-model-builder-3.x/maven-model-builder/                    * * * *
+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/                            * * * *
\ No newline at end of file
diff --git a/debian/patches/disable_tests.diff b/debian/patches/disable_tests.diff
index e765594..e877b05 100644
--- a/debian/patches/disable_tests.diff
+++ b/debian/patches/disable_tests.diff
@@ -1,6 +1,7 @@
 Description: Disable tests
 Author: Kai-Chung Yan <seamlikok at gmail.com>
 Last-Update: 2015-09-30
+Forwarded: not-needed
 --- a/build.gradle
 +++ b/build.gradle
 @@ -108,7 +108,6 @@
@@ -19,7 +20,7 @@ Last-Update: 2015-09-30
  apply from: "gradle/taskOrdering.gradle"
  apply from: "gradle/fix-GRADLE-2492.gradle"
  apply from: 'gradle/customM2Check.gradle'
-@@ -271,7 +269,6 @@
+@@ -272,7 +270,6 @@
      dependsOn ':killExistingDaemons'
  }
  
@@ -228,7 +229,7 @@ Last-Update: 2015-09-30
 --- a/subprojects/maven/maven.gradle
 +++ b/subprojects/maven/maven.gradle
 @@ -29,12 +29,6 @@
-     compile "org.codehaus.plexus:plexus-component-annotations-1.5"
+     compile "org.codehaus.plexus:plexus-component-annotations-1.5:1.6 at jar"
  
      testCompile libraries.xmlunit
 -
diff --git a/debian/patches/eclipse-aether.diff b/debian/patches/eclipse-aether.diff
index d4ad21b..80832ad 100644
--- a/debian/patches/eclipse-aether.diff
+++ b/debian/patches/eclipse-aether.diff
@@ -2,10 +2,11 @@ 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
+Forwarded: no
 --- a/gradle/dependencies.gradle
 +++ b/gradle/dependencies.gradle
 @@ -131,11 +131,11 @@
-     dependency 'org.apache.maven.wagon:wagon-http-shared-2.x'
+     dependency 'org.apache.maven.wagon:wagon-http-shared-2.x:2.x at jar'
  
      //eather:
 -    dependency "org.sonatype.aether:aether-api:1.13.1 at jar"
@@ -13,11 +14,11 @@ Last-Update: 2015-09-30
 -    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'
++    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'
  }
  
  libraries.spock = [
diff --git a/debian/patches/generate_pom.diff b/debian/patches/generate_pom.diff
index 27575f0..dc0903b 100644
--- a/debian/patches/generate_pom.diff
+++ b/debian/patches/generate_pom.diff
@@ -3,10 +3,11 @@ Description:
  Gradle auto generate POMs for all of the JARs so that we can install the
  POMs to /usr/share/maven-repo
 Author: Kai-Chung Yan <seamlikok at gmail.com>
-Last-Updtae: 2015-10-08
+Last-Updtae: 2016-09-08
+Forwarded: not-needed
 --- a/build.gradle
 +++ b/build.gradle
-@@ -193,6 +193,7 @@
+@@ -192,6 +192,7 @@
          apply from: "$rootDir/gradle/java9.gradle"
          check.dependsOn ":docs:checkstyleApi"
          check.dependsOn "codeQuality"
diff --git a/debian/patches/jcommander.diff b/debian/patches/jcommander.diff
index 9aa2a29..4d1cad6 100644
--- a/debian/patches/jcommander.diff
+++ b/debian/patches/jcommander.diff
@@ -1,10 +1,11 @@
 Description: Various modules use jcommander but do not declare.
 Author: Kai-Chung Yan <seamlikok at gmail.com>
 Last-Update: 2015-09-30
+Forwarded: not-needed
 --- a/subprojects/maven/maven.gradle
 +++ b/subprojects/maven/maven.gradle
 @@ -29,6 +29,8 @@
-     compile "org.codehaus.plexus:plexus-component-annotations-1.5"
+     compile "org.codehaus.plexus:plexus-component-annotations-1.5:1.6 at jar"
  
      testCompile libraries.xmlunit
 +
diff --git a/debian/patches/maven-3.3-compatibility.patch b/debian/patches/maven-3.3-compatibility.patch
index c00cb76..eb7d4b4 100644
--- a/debian/patches/maven-3.3-compatibility.patch
+++ b/debian/patches/maven-3.3-compatibility.patch
@@ -3,34 +3,35 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: no
 --- a/gradle/dependencies.gradle
 +++ b/gradle/dependencies.gradle
-@@ -106,8 +106,13 @@
+@@ -106,9 +106,15 @@
      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"
+     dependency "org.codehaus.plexus:plexus-component-annotations-1.5:1.6 at jar"
 -    dependency "org.codehaus.plexus:plexus-container-default:1.5.5 at jar"
--    dependency "org.codehaus.plexus:plexus-classworlds:2.4 at jar"
-+    dependency "org.codehaus.plexus:plexus-classworlds2"
-+
-+    dependency "org.eclipse.sisu:sisu-plexus"
-+    dependency "org.eclipse.sisu:sisu-inject"
-+    dependency "org.google.inject:guice"
-+    dependency "javax.inject:atinject-jsr330-api"
-+    dependency "aopalliance:aopalliance"
+     dependency "org.codehaus.plexus:plexus-classworlds2:2.x at jar"
  
++    // Maven 3.3 compatibility
++    dependency 'aopalliance:aopalliance:debian'
++    dependency 'javax.inject:atinject-jsr330-api:debian'
++    dependency 'org.eclipse.sisu:sisu-inject:debian'
++    dependency 'org.eclipse.sisu:sisu-plexus:debian'
++    dependency 'org.google.inject:guice:debian'
++
      //sonatype plexus
      dependency "org.sonatype.plexus:plexus-cipher:1.7 at jar"
-@@ -118,6 +123,7 @@
-     dependency "org.apache.maven:maven3-compat"
-     dependency "org.apache.maven:maven3-model-builder"
-     dependency "org.apache.maven:maven3-model"
-+    dependency "org.apache.maven:maven3-builder-support"
+     dependency "org.sonatype.plexus:plexus-sec-dispatcher:1.3 at jar"
+@@ -118,6 +124,7 @@
+     dependency "org.apache.maven:maven-compat-3.x:3.x at jar"
+     dependency "org.apache.maven:maven-model-builder-3.x:3.x at jar"
+     dependency "org.apache.maven:maven-model-3.x:3.x at jar"
++    dependency 'org.apache.maven:maven-builder-support-3.x:3.x'
  
      //somewhat core:
-     dependency "org.apache.maven:maven3-artifact"
-@@ -136,6 +142,8 @@
-     dependency "org.eclipse.aether:eclipse-aether-spi"
-     dependency "org.eclipse.aether:eclipse-aether-util"
-     dependency 'org.eclipse.aether:eclipse-aether-connector-basic'
+     dependency "org.apache.maven:maven-artifact-3.x:3.x at jar"
+@@ -136,6 +143,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.apache.commons:commons-lang3"
  }
diff --git a/debian/patches/nekohtml.diff b/debian/patches/nekohtml.diff
index 7ea6281..94d52a7 100644
--- a/debian/patches/nekohtml.diff
+++ b/debian/patches/nekohtml.diff
@@ -1,6 +1,7 @@
 Description: The usage of nekohtml APIs must comes with xerces.
 Author: Kai-Chung Yan <seamlikok at gmail.com>
 Last-Update: 2015-07-03
+Forwarded: no
 --- a/gradle/dependencies.gradle
 +++ b/gradle/dependencies.gradle
 @@ -96,6 +96,8 @@
@@ -9,6 +10,6 @@ Last-Update: 2015-07-03
  
 +libraries.nekohtml = [libraries.nekohtml, libraries.xerces]
 +
- libraries.maven3 = dependencies.module("org.apache.maven:maven3-core") {
-     dependency "org.apache.maven:maven3-settings"
-     dependency "org.apache.maven:maven3-settings-builder"
+ libraries.maven3 = dependencies.module("org.apache.maven:maven-core-3.x:3.x") {
+     dependency "org.apache.maven:maven-settings-3.x:3.x at jar"
+     dependency "org.apache.maven:maven-settings-builder-3.x:3.x at jar"
diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff
index 8999e93..eb1b081 100644
--- a/debian/patches/use_local_artifacts.diff
+++ b/debian/patches/use_local_artifacts.diff
@@ -6,29 +6,27 @@ Description: Use local jar files to build Gradle. The core point is using
              it dynamically loads libraries using its own mechanism and
              maintains classpaths.
 Author: Kai-Chung Yan <seamlikok at gmail.com>
-Last-Update: 2015-07-08
+Forwarded: not-needed
+Last-Update: 2016-09-08
 --- a/build.gradle
 +++ b/build.gradle
-@@ -180,7 +180,18 @@
+@@ -180,7 +180,7 @@
      group = 'org.gradle'
  
      repositories {
 -        maven { url 'https://repo.gradle.org/gradle/libs' }
 +        flatDir { dirs "/usr/share/java" }
-+    }
-+    configurations.all {
-+        resolutionStrategy {
-+          eachDependency { details ->
-+              if (details.requested.group != 'org.gradle' &&
-+                  details.requested.name != 'groovy-all' &&
-+                  project.name != 'docs') {
-+                  details.useVersion 'debian'
-+              }
-+          }
-+      }
      }
  }
  
+@@ -188,6 +188,7 @@
+     version = rootProject.version
+ 
+     if (project in groovyProjects) {
++        apply from: "${rootDir}/debian/substituteDependencies.gradle"
+         apply from: "$rootDir/gradle/groovyProject.gradle"
+         apply from: "$rootDir/gradle/testWithUnknownOS.gradle"
+         apply from: "$rootDir/gradle/java9.gradle"
 --- a/buildSrc/build.gradle
 +++ b/buildSrc/build.gradle
 @@ -21,13 +21,25 @@
@@ -67,14 +65,14 @@ Last-Update: 2015-07-08
  libraries.commons_io = dependencies.module(versions.commons_io)
  libraries.commons_lang = 'commons-lang:commons-lang:2.6 at jar'
 -libraries.commons_collections = 'commons-collections:commons-collections:3.2.2 at jar'
-+libraries.commons_collections = 'commons-collections:commons-collections3'
++libraries.commons_collections = 'commons-collections:commons-collections3:3.x at jar'
  libraries.jsch = "com.jcraft:jsch:0.1.53"
  libraries.ivy = dependencies.module('org.apache.ivy:ivy:2.2.0'){
      dependency libraries.jsch
  }
  libraries.jcip = "net.jcip:jcip-annotations:1.0 at jar"
 -libraries.inject = dependencies.module('javax.inject:javax.inject:1')
-+libraries.inject = dependencies.module('javax.inject:atinject-jsr330-api')
++libraries.inject = dependencies.module('javax.inject:atinject-jsr330-api:debian')
  
  // Logging
  libraries.slf4j_api = dependencies.module('org.slf4j:slf4j-api:1.7.10')
@@ -83,7 +81,7 @@ Last-Update: 2015-07-08
  libraries += [
          dom4j: 'dom4j:dom4j:1.6.1 at jar',
 -        guava: 'com.google.guava:guava-jdk5:17.0 at jar',
-+        guava: 'com.google.guava:guava',
++        guava: 'com.google.guava:guava:debian',
          jsr305: 'com.google.code.findbugs:jsr305:1.3.9 at jar',
 -        groovy: "org.codehaus.groovy:groovy-all:${versions.groovy}",
 +        groovy: "org.codehaus.groovy:groovy-all:[${versions.groovy}, )",
@@ -91,30 +89,32 @@ Last-Update: 2015-07-08
          jcip: "net.jcip:jcip-annotations:1.0 at jar",
          jna: 'net.java.dev.jna:jna:3.2.7 at jar',
 -        junit: 'junit:junit:4.12 at jar',
-+        junit: 'junit:junit4',
++        junit: 'junit:junit4:4.x at jar',
          xmlunit: 'xmlunit:xmlunit:1.3',
          nekohtml: 'net.sourceforge.nekohtml:nekohtml:1.9.14',
          xbean: 'org.apache.xbean:xbean-reflect:3.4 at jar', //required by maven3 classes
-@@ -96,14 +96,14 @@
+@@ -96,37 +96,37 @@
          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:maven3-core") {
-+    dependency "org.apache.maven:maven3-settings"
-+    dependency "org.apache.maven:maven3-settings-builder"
++libraries.maven3 = dependencies.module("org.apache.maven:maven-core-3.x:3.x") {
++    dependency "org.apache.maven:maven-settings-3.x:3.x at jar"
++    dependency "org.apache.maven:maven-settings-builder-3.x:3.x at jar"
  
      //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-component-annotations-1.5"
++    dependency "org.codehaus.plexus:plexus-component-annotations-1.5:1.6 at jar"
      dependency "org.codehaus.plexus:plexus-container-default:1.5.5 at jar"
-     dependency "org.codehaus.plexus:plexus-classworlds:2.4 at jar"
+-    dependency "org.codehaus.plexus:plexus-classworlds:2.4 at jar"
++    dependency "org.codehaus.plexus:plexus-classworlds2:2.x at jar"
  
-@@ -112,21 +112,21 @@
+     //sonatype plexus
+     dependency "org.sonatype.plexus:plexus-cipher:1.7 at jar"
      dependency "org.sonatype.plexus:plexus-sec-dispatcher:1.3 at jar"
  
      //core:
@@ -122,10 +122,10 @@ Last-Update: 2015-07-08
 -    dependency "org.apache.maven:maven-compat: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:maven3-core"
-+    dependency "org.apache.maven:maven3-compat"
-+    dependency "org.apache.maven:maven3-model-builder"
-+    dependency "org.apache.maven:maven3-model"
++    dependency "org.apache.maven:maven-core-3.x:3.x at jar"
++    dependency "org.apache.maven:maven-compat-3.x:3.x at jar"
++    dependency "org.apache.maven:maven-model-builder-3.x:3.x at jar"
++    dependency "org.apache.maven:maven-model-3.x:3.x at jar"
  
      //somewhat core:
 -    dependency "org.apache.maven:maven-artifact:3.0.4 at jar"
@@ -137,15 +137,15 @@ Last-Update: 2015-07-08
 -    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:maven-artifact-3.x:3.x at jar"
++    dependency "org.apache.maven:maven-repository-metadata-3.x:3.x at jar"
++    dependency "org.apache.maven:maven-plugin-api-3.x:3.x at jar"
++    dependency "org.apache.maven:maven-aether-provider-3.x:3.x 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'
++    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'
  
      //eather:
      dependency "org.sonatype.aether:aether-api:1.13.1 at jar"
@@ -155,8 +155,8 @@ Last-Update: 2015-07-08
  
 -libraries.bouncycastle_provider = "org.bouncycastle:bcprov-jdk15on:${versions.bouncycastle}@jar"
 -libraries.bouncycastle_pgp = dependencies.module("org.bouncycastle:bcpg-jdk15on:${versions.bouncycastle}") {
-+libraries.bouncycastle_provider = "org.bouncycastle:bcprov"
-+libraries.bouncycastle_pgp = dependencies.module("org.bouncycastle:bcpg") {
++libraries.bouncycastle_provider = "org.bouncycastle:bcprov:debian"
++libraries.bouncycastle_pgp = dependencies.module("org.bouncycastle:bcpg:debian") {
      dependency libraries.bouncycastle_provider
  }
  
@@ -167,7 +167,7 @@ Last-Update: 2015-07-08
      compile libraries.groovy
  
 -    compile "org.mozilla:rhino:1.7R3"
-+    compile "rhino:js"
++    compile "rhino:js:debian"
      compile libraries.gson // used by JsHint
      compile "org.simpleframework:simple:4.1.21" // used by http package in envjs
      compile project(':core'), project(":plugins")
@@ -248,17 +248,6 @@ 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
- 
 --- a/subprojects/testing-base/src/main/java/org/gradle/api/internal/tasks/testing/worker/ForkingTestClassProcessor.java
 +++ b/subprojects/testing-base/src/main/java/org/gradle/api/internal/tasks/testing/worker/ForkingTestClassProcessor.java
 @@ -96,7 +96,7 @@
@@ -270,3 +259,14 @@ Last-Update: 2015-07-08
              moduleRegistry.getExternalModule("slf4j-api").getImplementationClasspath().getAsURLs(),
              moduleRegistry.getExternalModule("jul-to-slf4j").getImplementationClasspath().getAsURLs(),
              moduleRegistry.getExternalModule("native-platform").getImplementationClasspath().getAsURLs(),
+--- 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:1.6 at jar"
+ 
+     testCompile libraries.xmlunit
+ 
diff --git a/debian/substituteDependencies.gradle b/debian/substituteDependencies.gradle
new file mode 100644
index 0000000..f350a75
--- /dev/null
+++ b/debian/substituteDependencies.gradle
@@ -0,0 +1,11 @@
+configurations.all {
+  resolutionStrategy {
+    eachDependency { details ->
+      if (details.requested.group != 'org.gradle' &&
+          details.requested.name != 'groovy-all' &&
+          project.name != 'docs') {
+        details.useVersion 'debian'
+      }
+    }
+  }
+}
\ No newline at end of file

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



More information about the pkg-java-commits mailing list