[gradle] 01/02: Modified the Groovy jar detection logic to recognize the jar in the system Maven repository

[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 22af4810bbecf30589dbca9bf56946c413a9f2ee
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue May 17 22:40:04 2016 +0200

    Modified the Groovy jar detection logic to recognize the jar in the system Maven repository
---
 debian/changelog                |  8 ++++++++
 debian/patches/groovy-jar.patch | 22 ++++++++++++++++++++++
 debian/patches/series           |  1 +
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9d7be33..c0984d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gradle (2.12-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Modified the Groovy jar detection logic to recognize the jar
+    in the system Maven repository
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 17 May 2016 22:34:58 +0200
+
 gradle (2.12-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/groovy-jar.patch b/debian/patches/groovy-jar.patch
new file mode 100644
index 0000000..378ac90
--- /dev/null
+++ b/debian/patches/groovy-jar.patch
@@ -0,0 +1,22 @@
+Description: 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)
+--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/plugins/GroovyJarFile.java
++++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/plugins/GroovyJarFile.java
+@@ -23,7 +23,7 @@
+ import java.util.regex.Pattern;
+ 
+ public class GroovyJarFile {
+-    private static final Pattern FILE_NAME_PATTERN = Pattern.compile("(groovy(?:-all)?)-(\\d.*?)(-indy)?.jar");
++    private static final Pattern FILE_NAME_PATTERN = Pattern.compile("(groovy(?:-all)?)-(debian|\\d.*?)(-indy)?.jar");
+ 
+     private final File file;
+     private final Matcher matcher;
+@@ -42,7 +42,7 @@
+     }
+ 
+     public VersionNumber getVersion() {
+-        return VersionNumber.parse(matcher.group(2));
++        return VersionNumber.parse("debian".equals(matcher.group(2)) ? "2.4.6" : matcher.group(2));
+     }
+ 
+     public boolean isGroovyAll() {
diff --git a/debian/patches/series b/debian/patches/series
index b0ccea3..667b53e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@ generate_classpath.diff
 generate_pom.diff
 ivy-2.4.0.patch
 maven-3.3-compatibility.patch
+groovy-jar.patch

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