Fix and improve major JDK version detection.

Fixes #516
graalvm · Oct 13, 2023 · d96da57 · d96da57
1 parent c79ef2b
commit d96da57
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 5 deletions.
diff --git a/common/utils/src/main/java/org/graalvm/buildtools/utils/NativeImageUtils.java b/common/utils/src/main/java/org/graalvm/buildtools/utils/NativeImageUtils.java
@@ -61,6 +61,10 @@ public class NativeImageUtils {
 
     private static final Pattern graalvmVersionPattern = Pattern.compile("^(GraalVM|native-image) ([0-9]+)\\.([0-9]+)\\.([0-9]+).*");
 
+    private static final Pattern javaVersionPattern = Pattern.compile("^native-image ([0-9]+).*", Pattern.DOTALL);
+    private static final Pattern javaVersionLegacyPattern = Pattern.compile(".* \\(Java Version ([0-9]+)\\.([0-9]+)\\.([0-9]+).*");
+
+
     private static final Pattern SAFE_SHELL_ARG = Pattern.compile("[A-Za-z0-9@%_\\-+=:,./]+");
 
     public static void maybeCreateConfigureUtilSymlink(File configureUtilFile, Path nativeImageExecutablePath) {
@@ -170,9 +174,14 @@ public static void checkVersion(String requiredVersion, String versionToCheck) {
     }
 
     public static int getMajorJDKVersion(String versionString) {
-        Matcher matcher = graalvmVersionPattern.matcher(versionString.trim());
+        String trimmedVersionString = versionString.trim();
+        Matcher matcher = javaVersionPattern.matcher(versionString.trim());
         if (matcher.matches()) {
-            return Integer.parseInt(matcher.group(2));
+            return Integer.parseInt(matcher.group(1));
+        }
+        Matcher legacyMatcher = javaVersionLegacyPattern.matcher(trimmedVersionString);
+        if (legacyMatcher.matches()) {
+            return Integer.parseInt(legacyMatcher.group(1));
         }
         return -1;
     }

diff --git a/common/utils/src/test/java/org/graalvm/buildtools/utils/NativeImageUtilsTest.java b/common/utils/src/test/java/org/graalvm/buildtools/utils/NativeImageUtilsTest.java
@@ -65,21 +65,33 @@ void invalidRequiredVersion() {
 
     @Test
     void checkGraalVMCEVersion() {
-        NativeImageUtils.checkVersion("22", "GraalVM 22.3.0 Java 17 CE (Java Version 17.0.5+8-jvmci-22.3-b08)");
-        NativeImageUtils.checkVersion("22.3", "GraalVM 22.3.0 Java 17 CE (Java Version 17.0.5+8-jvmci-22.3-b08)");
-        NativeImageUtils.checkVersion("22.3.0", "GraalVM 22.3.0 Java 17 CE (Java Version 17.0.5+8-jvmci-22.3-b08)");
+        String graalVMCE_22_3 = "GraalVM 22.3.0 Java 17 CE (Java Version 17.0.5+8-jvmci-22.3-b08)";
+        NativeImageUtils.checkVersion("22", graalVMCE_22_3);
+        NativeImageUtils.checkVersion("22.3", graalVMCE_22_3);
+        NativeImageUtils.checkVersion("22.3.0", graalVMCE_22_3);
+        Assertions.assertEquals(17, NativeImageUtils.getMajorJDKVersion(graalVMCE_22_3));
 
         String graalVMCEForJDK17 = "native-image 17.0.7 2023-04-18\nGraalVM Runtime Environment GraalVM CE 17.0.7+4.1 (build 17.0.7+4-jvmci-23.0-b10)\nSubstrate VM GraalVM CE 17.0.7+4.1 (build 17.0.7+4, serial gc)";
         NativeImageUtils.checkVersion("22.3.0", graalVMCEForJDK17);
         NativeImageUtils.checkVersion("23", graalVMCEForJDK17);
         NativeImageUtils.checkVersion("23.0", graalVMCEForJDK17);
         NativeImageUtils.checkVersion("23.0.0", graalVMCEForJDK17);
+        Assertions.assertEquals(17, NativeImageUtils.getMajorJDKVersion(graalVMCEForJDK17));
 
         String graalVMCEForJDK20 = "native-image 20 2023-04-18\nGraalVM Runtime Environment GraalVM CE 20+34.1 (build 20+34-jvmci-23.0-b10)\nSubstrate VM GraalVM CE 20+34.1 (build 20+34, serial gc)";
         NativeImageUtils.checkVersion("22.3.0", graalVMCEForJDK20);
         NativeImageUtils.checkVersion("23", graalVMCEForJDK20);
         NativeImageUtils.checkVersion("23.0", graalVMCEForJDK20);
         NativeImageUtils.checkVersion("23.0.0", graalVMCEForJDK20);
+        Assertions.assertEquals(20, NativeImageUtils.getMajorJDKVersion(graalVMCEForJDK20));
+
+        String graalVMCEForJDK21 = "native-image 21 2023-09-19\nGraalVM Runtime Environment GraalVM CE 21+35.1 (build 21+35-jvmci-23.1-b15)\nSubstrate VM GraalVM CE 21+35.1 (build 21+35, serial gc)";
+        NativeImageUtils.checkVersion("22.3.0", graalVMCEForJDK20);
+        NativeImageUtils.checkVersion("23", graalVMCEForJDK20);
+        NativeImageUtils.checkVersion("23.0", graalVMCEForJDK20);
+        NativeImageUtils.checkVersion("23.1", graalVMCEForJDK20);
+        NativeImageUtils.checkVersion("23.1.0", graalVMCEForJDK20);
+        Assertions.assertEquals(21, NativeImageUtils.getMajorJDKVersion(graalVMCEForJDK21));
     }
 
     @Test
@@ -90,25 +102,39 @@ void checkGraalVMCEDevVersion() {
         NativeImageUtils.checkVersion("22.3.0", "GraalVM 23.0.0-dev Java 17.0.6+2-jvmci-23.0-b04 CE (Java Version 17.0.6+2-jvmci-23.0-b04)");
         NativeImageUtils.checkVersion("22.3.0", "GraalVM dev CE (Java Version 19+36-jvmci-23.0-b01)");
         NativeImageUtils.checkVersion("22.3.0", "native-image dev CE (Java Version 19+36-jvmci-23.0-b01)");
+        String latestGraalVMDevFormat = "native-image 21 2023-09-19\nGraalVM Runtime Environment GraalVM CE 21-dev+35.1 (build 21+35-jvmci-23.1-b15)\nSubstrate VM GraalVM CE 21-dev+35.1 (build 21+35, serial gc)";
+        NativeImageUtils.checkVersion("22.3.0", latestGraalVMDevFormat);
     }
 
     @Test
     void checkGraalVMEEVersion() {
         NativeImageUtils.checkVersion("22", "GraalVM 22.3.0 Java 17 EE (Java Version 17.0.5+9-LTS-jvmci-22.3-b07)");
         NativeImageUtils.checkVersion("22.3", "GraalVM 22.3.0 Java 17 EE (Java Version 17.0.5+9-LTS-jvmci-22.3-b07)");
         NativeImageUtils.checkVersion("22.3.0", "GraalVM 22.3.0 Java 17 EE (Java Version 17.0.5+9-LTS-jvmci-22.3-b07)");
+    }
 
+    @Test
+    void checkOracleGraalVMVersion() {
         String oracleGraalVMForJDK17 = "native-image 17.0.7 2023-04-18\nGraalVM Runtime Environment Oracle GraalVM (build 17.0.7+8-jvmci-23.0-b10)\nSubstrate VM Oracle GraalVM (build 17.0.7+8, serial gc)";
         NativeImageUtils.checkVersion("22.3.0", oracleGraalVMForJDK17);
         NativeImageUtils.checkVersion("23", oracleGraalVMForJDK17);
         NativeImageUtils.checkVersion("23.0", oracleGraalVMForJDK17);
         NativeImageUtils.checkVersion("23.0.0", oracleGraalVMForJDK17);
+        Assertions.assertEquals(17, NativeImageUtils.getMajorJDKVersion(oracleGraalVMForJDK17));
 
         String oracleGraalVMForJDK20 = "native-image 20.0.1 2023-04-18\nGraalVM Runtime Environment Oracle GraalVM 20.0.1+9.1 (build 20.0.1+9-jvmci-23.0-b10)\nSubstrate VM Oracle GraalVM 20.0.1+9.1 (build 20.0.1+9, serial gc)";
         NativeImageUtils.checkVersion("22.3.0", oracleGraalVMForJDK20);
         NativeImageUtils.checkVersion("23", oracleGraalVMForJDK20);
         NativeImageUtils.checkVersion("23.0", oracleGraalVMForJDK20);
         NativeImageUtils.checkVersion("23.0.0", oracleGraalVMForJDK20);
+        Assertions.assertEquals(20, NativeImageUtils.getMajorJDKVersion(oracleGraalVMForJDK20));
+
+        String oracleGraalVMForJDK21 = "native-image 21 2023-09-19\nGraalVM Runtime Environment Oracle GraalVM 21+35.1 (build 21+35-jvmci-23.1-b15)\nSubstrate VM Oracle GraalVM 21+35.1 (build 21+35, serial gc, compressed references)";
+        NativeImageUtils.checkVersion("22.3.0", oracleGraalVMForJDK21);
+        NativeImageUtils.checkVersion("23", oracleGraalVMForJDK21);
+        NativeImageUtils.checkVersion("23.1", oracleGraalVMForJDK21);
+        NativeImageUtils.checkVersion("23.1.0", oracleGraalVMForJDK21);
+        Assertions.assertEquals(21, NativeImageUtils.getMajorJDKVersion(oracleGraalVMForJDK21));
     }
 
     @Test