Merge pull request #48412 from zakkak/2025-06-16-drop-old-version-parsing

Drop version parsing code for no longer supported GraalVM versions

Author: zakkak

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

@@ -170,20 +170,6 @@ public static final class Version extends io.quarkus.runtime.graal.GraalVM.Versi
         // Get access to GRAAL_MAPPING without making it public
         private static final Map<String, String> GRAAL_MAPPING = io.quarkus.runtime.graal.GraalVM.Version.GRAAL_MAPPING;
 
-        /**
-         * JDK version used with native-image tool:
-         * e.g. JDK 17.0.1 is Feature version 17, Update version 1.
-         * * Feature: e.g. 11 as in JDK 11, JDK 17, JDK 18 etc.
-         * * Interim: 0 so far for the JDK versions we care about, not used here
-         * * Update: quarterly updates, e.g. 13 as in JDK 11.0.13.
-         * * Patch: emergency release, critical patch, not used here
-         */
-        private static final Pattern OLD_VERS_PATTERN = Pattern.compile(
-                "(GraalVM|native-image)( Version)? " + VersionParseHelper.VERS_FORMAT + "(?<distro>.*?)?" +
-                        "(\\(Java Version (?<javaversion>(?<jfeature>[0-9]+)(\\.(?<jinterim>[0-9]*)\\.(?<jupdate>[0-9]*))?.*)\\))?$");
-
-        static final Version VERSION_21_3 = new Version("GraalVM 21.3", "21.3", Distribution.GRAALVM);
-        static final Version VERSION_21_3_0 = new Version("GraalVM 21.3.0", "21.3.0", Distribution.GRAALVM);
         public static final Version VERSION_23_0_0 = new Version("GraalVM 23.0.0", "23.0.0", "17", Distribution.GRAALVM);
         public static final Version VERSION_23_1_0 = new Version("GraalVM 23.1.0", "23.1.0", "21", Distribution.GRAALVM);
         public static final Version VERSION_24_0_0 = new Version("GraalVM 24.0.0", "24.0.0", "22", Distribution.GRAALVM);
@@ -275,45 +261,16 @@ public static Version of(Stream<String> output) {
                     .toList();
 
             if (lines.size() == 3) {
-                // Attempt to parse the new 3-line version scheme first.
                 Version parsedVersion = VersionParseHelper.parse(lines);
                 if (parsedVersion != VersionParseHelper.UNKNOWN_VERSION) {
                     return parsedVersion;
                 }
-            } else if (lines.size() == 1) {
-                // Old, single line version parsing logic
-                final String line = lines.get(0);
-                final Matcher oldVersMatcher = OLD_VERS_PATTERN.matcher(line);
-                if (oldVersMatcher.find()) {
-                    // GraalVM/Mandrel old, single line, version scheme:
-                    final String version = oldVersMatcher.group(VersionParseHelper.VERSION_GROUP);
-                    final String distro = oldVersMatcher.group("distro");
-                    String javaVersion = oldVersMatcher.group("javaversion");
-                    if (javaVersion == null) {
-                        if (version.startsWith("19")) {
-                            javaVersion = "11"; // Fallback to JDK 11 for GraalVM 19.x
-                        } else {
-                            throw new IllegalArgumentException(
-                                    "Cannot parse version from output: \n" + stringOutput);
-                        }
-                    }
-
-                    return new Version(
-                            line,
-                            version,
-                            Runtime.Version.parse(javaVersion),
-                            isMandrel(distro) ? Distribution.MANDREL : Distribution.GRAALVM);
-                }
             }
 
             throw new IllegalArgumentException(
                     "Cannot parse version from output: \n" + stringOutput);
         }
 
-        private static boolean isMandrel(String s) {
-            return s != null && s.contains("Mandrel Distribution");
-        }
-
         public boolean isJava17() {
             return javaVersion.feature() == 17;
         }