factored out min Java release requirement in JVMCIVersionCheck

Author: dougxc

compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/JVMCIVersionCheck.java

@@ -43,8 +43,16 @@
  */
 public final class JVMCIVersionCheck {
 
+    /**
+     * Minimum JVMCI version supported by Graal.
+     */
     private static final Version JVMCI_MIN_VERSION = new Version(22, 3, 11);
 
+    /**
+     * Minimum Java release supported by Graal.
+     */
+    private static final int JAVA_MIN_RELEASE = 17;
+
     public static class Version {
         private final int major;
         private final int minor;
@@ -123,10 +131,10 @@ private void failVersionCheck(boolean exit, String reason, Object... args) {
         errorMessage.format("this error or to \"warn\" to emit a warning and continue execution.%n");
         errorMessage.format("Currently used Java home directory is %s.%n", javaHome);
         errorMessage.format("Currently used VM configuration is: %s%n", vmName);
-        if (javaSpecVersion.compareTo("11") == 0 && vmVersion.contains("-jvmci-")) {
+        if (vmVersion.contains("-jvmci-")) {
             errorMessage.format("Download the latest Labs OpenJDK from " + OPEN_LABSJDK_RELEASE_URL_PATTERN);
         } else {
-            errorMessage.format("Download JDK 17 or later.");
+            errorMessage.format("Download JDK %s or later.", JAVA_MIN_RELEASE);
         }
         String value = System.getenv("JVMCI_VERSION_CHECK");
         if ("warn".equals(value)) {
@@ -168,8 +176,8 @@ public static void check(Map<String, String> props,
     }
 
     private void run(boolean exitOnFailure, Version minVersion, boolean quiet) {
-        if (javaSpecVersion.compareTo("17") < 0) {
-            failVersionCheck(exitOnFailure, "Graal requires JDK 17 or later.%n");
+        if (javaSpecVersion.compareTo(Integer.toString(JAVA_MIN_RELEASE)) < 0) {
+            failVersionCheck(exitOnFailure, "Graal requires JDK " + JAVA_MIN_RELEASE + " or later.%n");
         } else {
             if (vmVersion.contains("SNAPSHOT")) {
                 return;
@@ -193,7 +201,7 @@ private void run(boolean exitOnFailure, Version minVersion, boolean quiet) {
                 failVersionCheck(exitOnFailure, "The VM does not support the minimum JVMCI API version required by Graal.%n" +
                                 "Cannot read JVMCI version from java.vm.version property: %s.%n", vmVersion);
             } else {
-                // Graal is compatible with all JDK versions as of 17 GA.
+                // Graal is compatible with all JDK versions as of JAVA_MIN_RELEASE
             }
         }
     }