Update builder images to jdk-17.0.7

- Update the GraalVM Community builder image to the tag `jdk-17` / `jdk-17.0.7` - Update the Mandrel builder image to the tag `jdk-17`(Mandrel 23.0) - Update GraalVM SDK version to 23.0 (yes, it does not follow the same version scheme) Note that the version scheme and name also changed: GraalVM CE -> GraalVM Community. We kept the name of the image unchanged to avoid a massive breaking change.
quarkusio · Jun 19, 2023 · cd67b64 · cd67b64
1 parent c099fb8
commit cd67b64
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 17 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -89,7 +89,7 @@
         <jboss-metadata-web.version>16.0.0.Final</jboss-metadata-web.version>
         <maven-toolchain.version>3.0-alpha-2</maven-toolchain.version>
         <plexus-component-annotations.version>2.1.0</plexus-component-annotations.version>
-        <graal-sdk.version>22.3.2</graal-sdk.version>
+        <graal-sdk.version>23.0.0</graal-sdk.version>
         <graal-svm.version>${graal-sdk.version}</graal-svm.version>
         <gizmo.version>1.6.1.Final</gizmo.version>
         <jackson-bom.version>2.15.2</jackson-bom.version>

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java
@@ -20,8 +20,8 @@
 @ConfigMapping(prefix = "quarkus.native")
 public interface NativeConfig {
 
-    String DEFAULT_GRAALVM_BUILDER_IMAGE = "quay.io/quarkus/ubi-quarkus-graalvmce-builder-image:22.3-java17";
-    String DEFAULT_MANDREL_BUILDER_IMAGE = "quay.io/quarkus/ubi-quarkus-mandrel-builder-image:22.3-java17";
+    String DEFAULT_GRAALVM_BUILDER_IMAGE = "quay.io/quarkus/ubi-quarkus-graalvmce-builder-image:jdk-17";
+    String DEFAULT_MANDREL_BUILDER_IMAGE = "quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-17";
 
     /**
      * Comma-separated, additional arguments to pass to the build process.
@@ -216,7 +216,7 @@ default boolean isExplicitContainerBuild() {
     interface BuilderImageConfig {
         /**
          * The docker image to use to do the image build. It can be one of `graalvm`, `mandrel`, or the full image path, e.g.
-         * {@code quay.io/quarkus/ubi-quarkus-mandrel-builder-image:22.3-java17}.
+         * {@code quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-17}.
          */
         @WithParentName
         @WithDefault("${platform.quarkus.native.builder-image}")

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/GraalVM.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/GraalVM.java
@@ -132,14 +132,13 @@ public static final class Version implements Comparable<Version> {
         static final Version UNVERSIONED = new Version("Undefined", "snapshot", Distribution.ORACLE);
         static final Version VERSION_21_3 = new Version("GraalVM 21.3", "21.3", Distribution.ORACLE);
         static final Version VERSION_21_3_0 = new Version("GraalVM 21.3.0", "21.3.0", Distribution.ORACLE);
-        public static final Version VERSION_22_3_2 = new Version("GraalVM 22.3.2", "22.3.2", Distribution.ORACLE);
         public static final Version VERSION_22_3_0 = new Version("GraalVM 22.3.0", "22.3.0", Distribution.ORACLE);
         public static final Version VERSION_22_2_0 = new Version("GraalVM 22.2.0", "22.2.0", Distribution.ORACLE);
         public static final Version VERSION_23_0_0 = new Version("GraalVM 23.0.0", "23.0.0", Distribution.ORACLE);
         public static final Version VERSION_23_1_0 = new Version("GraalVM 23.1.0", "23.1.0", Distribution.ORACLE);
 
         public static final Version MINIMUM = VERSION_22_2_0;
-        public static final Version CURRENT = VERSION_22_3_2;
+        public static final Version CURRENT = VERSION_23_0_0;
         public static final int UNDEFINED = -1;
 
         final String fullVersion;

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java
@@ -780,7 +780,7 @@ public NativeImageInvokerInfo build() {
                     nativeImageArgs.add("-H:PrintAnalysisCallTreeType=CSV");
                 }
 
-                // only available in GraalVM 22.3.0 and better.
+                // only available in GraalVM 22.3.0+.
                 if (graalVMVersion.compareTo(GraalVM.Version.VERSION_22_3_0) >= 0) {
                     if (graalVMVersion.compareTo(GraalVM.Version.VERSION_23_0_0) < 0) {
                         // Used to retrieve build time information in 22.3. Starting with 23.0 this info is included in

diff --git a/docs/pom.xml b/docs/pom.xml
@@ -17,8 +17,8 @@
     <properties>
         <!-- The Graal version we suggest using in documentation - as that's
            what we work with by self downloading it: -->
-        <graal-sdk.version-for-documentation>22.3</graal-sdk.version-for-documentation>
-        <mandrel.version-for-documentation>22.3</mandrel.version-for-documentation>
+        <graal-community.version-for-documentation>jdk-17.0.7</graal-community.version-for-documentation>
+        <mandrel.version-for-documentation>jdk-17</mandrel.version-for-documentation>
 
         <assembly-maven-plugin.version>3.5.0</assembly-maven-plugin.version>
         <asciidoctor-maven-plugin.version>2.0.0</asciidoctor-maven-plugin.version>

diff --git a/docs/src/main/asciidoc/_attributes.adoc b/docs/src/main/asciidoc/_attributes.adoc
@@ -5,8 +5,8 @@
 :quarkus-platform-groupid: io.quarkus.platform
 // .
 :maven-version: ${proposed-maven-version}
-:graalvm-version: ${graal-sdk.version-for-documentation}
-:graalvm-flavor: ${graal-sdk.version-for-documentation}-java17
+:graalvm-version: ${graal-community.version-for-documentation}
+:graalvm-flavor: ${graal-community.version-for-documentation}-java17
 :mandrel-version: ${mandrel.version-for-documentation}
 :mandrel-flavor: ${mandrel.version-for-documentation}-java17
 :surefire-version: ${version.surefire.plugin}

diff --git a/docs/src/main/asciidoc/building-native-image.adoc b/docs/src/main/asciidoc/building-native-image.adoc
@@ -906,23 +906,23 @@ include at build time.
 
 |jvmstat
 |Adds jvmstat support
-|GraalVM 22.3 Mandrel 22.3
+|GraalVM 22.3, GraalVM CE 17.0.7 Mandrel 22.3 Mandrel 23.0 (17.0.7)
 
 |heapdump
 |Adds support for generating heap dumps
-|GraalVM 22.3 Mandrel 22.3
+|GraalVM 22.3, GraalVM CE 17.0.7 Mandrel 22.3 Mandrel 23.0 (17.0.7)
 
 |jmxclient
 |Adds support for connections to JMX servers.
 |GraalVM for JDK 17/20 Mandrel 23.0
 
 |jmxserver
 |Adds support for accepting connections from JMX clients.
-|GraalVM for JDK 17/20 Mandrel 23.0
+|GraalVM for JDK 17/20 Mandrel 23.0 (17.0.7)
 
 |all
 |Adds all monitoring options.
-|GraalVM 22.3 Mandrel 22.3
+|GraalVM 22.3, GraalVM CE 17.0.7 Mandrel 22.3 Mandrel 23.0 (17.0.7)
 |===
 
 Please see the Quarkus Native Reference Guide for more detailed information on these monitoring options.

diff --git a/docs/src/main/asciidoc/doc-reference.adoc b/docs/src/main/asciidoc/doc-reference.adoc
@@ -483,5 +483,5 @@ The complete list of externalized variables for use is given in the following ta
 |\{quickstarts-tree-url}|{quickstarts-tree-url}| Quickstarts URL to main source tree root; used for referencing directories.
 
 |\{graalvm-version}|{graalvm-version}| Recommended GraalVM version to use.
-|\{graalvm-flavor}|{graalvm-flavor}| The builder image tag of GraalVM to use e.g. `22.3-java17`. Use a `java17` version.
+|\{graalvm-flavor}|{graalvm-flavor}| The builder image tag of GraalVM to use e.g. `jdk-17`.
 |===
diff --git a/independent-projects/bootstrap/pom.xml b/independent-projects/bootstrap/pom.xml
@@ -71,7 +71,7 @@
         <jboss-logmanager-embedded.version>1.0.11</jboss-logmanager-embedded.version>
         <slf4j-jboss-logmanager.version>1.1.0.Final</slf4j-jboss-logmanager.version>
         <slf4j-api.version>1.7.36</slf4j-api.version>
-        <graal-sdk.version>22.3.2</graal-sdk.version>
+        <graal-sdk.version>23.0.0</graal-sdk.version>
         <plexus-classworlds.version>2.6.0</plexus-classworlds.version> <!-- not actually used but ClassRealm class is referenced from the API used in BootstrapWagonConfigurator -->
         <plexus-cipher.version>1.7</plexus-cipher.version>
         <plexus-utils.version>3.5.1</plexus-utils.version>