Merge pull request #23334 from zakkak/22.0-as-default

Bump GraalVM / Mandrel version to 22.0
quarkusio · Feb 1, 2022 · 4997567 · 4997567
2 parents b4eaf7f + 35995e2
commit 4997567
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -83,7 +83,7 @@
         <plexus-utils.version>3.3.0</plexus-utils.version>
         <plexus-component-annotations.version>2.1.0</plexus-component-annotations.version>
         <!-- What we actually depend on for the annotations, as latest Graal is not available in Maven fast enough: -->
-        <graal-sdk.version>21.3.0</graal-sdk.version>
+        <graal-sdk.version>22.0.0.2</graal-sdk.version>
         <gizmo.version>1.0.10.Final</gizmo.version>
         <jackson.version>2.13.1</jackson.version>
         <commons-logging-jboss-logging.version>1.0.0.Final</commons-logging-jboss-logging.version>

diff --git a/build-parent/pom.xml b/build-parent/pom.xml
@@ -39,8 +39,8 @@
         <!-- These properties are needed in order for them to be resolvable by the documentation -->
         <!-- The Graal version we suggest using in documentation - as that's
            what we work with by self downloading it: -->
-        <graal-sdk.version-for-documentation>21.3.0</graal-sdk.version-for-documentation>
-        <mandrel.version-for-documentation>21.3</mandrel.version-for-documentation>
+        <graal-sdk.version-for-documentation>22.0.0.2</graal-sdk.version-for-documentation>
+        <mandrel.version-for-documentation>22.0</mandrel.version-for-documentation>
 
         <asciidoctorj.version>2.5.3</asciidoctorj.version>
         <htmlunit.version>2.40.0</htmlunit.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
@@ -15,8 +15,8 @@
 @ConfigRoot(phase = ConfigPhase.BUILD_TIME)
 public class NativeConfig {
 
-    public static final String DEFAULT_GRAALVM_BUILDER_IMAGE = "quay.io/quarkus/ubi-quarkus-native-image:21.3-java11";
-    public static final String DEFAULT_MANDREL_BUILDER_IMAGE = "quay.io/quarkus/ubi-quarkus-mandrel:21.3-java11";
+    public static final String DEFAULT_GRAALVM_BUILDER_IMAGE = "quay.io/quarkus/ubi-quarkus-native-image:22.0-java11";
+    public static final String DEFAULT_MANDREL_BUILDER_IMAGE = "quay.io/quarkus/ubi-quarkus-mandrel:22.0-java11";
 
     /**
      * Comma-separated, additional arguments to pass to the build process.

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
@@ -24,9 +24,10 @@ static final class Version implements Comparable<Version> {
         static final Version VERSION_21_2 = new Version("GraalVM 21.2", "21.2", 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);
+        static final Version VERSION_22_0_0_2 = new Version("GraalVM 22.0.0.2", "22.0.0.2", Distribution.ORACLE);
 
         static final Version MINIMUM = VERSION_21_2;
-        static final Version CURRENT = VERSION_21_3;
+        static final Version CURRENT = VERSION_22_0_0_2;
         public static final int UNDEFINED = -1;
 
         final String fullVersion;

diff --git a/independent-projects/bootstrap/pom.xml b/independent-projects/bootstrap/pom.xml
@@ -51,7 +51,7 @@
         <jboss-logmanager-embedded.version>1.0.9</jboss-logmanager-embedded.version>
         <slf4j-jboss-logmanager.version>1.1.0.Final</slf4j-jboss-logmanager.version>
         <slf4j-api.version>1.7.35</slf4j-api.version>
-        <graal-sdk.version>21.3.0</graal-sdk.version>
+        <graal-sdk.version>22.0.0.2</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 -->
         <smallrye-common.version>1.8.0</smallrye-common.version>
         <gradle-tooling.version>7.3.3</gradle-tooling.version>