From f0b1daebd12959c141eefe635d83e96748f59556 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Wed, 3 Apr 2024 19:46:22 -0500
Subject: [PATCH] simplify graaljs dependencies

---
 engine-core/pom.xml  | 20 +++++++++-----------
 mvn-defaults/pom.xml | 41 ++++++++---------------------------------
 nb-api/pom.xml       |  9 +++++++--
 pom.xml              | 24 ++++++++++++------------
 4 files changed, 36 insertions(+), 58 deletions(-)

diff --git a/engine-core/pom.xml b/engine-core/pom.xml
index 510d22325..e1bf8a73c 100644
--- a/engine-core/pom.xml
+++ b/engine-core/pom.xml
@@ -55,13 +55,17 @@
 
         <!-- graalvm -->
         <dependency>
-            <groupId>org.graalvm.js</groupId>
-            <artifactId>js-scriptengine</artifactId>
+            <groupId>org.graalvm.polyglot</groupId>
+            <artifactId>polyglot</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.graalvm.tools</groupId>
-            <artifactId>profiler</artifactId>
-            <scope>runtime</scope>
+            <groupId>org.graalvm.polyglot</groupId>
+            <artifactId>js</artifactId>
+            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>org.graalvm.js</groupId>
+            <artifactId>js-scriptengine</artifactId>
         </dependency>
 
         <!-- ^ from core -->
@@ -95,12 +99,6 @@
             <version>${revision}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.graalvm.js</groupId>
-            <artifactId>js</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index f45152e51..3b6ec7dee 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -358,33 +358,22 @@
                 <version>2.4.0-b180830.0438</version>
             </dependency>
             <!-- graalvm -->
+
             <dependency>
-                <groupId>org.graalvm.sdk</groupId>
-                <artifactId>graal-sdk</artifactId>
-                <version>23.0.3</version>
+                <groupId>org.graalvm.polyglot</groupId>
+                <artifactId>polyglot</artifactId>
+                <version>23.1.0</version>
             </dependency>
             <dependency>
-                <groupId>org.graalvm.js</groupId>
+                <groupId>org.graalvm.polyglot</groupId>
                 <artifactId>js</artifactId>
-                <version>23.0.3</version>
-                <scope>runtime</scope>
+                <version>23.1.0</version>
+                <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>org.graalvm.js</groupId>
                 <artifactId>js-scriptengine</artifactId>
-                <version>23.0.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.graalvm.tools</groupId>
-                <artifactId>profiler</artifactId>
-                <version>23.0.3</version>
-                <scope>runtime</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.graalvm.tools</groupId>
-                <artifactId>chromeinspector</artifactId>
-                <version>23.0.3</version>
-                <scope>runtime</scope>
+                <version>23.1.2</version>
             </dependency>
 
         </dependencies>
@@ -906,20 +895,6 @@
 
                         </executions>
                     </plugin>
-<!--                    <plugin>-->
-<!--                        <groupId>org.apache.maven.plugins</groupId>-->
-<!--                        <artifactId>maven-javadoc-plugin</artifactId>-->
-<!--                        <version>3.4.1</version>-->
-<!--                        <configuration>-->
-<!--                        </configuration>-->
-<!--                        &lt;!&ndash; NO Executions by default for main project builds.-->
-<!--                             This plugin should be called directly on the command line-->
-<!--                             The site plugin appears to be broken or at least not properly maintained,-->
-<!--                             so invoking via the site phase is more trouble than it is worth.-->
-<!--                             &ndash;&gt;-->
-<!--                        &lt;!&ndash;                <executions>&ndash;&gt;-->
-<!--                        &lt;!&ndash;                </executions>&ndash;&gt;-->
-<!--                    </plugin>-->
                 </plugins>
             </build>
         </profile>
diff --git a/nb-api/pom.xml b/nb-api/pom.xml
index 61e27578a..126b0bcd0 100644
--- a/nb-api/pom.xml
+++ b/nb-api/pom.xml
@@ -142,8 +142,13 @@
         </dependency>
 
         <dependency>
-            <groupId>org.graalvm.sdk</groupId>
-            <artifactId>graal-sdk</artifactId>
+            <groupId>org.graalvm.polyglot</groupId>
+            <artifactId>polyglot</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.graalvm.polyglot</groupId>
+            <artifactId>js</artifactId>
+            <type>pom</type>
         </dependency>
 
         <dependency>
diff --git a/pom.xml b/pom.xml
index 9829a157b..a2925982a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@
 
     <profiles>
         <profile>
-            <id>adapter-cqld4</id>
+            <id>build-adapter-cqld4</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
@@ -89,7 +89,7 @@
             </modules>
         </profile>
         <profile>
-            <id>adapter-milvus</id>
+            <id>build-adapter-milvus</id>
             <activation>
                 <activeByDefault>false</activeByDefault>
             </activation>
@@ -101,7 +101,7 @@
             </modules>
         </profile>
         <profile>
-            <id>adapter-dynamodb</id>
+            <id>build-adapter-dynamodb</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
@@ -113,7 +113,7 @@
             </modules>
         </profile>
         <profile>
-            <id>adapter-http</id>
+            <id>build-adapter-http</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
@@ -125,7 +125,7 @@
             </modules>
         </profile>
         <profile>
-            <id>adapter-tcp</id>
+            <id>build-adapter-tcp</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
@@ -137,7 +137,7 @@
             </modules>
         </profile>
         <profile>
-            <id>adapter-pulsar</id>
+            <id>build-adapter-pulsar</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
@@ -149,7 +149,7 @@
             </modules>
         </profile>
         <profile>
-            <id>adapter-kafka</id>
+            <id>build-adapter-kafka</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
@@ -161,7 +161,7 @@
             </modules>
         </profile>
         <profile>
-            <id>adapter-amqp</id>
+            <id>build-adapter-amqp</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
@@ -173,7 +173,7 @@
             </modules>
         </profile>
         <profile>
-            <id>adapter-jdbc</id>
+            <id>build-adapter-jdbc</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
@@ -185,7 +185,7 @@
             </modules>
         </profile>
         <profile>
-            <id>adapter-mongodb</id>
+            <id>build-adapter-mongodb</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
@@ -197,7 +197,7 @@
             </modules>
         </profile>
         <profile>
-            <id>adapter-aws-opensearch</id>
+            <id>build-adapter-aws-opensearch</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
@@ -209,7 +209,7 @@
             </modules>
         </profile>
         <profile>
-            <id>adapter-s4j</id>
+            <id>build-adapter-s4j</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>