From 60f12a60e641db31c1e5e1532fdb31acd8e7e39f Mon Sep 17 00:00:00 2001
From: George Gastaldi <gegastaldi@gmail.com>
Date: Fri, 14 Jul 2023 10:27:13 -0300
Subject: [PATCH 1/2] Use `graal-sdk` instead of `svm`

---
 bigtable/runtime/pom.xml | 4 ++--
 common/grpc/pom.xml      | 4 ++--
 common/runtime/pom.xml   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bigtable/runtime/pom.xml b/bigtable/runtime/pom.xml
index 88f67a87..4b32516c 100644
--- a/bigtable/runtime/pom.xml
+++ b/bigtable/runtime/pom.xml
@@ -53,8 +53,8 @@
             <artifactId>quarkus-grpc-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.graalvm.nativeimage</groupId>
-            <artifactId>svm</artifactId>
+            <groupId>org.graalvm.sdk</groupId>
+            <artifactId>graal-sdk</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/common/grpc/pom.xml b/common/grpc/pom.xml
index 8d17e3c6..2e3d944b 100755
--- a/common/grpc/pom.xml
+++ b/common/grpc/pom.xml
@@ -55,8 +55,8 @@
             to be able to support 22.2 and 22.3.
         -->
         <dependency>
-            <groupId>org.graalvm.nativeimage</groupId>
-            <artifactId>svm</artifactId>
+            <groupId>org.graalvm.sdk</groupId>
+            <artifactId>graal-sdk</artifactId>
         </dependency>
         <dependency>
             <groupId>org.graalvm.sdk</groupId>
diff --git a/common/runtime/pom.xml b/common/runtime/pom.xml
index b76ca326..9953ea87 100644
--- a/common/runtime/pom.xml
+++ b/common/runtime/pom.xml
@@ -61,8 +61,8 @@
             <artifactId>commons-logging-jboss-logging</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.graalvm.nativeimage</groupId>
-            <artifactId>svm</artifactId>
+            <groupId>org.graalvm.sdk</groupId>
+            <artifactId>graal-sdk</artifactId>
         </dependency>
     </dependencies>
 

From 588e617b8f3af900350ec3d76717e0a757a4be4e Mon Sep 17 00:00:00 2001
From: George Gastaldi <gegastaldi@gmail.com>
Date: Mon, 17 Jul 2023 10:00:54 -0300
Subject: [PATCH 2/2] Remove duplicated dependency

---
 common/grpc/pom.xml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/common/grpc/pom.xml b/common/grpc/pom.xml
index 2e3d944b..3976aeb7 100755
--- a/common/grpc/pom.xml
+++ b/common/grpc/pom.xml
@@ -50,18 +50,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <!--
-            On GraalVM 22.3, the substitution annotations will be on the graal-sdk lib, so we add both lib here
-            to be able to support 22.2 and 22.3.
-        -->
-        <dependency>
-            <groupId>org.graalvm.sdk</groupId>
-            <artifactId>graal-sdk</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.graalvm.sdk</groupId>
             <artifactId>graal-sdk</artifactId>
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>