[gradle-1.12] 113/211: New patch: d/patches/do_not_use_jdk5_guava.diff

[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 01d7d02b3b22fb6ff4ead089d96c4868c07c0012
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Wed May 27 01:16:58 2015 +0800

    New patch: d/patches/do_not_use_jdk5_guava.diff
---
 debian/patches/do_not_use_jdk5_guava.diff | 40 +++++++++++++++++++++++++++++++
 debian/patches/series                     |  3 ++-
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/debian/patches/do_not_use_jdk5_guava.diff b/debian/patches/do_not_use_jdk5_guava.diff
new file mode 100644
index 0000000..f9339a7
--- /dev/null
+++ b/debian/patches/do_not_use_jdk5_guava.diff
@@ -0,0 +1,40 @@
+--- a/buildSrc/build.gradle
++++ b/buildSrc/build.gradle
+@@ -27,7 +27,7 @@
+ 
+ dependencies {
+     compile gradleApi()
+-    compile 'com.google.guava:guava-jdk5:14.0.1 at jar'
++    compile 'com.google.guava:guava:14.0.1 at jar'
+     compile 'commons-lang:commons-lang:2.6 at jar'
+     compile localGroovy()
+     testCompile 'junit:junit:4.11 at jar'
+--- a/gradle/dependencies.gradle
++++ b/gradle/dependencies.gradle
+@@ -79,7 +79,7 @@
+         ant_antlr: 'org.apache.ant:ant-antlr:1.9.3 at jar',
+         antlr: 'antlr:antlr:2.7.7 at jar',
+         dom4j: 'dom4j:dom4j:1.6.1 at jar',
+-        guava: 'com.google.guava:guava-jdk5:14.0.1 at jar',
++        guava: 'com.google.guava:guava:14.0.1 at jar',
+         jsr305: 'com.google.code.findbugs:jsr305:1.3.9 at jar',
+         groovy: 'org.codehaus.groovy:groovy-all:1.8.6 at jar',
+         jaxen: 'jaxen:jaxen:1.1 at jar',
+@@ -149,4 +149,4 @@
+     libraries.objenesis,
+     'cglib:cglib-nodep:2.2'
+ ]
+-libraries.gson = "com.google.code.gson:gson:2.2.4"
+\ No newline at end of file
++libraries.gson = "com.google.code.gson:gson:2.2.4"
+--- a/subprojects/core/src/main/groovy/org/gradle/process/internal/child/WorkerProcessClassPathProvider.java
++++ b/subprojects/core/src/main/groovy/org/gradle/process/internal/child/WorkerProcessClassPathProvider.java
+@@ -66,7 +66,7 @@
+             classpath = classpath.plus(moduleRegistry.getExternalModule("logback-classic").getClasspath());
+             classpath = classpath.plus(moduleRegistry.getExternalModule("logback-core").getClasspath());
+             classpath = classpath.plus(moduleRegistry.getExternalModule("jul-to-slf4j").getClasspath());
+-            classpath = classpath.plus(moduleRegistry.getExternalModule("guava-jdk5").getClasspath());
++            classpath = classpath.plus(moduleRegistry.getExternalModule("guava").getClasspath());
+             return classpath;
+         }
+         if (name.equals("WORKER_MAIN")) {
diff --git a/debian/patches/series b/debian/patches/series
index ab2705f..3956422 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 use_local_artifacts.diff
+do_not_use_jdk5_guava.diff
 03_plexus.diff
 13_fix_javadocs_links.diff
 26_disable_commitid.diff
-36_java8_compatibility.diff
\ No newline at end of file
+36_java8_compatibility.diff

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