Merge pull request quarkusio#50420 from zakkak/2025-10-06-drop-mandrel-23_0

Drop Mandrel/GraalVM 23.0 support

Author: gsmet

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

@@ -172,7 +172,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;
 
-        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);
         public static final Version VERSION_24_0_999 = new Version("GraalVM 24.0.999", "24.0.999", "22", Distribution.GRAALVM);
@@ -187,7 +186,7 @@ public static final class Version extends io.quarkus.runtime.graal.GraalVM.Versi
          * @deprecated Use {@link io.quarkus.runtime.graal.GraalVM.Version.MINIMUM} instead.
          */
         @Deprecated
-        public static final Version MINIMUM = VERSION_23_0_0;
+        public static final Version MINIMUM = VERSION_23_1_0;
         /**
          * The current version of GraalVM supported by Quarkus.
          * This version is the one actively being tested and is expected to give the best experience.

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

@@ -823,12 +823,9 @@ public NativeImageInvokerInfo build() {
                 // Generate a file with the list of built artifacts
                 addExperimentalVMOption(nativeImageArgs, "-H:+GenerateBuildArtifactsFile");
 
-                // only available in GraalVM 23.1.0+
-                if (graalVMVersion.compareTo(GraalVM.Version.VERSION_23_1_0) >= 0) {
-                    if (graalVMVersion.compareTo(GraalVM.Version.VERSION_24_0_0) < 0) {
-                        // Enabled by default in GraalVM 24.0.0.
-                        nativeImageArgs.add("--strict-image-heap");
-                    }
+                if (graalVMVersion.compareTo(GraalVM.Version.VERSION_24_0_0) < 0) {
+                    // Enabled by default in GraalVM 24.0.0.
+                    nativeImageArgs.add("--strict-image-heap");
                 }
 
                 /*
@@ -993,21 +990,9 @@ public NativeImageInvokerInfo build() {
 
                 if (nativeConfig.autoServiceLoaderRegistration()) {
                     addExperimentalVMOption(nativeImageArgs, "-H:+UseServiceLoaderFeature");
-                    if (graalVMVersion.compareTo(GraalVM.Version.VERSION_23_1_0) < 0) {
-                        // When enabling, at least print what exactly is being added. Only possible in <23.1.0
-                        nativeImageArgs.add("-H:+TraceServiceLoaderFeature");
-                    }
                 } else {
                     addExperimentalVMOption(nativeImageArgs, "-H:-UseServiceLoaderFeature");
                 }
-                // This option has no effect on GraalVM 23.1+
-                if (graalVMVersion.compareTo(GraalVM.Version.VERSION_23_1_0) < 0) {
-                    if (nativeConfig.fullStackTraces()) {
-                        nativeImageArgs.add("-H:+StackTrace");
-                    } else {
-                        nativeImageArgs.add("-H:-StackTrace");
-                    }
-                }
 
                 if (nativeConfig.enableDashboardDump()) {
                     addExperimentalVMOption(nativeImageArgs,
@@ -1113,13 +1098,9 @@ private void handleAdditionalProperties(List<String> command) {
             }
 
             private void addExperimentalVMOption(List<String> nativeImageArgs, String option) {
-                if (graalVMVersion.compareTo(GraalVM.Version.VERSION_23_1_0) >= 0) {
-                    nativeImageArgs.add("-H:+UnlockExperimentalVMOptions");
-                }
+                nativeImageArgs.add("-H:+UnlockExperimentalVMOptions");
                 nativeImageArgs.add(option);
-                if (graalVMVersion.compareTo(GraalVM.Version.VERSION_23_1_0) >= 0) {
-                    nativeImageArgs.add("-H:-UnlockExperimentalVMOptions");
-                }
+                nativeImageArgs.add("-H:-UnlockExperimentalVMOptions");
             }
         }
     }

core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageFeatureStep.java

@@ -20,7 +20,6 @@
 import io.quarkus.deployment.builditem.nativeimage.RuntimeReinitializedClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.UnsafeAccessedFieldBuildItem;
 import io.quarkus.deployment.pkg.NativeConfig;
-import io.quarkus.gizmo.AssignableResultHandle;
 import io.quarkus.gizmo.BranchResult;
 import io.quarkus.gizmo.BytecodeCreator;
 import io.quarkus.gizmo.CatchBlockCreator;
@@ -51,11 +50,6 @@ public class NativeImageFeatureStep {
             "initializeAtRunTime", void.class, Class[].class);
     private static final MethodDescriptor INITIALIZE_PACKAGES_AT_RUN_TIME = ofMethod(RuntimeClassInitialization.class,
             "initializeAtRunTime", void.class, String[].class);
-    public static final String RUNTIME_CLASS_INITIALIZATION_SUPPORT = "org.graalvm.nativeimage.impl.RuntimeClassInitializationSupport";
-    private static final MethodDescriptor RERUN_INITIALIZATION = ofMethod(
-            RUNTIME_CLASS_INITIALIZATION_SUPPORT,
-            "rerunInitialization", void.class, Class.class, String.class);
-
     static final String BEFORE_ANALYSIS_ACCESS = Feature.BeforeAnalysisAccess.class.getName();
 
     @BuildStep
@@ -198,29 +192,7 @@ public void write(String s, byte[] bytes) {
             runtimeReinitializedClasses.returnValue(classesArray);
 
             ResultHandle classes = overallCatch.invokeStaticMethod(runtimeReinitializedClasses.getMethodDescriptor());
-
-            ResultHandle graalVMVersion = overallCatch.invokeStaticMethod(GRAALVM_VERSION_GET_CURRENT);
-            BranchResult graalVm23_1Test = overallCatch
-                    .ifGreaterEqualZero(overallCatch.invokeVirtualMethod(GRAALVM_VERSION_COMPARE_TO, graalVMVersion,
-                            overallCatch.marshalAsArray(int.class, overallCatch.load(23), overallCatch.load(1))));
-            /* GraalVM >= 23.1 */
-            try (BytecodeCreator greaterEqual23_1 = graalVm23_1Test.trueBranch()) {
-                greaterEqual23_1.invokeStaticMethod(INITIALIZE_CLASSES_AT_RUN_TIME, classes);
-            }
-            /* GraalVM < 23.1 */
-            try (BytecodeCreator less23_1 = graalVm23_1Test.falseBranch()) {
-                ResultHandle quarkus = less23_1.load("Quarkus");
-                ResultHandle imageSingleton = less23_1.invokeStaticMethod(IMAGE_SINGLETONS_LOOKUP,
-                        less23_1.loadClassFromTCCL(RUNTIME_CLASS_INITIALIZATION_SUPPORT));
-                ResultHandle arraySize = less23_1.arrayLength(classes);
-                AssignableResultHandle index = less23_1.createVariable(int.class);
-                less23_1.assign(index, less23_1.load(0));
-                try (BytecodeCreator loop = less23_1.whileLoop(c -> c.ifIntegerLessThan(index, arraySize)).block()) {
-                    loop.invokeInterfaceMethod(RERUN_INITIALIZATION, imageSingleton, loop.readArrayValue(classes, index),
-                            quarkus);
-                    loop.assign(index, loop.increment(index));
-                }
-            }
+            overallCatch.invokeStaticMethod(INITIALIZE_CLASSES_AT_RUN_TIME, classes);
         }
 
         // Ensure registration of fields being accessed through unsafe is done last to ensure that the class