[gradle] 01/03: Update groovy-jar.patch and fix runtime errors with new Groovy versions.

[Markus Koschany]

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

apo pushed a commit to branch master
in repository gradle.

commit a787cb7b8b60bbc6928faa90639cead0675833ca
Author: Markus Koschany <apo at debian.org>
Date:   Wed Apr 11 23:18:29 2018 +0200

    Update groovy-jar.patch and fix runtime errors with new Groovy versions.
    
    Closes: #895455
---
 debian/patches/groovy-jar.patch | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/debian/patches/groovy-jar.patch b/debian/patches/groovy-jar.patch
index 8d0a3d2..b44183e 100644
--- a/debian/patches/groovy-jar.patch
+++ b/debian/patches/groovy-jar.patch
@@ -6,9 +6,22 @@ Tweaks the Groovy classpath detection logic to recognize the groovy jar in the
 system Maven repository
 (/usr/share/maven-repo/org/codehaus/groovy/groovy/debian/groovy-debian.jar)
 ---
+ buildSrc/src/main/groovy/org/gradle/build/ClasspathManifest.groovy    | 1 +
  .../src/main/java/org/gradle/api/internal/plugins/GroovyJarFile.java  | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ 2 files changed, 3 insertions(+), 2 deletions(-)
 
+diff --git a/buildSrc/src/main/groovy/org/gradle/build/ClasspathManifest.groovy b/buildSrc/src/main/groovy/org/gradle/build/ClasspathManifest.groovy
+index 7273a6f..61fa60c 100644
+--- a/buildSrc/src/main/groovy/org/gradle/build/ClasspathManifest.groovy
++++ b/buildSrc/src/main/groovy/org/gradle/build/ClasspathManifest.groovy
+@@ -62,6 +62,7 @@ class ClasspathManifest extends DefaultTask {
+     Properties createProperties() {
+         def properties = new Properties()
+         properties.runtime = getRuntime()
++        properties.runtime = properties.runtime.replaceAll('groovy-all-[\\d\\.]+.jar', 'groovy-all.jar');
+         properties.projects = getProjects()
+         if (!getOptionalProjects().empty) {
+             properties.optional = getOptionalProjects().join(',')
 diff --git a/subprojects/plugins/src/main/java/org/gradle/api/internal/plugins/GroovyJarFile.java b/subprojects/plugins/src/main/java/org/gradle/api/internal/plugins/GroovyJarFile.java
 index 735fb76..d10293e 100644
 --- a/subprojects/plugins/src/main/java/org/gradle/api/internal/plugins/GroovyJarFile.java

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