[Git][java-team/gradle][master] Backported a fix in DefaultJvmVersionDetector improving the detection of Java 9+

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / gradle


Commits:
75beba97 by Saif Abdul Cassim at 2019-08-05T07:37:53Z
Backported a fix in DefaultJvmVersionDetector improving the detection of Java 9+

- - - - -


2 changed files:

- debian/changelog
- debian/patches/java11-compatibility.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+gradle (4.4.1-8) unstable; urgency=medium
+
+  * Backported a fix improving the detection of Java 9+
+
+ -- Saif Abdul Cassim <saif.15 at cse.mrt.ac.lk>  Mon, 05 Aug 2019 09:36:52 +0200
+
 gradle (4.4.1-7) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/java11-compatibility.patch
=====================================
@@ -2,6 +2,7 @@ Description: Fixes the compatibility with Java 11. The patch can be removed afte
 Origin: backport, https://github.com/gradle/gradle/commit/ac15612d41b43c39c8e39d12fdd6621589b0f782
                   https://github.com/gradle/gradle/commit/028548460bd929fd034a552704798ad7f689493a
                   https://github.com/gradle/gradle/commit/3db6e256987053171178aa96a0ef46caedc8d1a4
+                  https://github.com/gradle/gradle/commit/b645d9b576d0ecfa116a213f6df299fd2b1a9b7e
 --- a/subprojects/base-services/src/main/java/org/gradle/internal/classloader/ClassLoaderUtils.java
 +++ b/subprojects/base-services/src/main/java/org/gradle/internal/classloader/ClassLoaderUtils.java
 @@ -15,51 +15,41 @@
@@ -424,3 +425,14 @@ index 9a7fd911c78f..c1324a04fef5 100644
 +        return (c >= '0' && c <= '9') || c == '.';
      }
  }
+--- a/subprojects/jvm-services/src/main/java/org/gradle/internal/jvm/inspection/DefaultJvmVersionDetector.java
++++ b/subprojects/jvm-services/src/main/java/org/gradle/internal/jvm/inspection/DefaultJvmVersionDetector.java
+@@ -62,7 +62,7 @@ public class DefaultJvmVersionDetector i
+         try {
+             String versionStr = reader.readLine();
+             while (versionStr != null) {
+-                Matcher matcher = Pattern.compile("(?:java|openjdk) version \"(.+?)\"").matcher(versionStr);
++                Matcher matcher = Pattern.compile("(?:java|openjdk) version \"(.+?)\"( \\d{4}-\\d{2}-\\d{2}( LTS)?)?").matcher(versionStr);
+                 if (matcher.matches()) {
+                     return JavaVersion.toVersion(matcher.group(1));
+                 }



View it on GitLab: https://salsa.debian.org/java-team/gradle/commit/75beba97d675f3e277a3057bced212c910c55e65

-- 
View it on GitLab: https://salsa.debian.org/java-team/gradle/commit/75beba97d675f3e277a3057bced212c910c55e65
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20190805/53c278c6/attachment.html>