[gradle] 07/08: Substitute all versions to "debian"

[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 e4f020f88f6731165eb2f2ee3f7b2aceb44f2cfc
Author: Kai-Chung Yan (殷啟聰) <seamlikok at gmail.com>
Date:   Sun Sep 4 20:37:53 2016 +0800

    Substitute all versions to "debian"
---
 debian/patches/34_disable_code_quality.diff |  2 +-
 debian/patches/use_local_artifacts.diff     | 29 +++++++++++++++--------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/debian/patches/34_disable_code_quality.diff b/debian/patches/34_disable_code_quality.diff
index 0f02e0e..79d3036 100644
--- a/debian/patches/34_disable_code_quality.diff
+++ b/debian/patches/34_disable_code_quality.diff
@@ -17,7 +17,7 @@ Forwarded: not-needed
  apply plugin: 'idea'
  apply plugin: 'eclipse'
  
-@@ -41,5 +39,4 @@
+@@ -53,5 +51,4 @@
  
  apply from: '../gradle/compile.gradle'
  apply from: '../gradle/taskOrdering.gradle'
diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff
index 38f1775..8999e93 100644
--- a/debian/patches/use_local_artifacts.diff
+++ b/debian/patches/use_local_artifacts.diff
@@ -22,7 +22,7 @@ Last-Update: 2015-07-08
 +              if (details.requested.group != 'org.gradle' &&
 +                  details.requested.name != 'groovy-all' &&
 +                  project.name != 'docs') {
-+                  details.useVersion ''
++                  details.useVersion 'debian'
 +              }
 +          }
 +      }
@@ -31,14 +31,26 @@ Last-Update: 2015-07-08
  
 --- a/buildSrc/build.gradle
 +++ b/buildSrc/build.gradle
-@@ -21,22 +21,22 @@
+@@ -21,13 +21,25 @@
  apply plugin: 'eclipse'
  
  repositories {
 -    maven { url 'https://repo.gradle.org/gradle/libs' }
 -    mavenCentral()
 +    maven { url 'file:///usr/share/maven-repo' }
-+    flatDir { dirs '/usr/share/java' }
++}
++
++configurations.all {
++    resolutionStrategy {
++      eachDependency { details ->
++          if (details.requested.name == 'junit') {
++              details.useVersion '4.x'
++          } else if (details.requested.group != 'org.gradle' &&
++              details.requested.name != 'groovy-all') {
++              details.useVersion 'debian'
++          }
++      }
++  }
  }
  
  dependencies {
@@ -48,17 +60,6 @@ Last-Update: 2015-07-08
      compile 'commons-lang:commons-lang:2.6 at jar'
      compile localGroovy()
      testCompile 'junit:junit:4.12 at jar'
-     testCompile 'org.spockframework:spock-core:1.0-groovy-2.4 at jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2'
- 
--    compile "org.pegdown:pegdown:1.1.0"
-+    compile "org.pegdown:pegdown:[1.1.0, )"
-     compile "org.jsoup:jsoup:1.6.3"
- 
--    compile "com.googlecode.jarjar:jarjar:1.3"
-+    compile "com.googlecode.jarjar:jarjar:[1.3, )"
- }
- 
- apply from: '../gradle/compile.gradle'
 --- a/gradle/dependencies.gradle
 +++ b/gradle/dependencies.gradle
 @@ -34,13 +34,13 @@

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