[gradle] 02/03: Use a versionless dependency on groovy-all in the classpath of the modules

[Emmanuel Bourg]

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

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

commit 05ba7bd7a7f041de8e77493b09269ab18cea51fe
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jun 23 10:09:06 2016 +0200

    Use a versionless dependency on groovy-all in the classpath of the modules
---
 debian/changelog                |  1 +
 debian/patches/groovy-jar.patch | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0d50cad..5d357b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 gradle (2.13-3) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Use a versionless dependency on groovy-all in the classpath of the modules
   * Use a versionless dependency on httpcore in the classpath
     of the resources-http module
 
diff --git a/debian/patches/groovy-jar.patch b/debian/patches/groovy-jar.patch
index 378ac90..b9229fe 100644
--- a/debian/patches/groovy-jar.patch
+++ b/debian/patches/groovy-jar.patch
@@ -20,3 +20,13 @@ Description: Tweaks the Groovy classpath detection logic to recognize the groovy
      }
  
      public boolean isGroovyAll() {
+--- a/gradle/groovyProject.gradle
++++ b/gradle/groovyProject.gradle
+@@ -105,6 +105,7 @@
+         properties.runtime = input.fileCollection {
+             (it instanceof ExternalDependency) || (it instanceof FileCollectionDependency)
+         }.collect { it.name }.join(',')
++        properties.runtime = properties.runtime.replaceAll("groovy-all-[\\d\\.]+.jar", "groovy-all.jar");
+         properties.projects = input.allDependencies.withType(ProjectDependency).collect { it.dependencyProject.archivesBaseName }.join(',')
+         return properties
+     }

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