[gradle] 02/08: Refresh patches

[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 d15e70b147354ebde56f57917b030504e5e9cdb9
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Wed Jul 8 19:29:07 2015 +0800

    Refresh patches
---
 debian/patches/disable_tests.diff       | 16 ++++++++++++++--
 debian/patches/use_local_artifacts.diff |  2 +-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/debian/patches/disable_tests.diff b/debian/patches/disable_tests.diff
index b2fc49a..4e6ade0 100644
--- a/debian/patches/disable_tests.diff
+++ b/debian/patches/disable_tests.diff
@@ -98,9 +98,11 @@ Last-Update: 2015-07-02
  useClassycle()
 --- a/subprojects/tooling-api/tooling-api.gradle
 +++ b/subprojects/tooling-api/tooling-api.gradle
-@@ -10,31 +10,10 @@
+@@ -8,33 +8,11 @@
+     compile project(':baseServices')
+     publishCompile libraries.slf4j_api
  
-     testFixturesCompile project(':baseServicesGroovy')
+-    testFixturesCompile project(':baseServicesGroovy')
      testCompile libraries.groovy
 -
 -    // lots of integTest errors otherwise
@@ -442,3 +444,13 @@ Last-Update: 2015-07-02
  }
  
  useTestFixtures()
+--- a/subprojects/platform-base/platform-base.gradle
++++ b/subprojects/platform-base/platform-base.gradle
+@@ -1,7 +1,6 @@
+ dependencies {
+     compile libraries.groovy
+     compile project(":core")
+-    testFixturesCompile project(path: ":modelCore", configuration: "testFixturesUsageRuntime")
+ }
+ 
+ useClassycle()
diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff
index 2639d9b..5c008dd 100644
--- a/debian/patches/use_local_artifacts.diff
+++ b/debian/patches/use_local_artifacts.diff
@@ -67,7 +67,7 @@ Last-Update: 2015-07-08
 -libraries.commons_collections = 'commons-collections:commons-collections:3.2.1 at jar'
 -libraries.jsch = "com.jcraft:jsch:0.1.51"
 +libraries.commons_lang = 'commons-lang:commons-lang'
-+libraries.commons_collections = 'commons-collections:commons-collections'
++libraries.commons_collections = 'commons-collections:commons-collections3'
 +libraries.jsch = "com.jcraft:jsch"
  libraries.ivy = dependencies.module('org.apache.ivy:ivy:2.2.0'){
      dependency libraries.jsch

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