From a230b3f33f7b51b8c41bee6a4c0e7e0ab7e9f16a Mon Sep 17 00:00:00 2001
From: Guillaume Smet <guillaume.smet@gmail.com>
Date: Thu, 14 Mar 2024 16:34:38 +0100
Subject: [PATCH] Exclude org.graalvm.polyglot:polyglot from graal-sdk

graal-sdk now brings polyglot with it which creates issues.
We now rely on nativeimage for substitutions annotations but external
extensions might still rely on graal-sdk.
We make sure relying on graal-sdk don't bring polyglot.

Fixes #39440

(cherry picked from commit 92a3997e7d38b7134fcdd5a93b4881136fbb8e2f)
---
 bom/application/pom.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index 9b15de7c5964e..dcff9bbefc124 100644
--- a/bom/application/pom.xml
+++ b/bom/application/pom.xml
@@ -4403,10 +4403,22 @@
                 <artifactId>jakarta.ws.rs-api</artifactId>
                 <version>${jakarta.ws.rs-api.version}</version>
             </dependency>
+            <!-- graal-sdk should be avoided, keeping it temporarily for compatibility reasons -->
             <dependency>
                 <groupId>org.graalvm.sdk</groupId>
                 <artifactId>graal-sdk</artifactId>
                 <version>${graal-sdk.version}</version>
+                <!--
+                  This is used as a workaround to avoid having polyglot in the classpath when graal-sdk is added.
+                  Polyglot wasn't around until now with the old graal-sdk so it should be relatively safe
+                  until we drop graal-sdk entirely from the BOM.
+                -->
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.graalvm.polyglot</groupId>
+                        <artifactId>polyglot</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.graalvm.sdk</groupId>