Merge pull request #50527 from jerboaa/graalvm_ce_25.1_dev_version

Fix native-image version parsing for GraalVM 25.1-dev

Author: geoand

core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/GraalVM.java

@@ -18,6 +18,7 @@ static final class VersionParseHelper {
         private static final String EA_BUILD_PREFIX = "-ea";
         private static final String JVMCI_BUILD_PREFIX = "jvmci-";
         private static final String MANDREL_VERS_PREFIX = "Mandrel-";
+        private static final String GRAALVM_VERS_PREFIX = "GraalVM CE ";
 
         private static final String LIBERICA_NIK_VERS_PREFIX = "Liberica-NIK-";
 
@@ -66,7 +67,7 @@ static Version parse(List<String> lines) {
 
                 String vendorVersion = secondMatcher.group(VENDOR_VERSION_GROUP);
 
-                String graalVersion = graalVersion(javaVersion, v);
+                String graalVersion = graalVersion(javaVersion, v, vendorVersion);
                 if (vendorVersion.contains("-dev")) {
                     graalVersion = graalVersion + "-dev";
                 }
@@ -136,7 +137,26 @@ private static String matchVersion(String version) {
             return null;
         }
 
-        private static String graalVersion(String buildInfo, Runtime.Version v) {
+        private static String graalVersion(String buildInfo, Runtime.Version v, String vendorVersion) {
+            if (v.feature() >= 25 && vendorVersion != null && !vendorVersion.isBlank()) {
+                if (vendorVersion.startsWith(GRAALVM_VERS_PREFIX)) {
+                    String versFromVendor = vendorVersion.substring(GRAALVM_VERS_PREFIX.length());
+                    versFromVendor = versFromVendor.substring(0, versFromVendor.indexOf("+")); // strip build number
+                    if (String.valueOf(v.feature()).equals(versFromVendor)) {
+                        // GA version
+                        versFromVendor = String.format("%d.0.0", v.feature());
+                    }
+                    // Strip potential -dev suffix
+                    if (versFromVendor.endsWith("-dev")) {
+                        versFromVendor = versFromVendor.substring(0, versFromVendor.length() - 4);
+                    }
+                    Matcher versMatcher = VERSION_PATTERN.matcher(versFromVendor);
+                    if (versMatcher.find()) {
+                        return matchVersion(versFromVendor);
+                    }
+                    // fall through to other logic
+                }
+            }
             if (buildInfo == null) {
                 return null;
             }

core/deployment/src/test/java/io/quarkus/deployment/pkg/steps/GraalVMTest.java

@@ -200,6 +200,45 @@ public void testGraalVM26CommunityVersionParser() {
         assertThat(version.javaVersion.update()).isEqualTo(0);
     }
 
+    @Test
+    public void testGraalVM25_0CommunityVersion() {
+        final Version version = Version.of(Stream.of(("native-image 25 2025-09-16\n"
+                + "GraalVM Runtime Environment GraalVM CE 25+37.1 (build 25+37-jvmci-b01)\n"
+                + "Substrate VM GraalVM CE 25+37.1 (build 25+37, serial gc)").split("\\n")));
+        assertThat(version.toString().contains(GRAALVM.name()));
+        assertThat(version.getVersionAsString()).isEqualTo("25.0.0");
+        assertThat(version.javaVersion.toString()).isEqualTo("25+37-jvmci-b01");
+        assertThat(version.javaVersion.feature()).isEqualTo(25);
+        assertThat(version.javaVersion.interim()).isEqualTo(0);
+        assertThat(version.javaVersion.update()).isEqualTo(0);
+    }
+
+    @Test
+    public void testGraalVM25_0_1CommunityVersion() {
+        final Version version = Version.of(Stream.of(("native-image 25.0.1 2025-10-21\n"
+                + "GraalVM Runtime Environment GraalVM CE 25.0.1+99.1 (build 25.0.1+99-jvmci-b01)\n"
+                + "Substrate VM GraalVM CE 25.0.1+99.1 (build 25.0.1+99, serial gc)").split("\\n")));
+        assertThat(version.toString().contains(GRAALVM.name()));
+        assertThat(version.getVersionAsString()).isEqualTo("25.0.1");
+        assertThat(version.javaVersion.toString()).isEqualTo("25.0.1+99-jvmci-b01");
+        assertThat(version.javaVersion.feature()).isEqualTo(25);
+        assertThat(version.javaVersion.interim()).isEqualTo(0);
+        assertThat(version.javaVersion.update()).isEqualTo(1);
+    }
+
+    @Test
+    public void testGraalVM25_1CommunityVersionParser() {
+        final Version version = Version.of(Stream.of(("native-image 25 2025-09-16\n"
+                + "GraalVM Runtime Environment GraalVM CE 25.1.0-dev+37.1 (build 25+37-jvmci-b06)\n"
+                + "Substrate VM GraalVM CE 25.1.0-dev+37.1 (build 25+37, serial gc)").split("\\n")));
+        assertThat(version.toString().contains(GRAALVM.name()));
+        assertThat(version.getVersionAsString()).isEqualTo("25.1.0-dev");
+        assertThat(version.javaVersion.toString()).isEqualTo("25+37-jvmci-b06");
+        assertThat(version.javaVersion.feature()).isEqualTo(25);
+        assertThat(version.javaVersion.interim()).isEqualTo(0);
+        assertThat(version.javaVersion.update()).isEqualTo(0);
+    }
+
     @Test
     public void testGraalVMVersionsOlderThan() {
         assertOlderThan("native-image 21 2023-09-19\n" +

core/runtime/src/main/java/io/quarkus/runtime/graal/GraalVM.java

@@ -53,7 +53,7 @@ static Version parse(String value) {
                     String tokens[] = version.split("\\.", 3);
                     String jdkFeature = tokens[0];
                     String jdkVers = jdkFeature;
-                    if (tokens.length == 3) {
+                    if (tokens.length == 3 && !graalVMFutureVers(tokens)) {
                         String interim = tokens[1];
                         String update = tokens[2].split("\\+")[0];
                         jdkVers = String.format("%s.%s.%s", jdkFeature, interim, update);
@@ -73,6 +73,17 @@ static Version parse(String value) {
             return Version.CURRENT;
         }
 
+        // Anything beyond 25.0 is a future GraalVM version not suitable for Runtime.Version.parse()
+        private static boolean graalVMFutureVers(String[] tokens) {
+            try {
+                int feature = Integer.valueOf(tokens[0]);
+                int interim = Integer.valueOf(tokens[1]);
+                return feature > 25 || (feature == 25 && interim > 0);
+            } catch (NumberFormatException e) {
+                return false;
+            }
+        }
+
     }
 
     public static class Version implements Comparable<Version> {