Support UBI 9 Java 25 images

gsmet · gsmet · commit c8d13684d119 · 2025-12-20T12:32:12.000+01:00
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/images/ContainerImages.java b/core/deployment/src/main/java/io/quarkus/deployment/images/ContainerImages.java
@@ -1,6 +1,7 @@
 package io.quarkus.deployment.images;
 
 import io.quarkus.deployment.pkg.builditem.CompiledJavaVersionBuildItem;
+import io.quarkus.deployment.pkg.builditem.CompiledJavaVersionBuildItem.JavaVersion.Status;
 
 /**
  * This class is used to define the container images that are used by Quarkus.
@@ -33,12 +34,12 @@ public class ContainerImages {
     /**
      * Version used for more UBI9 Java images.
      */
-    public static final String UBI9_JAVA_VERSION = "1.23";
+    public static final String UBI9_JAVA_VERSION = "1.24";
 
     /**
      * Version uses for the native builder image.
      */
-    public static final String NATIVE_BUILDER_VERSION = "jdk-21";
+    public static final String NATIVE_BUILDER_VERSION = "jdk-25";
 
     // === Runtime images for containers (native)
 
@@ -89,6 +90,11 @@ public class ContainerImages {
     public static final String UBI9_JAVA_21_VERSION = UBI9_JAVA_VERSION;
     public static final String UBI9_JAVA_21 = UBI9_JAVA_21_IMAGE_NAME + ":" + UBI9_JAVA_21_VERSION;
 
+    // UBI 9 OpenJDK 25 Runtime - https://catalog.redhat.com/en/software/containers/ubi9/openjdk-25-runtime/69204990c46419100ce30a5b
+    public static final String UBI9_JAVA_25_IMAGE_NAME = "registry.access.redhat.com/ubi9/openjdk-25-runtime";
+    public static final String UBI9_JAVA_25_VERSION = UBI9_JAVA_VERSION;
+    public static final String UBI9_JAVA_25 = UBI9_JAVA_25_IMAGE_NAME + ":" + UBI9_JAVA_25_VERSION;
+
     // === Source To Image images
 
     // UBI 8 Quarkus Binary Source To Image - https://quay.io/repository/quarkus/ubi-quarkus-native-binary-s2i?tab=tags
@@ -118,6 +124,11 @@ public class ContainerImages {
     public static final String S2I_JAVA_21_VERSION = UBI9_JAVA_VERSION;
     public static final String S2I_JAVA_21 = S2I_JAVA_21_IMAGE_NAME + ":" + S2I_JAVA_21_VERSION;
 
+    // Java Source To Image - https://catalog.redhat.com/en/software/containers/ubi9/openjdk-25/69204893fc0d23c633bf5c29
+    public static final String S2I_JAVA_25_IMAGE_NAME = "registry.access.redhat.com/ubi9/openjdk-25";
+    public static final String S2I_JAVA_25_VERSION = UBI9_JAVA_VERSION;
+    public static final String S2I_JAVA_25 = S2I_JAVA_25_IMAGE_NAME + ":" + S2I_JAVA_25_VERSION;
+
     // === Native Builder images
 
     // Mandrel Builder Image - https://quay.io/repository/quarkus/ubi-quarkus-mandrel-builder-image?tab=tags
@@ -141,11 +152,14 @@ public class ContainerImages {
     public static final String UBI9_GRAALVM_BUILDER = UBI9_GRAALVM_BUILDER_IMAGE_NAME + ":" + UBI9_GRAALVM_BUILDER_VERSION;
 
     public static String getDefaultJvmImage(CompiledJavaVersionBuildItem.JavaVersion version) {
-        switch (version.isJava21OrHigher()) {
-            case TRUE:
-                return UBI9_JAVA_21;
-            default:
-                return UBI9_JAVA_17;
+        if (version.isJava25OrHigher() == Status.TRUE) {
+            return UBI9_JAVA_25;
         }
+
+        if (version.isJava21OrHigher() == Status.TRUE) {
+            return UBI9_JAVA_21;
+        }
+
+        return UBI9_JAVA_17;
     }
 }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/builditem/CompiledJavaVersionBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/builditem/CompiledJavaVersionBuildItem.java
@@ -29,6 +29,8 @@ public JavaVersion getJavaVersion() {
 
     public interface JavaVersion {
 
+        Status isJava25OrHigher();
+
         Status isJava21OrHigher();
 
         Status isJava19OrHigher();
@@ -44,6 +46,11 @@ final class Unknown implements JavaVersion {
             Unknown() {
             }
 
+            @Override
+            public Status isJava25OrHigher() {
+                return Status.UNKNOWN;
+            }
+
             @Override
             public Status isJava21OrHigher() {
                 return Status.UNKNOWN;
@@ -59,6 +66,7 @@ final class Known implements JavaVersion {
 
             private static final int JAVA_19_MAJOR = 63;
             private static final int JAVA_21_MAJOR = 65;
+            private static final int JAVA_25_MAJOR = 69;
 
             private final int determinedMajor;
 
@@ -76,6 +84,11 @@ public Status isJava21OrHigher() {
                 return higherOrEqualStatus(JAVA_21_MAJOR);
             }
 
+            @Override
+            public Status isJava25OrHigher() {
+                return higherOrEqualStatus(JAVA_25_MAJOR);
+            }
+
             private Status higherOrEqualStatus(int javaMajor) {
                 return determinedMajor >= javaMajor ? Status.TRUE : Status.FALSE;
             }
diff --git a/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/ContainerImageOpenshiftConfig.java b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/ContainerImageOpenshiftConfig.java
@@ -29,6 +29,9 @@ public interface ContainerImageOpenshiftConfig {
     public static final String FALLBACK_NATIVE_BINARY_DIRECTORY = "/home/quarkus/";
 
     public static String getDefaultJvmImage(CompiledJavaVersionBuildItem.JavaVersion version) {
+        if (version.isJava25OrHigher() == CompiledJavaVersionBuildItem.JavaVersion.Status.TRUE) {
+            return ContainerImages.S2I_JAVA_25;
+        }
         if (version.isJava21OrHigher() == CompiledJavaVersionBuildItem.JavaVersion.Status.TRUE) {
             return ContainerImages.S2I_JAVA_21;
         }
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/JavaVersion.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/JavaVersion.java
@@ -66,11 +66,11 @@ public String toString() {
     }
 
     // ordering is important here, so let's keep them ordered
-    public static final SortedSet<Integer> JAVA_VERSIONS_LTS = new TreeSet<>(List.of(17, 21));
+    public static final SortedSet<Integer> JAVA_VERSIONS_LTS = new TreeSet<>(List.of(17, 21, 25));
     public static final int DEFAULT_JAVA_VERSION = 17;
     // we want to maximize the compatibility of extensions with the Quarkus ecosystem so let's stick to 17 by default
     public static final String DEFAULT_JAVA_VERSION_FOR_EXTENSION = "17";
-    public static final int MAX_LTS_SUPPORTED_BY_KOTLIN = 21;
+    public static final int MAX_LTS_SUPPORTED_BY_KOTLIN = 25;
     public static final String DETECT_JAVA_RUNTIME_VERSION = "<<detect java runtime version>>";
     public static final Pattern JAVA_VERSION_PATTERN = Pattern.compile("(\\d+)(?:\\..*)?");
 
diff --git a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/project/JavaVersionTest.java b/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/project/JavaVersionTest.java
@@ -35,10 +35,21 @@ public void givenJavaVersion21ShouldReturn21() {
         assertEquals("21", computeJavaVersion(JAVA, "21"));
     }
 
+    @Test
+    public void givenJavaVersion26ShouldReturn25() {
+        assertEquals("25", computeJavaVersion(JAVA, "26.0.1"));
+    }
+
+    @Test
+    public void givenJavaVersion25ShouldReturn25() {
+        assertEquals("25", computeJavaVersion(JAVA, "25"));
+    }
+
     @Test
     void shouldProperlyUseMinJavaVersion() {
-        assertThat(getCompatibleLTSVersions(new JavaVersion("17"))).containsExactly(17, 21);
-        assertThat(getCompatibleLTSVersions(new JavaVersion("21"))).containsExactly(21);
+        assertThat(getCompatibleLTSVersions(new JavaVersion("17"))).containsExactly(17, 21, 25);
+        assertThat(getCompatibleLTSVersions(new JavaVersion("21"))).containsExactly(21, 25);
+        assertThat(getCompatibleLTSVersions(new JavaVersion("25"))).containsExactly(25);
         assertThat(getCompatibleLTSVersions(new JavaVersion("100"))).isEmpty();
         assertThat(getCompatibleLTSVersions(JavaVersion.NA)).isEqualTo(JAVA_VERSIONS_LTS);
     }
@@ -55,6 +66,8 @@ public void testDetermineBestLtsVersion() {
         assertEquals(17, determineBestJavaLtsVersion(18));
         assertEquals(21, determineBestJavaLtsVersion(21));
         assertEquals(21, determineBestJavaLtsVersion(22));
+        assertEquals(25, determineBestJavaLtsVersion(25));
+        assertEquals(25, determineBestJavaLtsVersion(26));
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,9 @@ public interface ContainerImageOpenshiftConfig {`
`29`	`29`	`public static final String FALLBACK_NATIVE_BINARY_DIRECTORY = "/home/quarkus/";`
`30`	`30`
`31`	`31`	`public static String getDefaultJvmImage(CompiledJavaVersionBuildItem.JavaVersion version) {`
	`32`	`+ if (version.isJava25OrHigher() == CompiledJavaVersionBuildItem.JavaVersion.Status.TRUE) {`
	`33`	`+ return ContainerImages.S2I_JAVA_25;`
	`34`	`+ }`
`32`	`35`	`if (version.isJava21OrHigher() == CompiledJavaVersionBuildItem.JavaVersion.Status.TRUE) {`
`33`	`36`	`return ContainerImages.S2I_JAVA_21;`
`34`	`37`	`}`