[gradle-1.12] 178/211: use_local_artifacts.diff: Use matched-version JarJar library

[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 bdc2c597fe3a0176c815bd0ff54c94be37c81b10
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Tue Jun 16 23:06:49 2015 +0800

    use_local_artifacts.diff: Use matched-version JarJar library
---
 debian/patches/34_disable_code_quality.diff | 2 +-
 debian/patches/use_local_artifacts.diff     | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/patches/34_disable_code_quality.diff b/debian/patches/34_disable_code_quality.diff
index ed1c88f..228f9cd 100644
--- a/debian/patches/34_disable_code_quality.diff
+++ b/debian/patches/34_disable_code_quality.diff
@@ -20,7 +20,7 @@ Forwarded: not-needed
  apply plugin: 'eclipse'
  
 @@ -42,5 +42,5 @@
-     compile "org.gradle.jarjar:jarjar:1.2.1"
+     compile "com.googlecode.jarjar:jarjar:[1.2.1, )"
  }
  apply from: '../gradle/compile.gradle'
 -apply from: '../gradle/codeQuality.gradle'
diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff
index 1dd8335..25d5b88 100644
--- a/debian/patches/use_local_artifacts.diff
+++ b/debian/patches/use_local_artifacts.diff
@@ -58,6 +58,15 @@ Last-Update: 2015-06-16
      compile 'commons-lang:commons-lang:2.6 at jar'
      compile localGroovy()
      testCompile 'junit:junit:4.11 at jar'
+@@ -39,7 +39,7 @@
+     //below dependency was deployed to the repo.gradle.org
+     //it's built from sources at: https://github.com/szczepiq/jarjar
+     //if code changes are needed in this library we need to figure out a better way of distributing them.
+-    compile "org.gradle.jarjar:jarjar:1.2.1"
++    compile "com.googlecode.jarjar:jarjar:[1.2.1, )"
+ }
+ apply from: '../gradle/compile.gradle'
+ apply from: '../gradle/codeQuality.gradle'
 --- a/gradle/dependencies.gradle
 +++ b/gradle/dependencies.gradle
 @@ -25,16 +25,16 @@

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