From b4b63ba3e543468fb60ca33d0fea50efdc6099b1 Mon Sep 17 00:00:00 2001
From: Foivos Zakkak <fzakkak@redhat.com>
Date: Wed, 4 May 2022 16:05:53 +0300
Subject: [PATCH] Bump GraalVM and Mandrel version to 22.1

---
 bom/application/pom.xml                                       | 2 +-
 build-parent/pom.xml                                          | 4 ++--
 .../src/main/java/io/quarkus/deployment/pkg/NativeConfig.java | 4 ++--
 .../main/java/io/quarkus/deployment/pkg/steps/GraalVM.java    | 4 +++-
 independent-projects/bootstrap/pom.xml                        | 1 +
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index 82d859c118bea..9367f1f24454c 100644
--- a/bom/application/pom.xml
+++ b/bom/application/pom.xml
@@ -78,7 +78,7 @@
         <maven-toolchain.version>3.0-alpha-2</maven-toolchain.version>
         <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: -->
+        <!-- Use previous graal version till https://github.com/oracle/graal/issues/4518 gets resolved -->
         <graal-sdk.version>22.0.0.2</graal-sdk.version>
         <gizmo.version>1.0.10.Final</gizmo.version>
         <jackson-bom.version>2.13.2.20220328</jackson-bom.version>
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index c818e3fa5ebb1..0fbce2a6e9748 100644
--- 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>22.0.0.2</graal-sdk.version-for-documentation>
-        <mandrel.version-for-documentation>22.0</mandrel.version-for-documentation>
+        <graal-sdk.version-for-documentation>22.1.0</graal-sdk.version-for-documentation>
+        <mandrel.version-for-documentation>22.1</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
index ba04dd8393c19..6cc1791d38993 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java
@@ -16,8 +16,8 @@
 @ConfigRoot(phase = ConfigPhase.BUILD_TIME)
 public class NativeConfig {
 
-    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";
+    public static final String DEFAULT_GRAALVM_BUILDER_IMAGE = "quay.io/quarkus/ubi-quarkus-native-image:22.1-java11";
+    public static final String DEFAULT_MANDREL_BUILDER_IMAGE = "quay.io/quarkus/ubi-quarkus-mandrel:22.1-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
index 99ebba5d78824..df26f48ebd845 100644
--- 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
@@ -27,8 +27,10 @@ static final class Version implements Comparable<Version> {
         static final Version VERSION_21_3_2 = new Version("GraalVM 21.3.2", "21.3.2", 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 VERSION_22_1_0 = new Version("GraalVM 22.1.0", "22.1.0", Distribution.ORACLE);
+
         static final Version MINIMUM = VERSION_21_2;
-        static final Version CURRENT = VERSION_22_0_0_2;
+        static final Version CURRENT = VERSION_22_1_0;
         public static final int UNDEFINED = -1;
 
         final String fullVersion;
diff --git a/independent-projects/bootstrap/pom.xml b/independent-projects/bootstrap/pom.xml
index 3d7a63e530762..1f6e1c2ef6a2a 100644
--- a/independent-projects/bootstrap/pom.xml
+++ b/independent-projects/bootstrap/pom.xml
@@ -62,6 +62,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.36</slf4j-api.version>
+        <!-- Use previous graal version till https://github.com/oracle/graal/issues/4518 gets resolved -->
         <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.11.0</smallrye-common.version>