From 874e26cfe829b35ad6b510fe398939ed26eb3a66 Mon Sep 17 00:00:00 2001
From: Konrad Windszus <konrad_w@gmx.de>
Date: Tue, 20 Sep 2022 10:10:22 +0200
Subject: [PATCH] Update GraalVM to 22.2.0 (#689)

* Update GraalVM to 22.2.0

* Upgrade graalvm to 22.2.0 and the maven plugin to its latest version

Co-authored-by: Guillaume Nodet <gnodet@gmail.com>
---
 .github/workflows/early-access.yaml |  2 +-
 .github/workflows/release.yaml      |  2 +-
 client/pom.xml                      | 27 ++++++++++++++++++++++++---
 pom.xml                             |  8 ++++----
 4 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/early-access.yaml b/.github/workflows/early-access.yaml
index 1de5566f..3715c969 100644
--- a/.github/workflows/early-access.yaml
+++ b/.github/workflows/early-access.yaml
@@ -24,7 +24,7 @@ on:
   pull_request:
 
 env:
-  GRAALVM_VERSION: '21.3.0'
+  GRAALVM_VERSION: '22.2.0'
   JAVA_VERSION: '17'
 
 jobs:
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 8e9bf0e0..15befdd5 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -26,7 +26,7 @@ on:
       - '*'
 
 env:
-  GRAALVM_VERSION: '21.3.0'
+  GRAALVM_VERSION: '22.2.0'
   JAVA_VERSION: '17'
 
 jobs:
diff --git a/client/pom.xml b/client/pom.xml
index a199c931..abc00937 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -74,6 +74,27 @@
             </resource>
         </resources>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>enforce-bytecode-version</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <enforceBytecodeVersion>
+                                    <excludes>
+                                        <exclude>org.graalvm.nativeimage:svm</exclude>
+                                    </excludes>
+                                </enforceBytecodeVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>buildnumber-maven-plugin</artifactId>
@@ -118,12 +139,12 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.graalvm.nativeimage</groupId>
-                        <artifactId>native-image-maven-plugin</artifactId>
+                        <groupId>org.graalvm.buildtools</groupId>
+                        <artifactId>native-maven-plugin</artifactId>
                         <executions>
                             <execution>
                                 <goals>
-                                    <goal>native-image</goal>
+                                    <goal>build</goal>
                                 </goals>
                                 <phase>package</phase>
                             </execution>
diff --git a/pom.xml b/pom.xml
index bacb1216..ce57b9ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,8 +56,8 @@
         <apiguardian-api.version>1.0.0</apiguardian-api.version>
         <assertj.version>3.16.1</assertj.version>
         <commons-compress.version>1.21</commons-compress.version>
-        <graalvm.version>21.3.0</graalvm.version>
-        <graalvm.plugin.version>21.2.0</graalvm.plugin.version>
+        <graalvm.version>22.2.0</graalvm.version>
+        <graalvm.plugin.version>0.9.13</graalvm.plugin.version>
         <groovy.version>3.0.9</groovy.version>
         <jakarta.inject.version>1.0</jakarta.inject.version>
         <jansi.version>2.4.0</jansi.version>
@@ -474,8 +474,8 @@ limitations under the License.</inlineHeader>
                     <version>${buildnumber-maven-plugin.version}</version>
                 </plugin>
                 <plugin>
-                    <groupId>org.graalvm.nativeimage</groupId>
-                    <artifactId>native-image-maven-plugin</artifactId>
+                    <groupId>org.graalvm.buildtools</groupId>
+                    <artifactId>native-maven-plugin</artifactId>
                     <version>${graalvm.plugin.version}</version>
                 </plugin>
                 <plugin>