From ebb8eeb0df398676f9c773df0b59710f3fd9dc37 Mon Sep 17 00:00:00 2001
From: Madhan Neethiraj <madhan@apache.org>
Date: Tue, 7 Jul 2026 14:39:12 -0700
Subject: [PATCH 1/2] RANGER-5666: update graalvm version to 25.1.3

---
 agents-common/pom.xml | 1 +
 pom.xml               | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/agents-common/pom.xml b/agents-common/pom.xml
index 52cce7e2ce6..660d22feabd 100644
--- a/agents-common/pom.xml
+++ b/agents-common/pom.xml
@@ -182,6 +182,7 @@
             <groupId>org.graalvm.js</groupId>
             <artifactId>js</artifactId>
             <version>${graalvm.version}</version>
+            <type>pom</type>
         </dependency>
         <dependency>
             <groupId>org.graalvm.js</groupId>
diff --git a/pom.xml b/pom.xml
index 481e660e1b2..b27251823f6 100755
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,7 @@
         <google.guava.version>33.4.8-jre</google.guava.version>
         <google.re2j.version>1.2</google.re2j.version>
         <googlecode.log4jdbc.version>1.2</googlecode.log4jdbc.version>
-        <graalvm.version>23.0.11</graalvm.version>
+        <graalvm.version>25.1.3</graalvm.version>
         <gson.version>2.13.1</gson.version>
         <guice.version>4.0</guice.version>
         <hadoop-shaded-guava.version>1.4.0</hadoop-shaded-guava.version>

From 45196327a0d44f9658a236ecedb330fd309f22cf Mon Sep 17 00:00:00 2001
From: ramk <ramk@cloudera.com>
Date: Thu, 9 Jul 2026 22:49:47 +0530
Subject: [PATCH 2/2] RANGER-5666: update agent assemblies for GraalVM 25.1.3
 runtime JARs

GraalVM 25.x no longer publishes org.graalvm.js:js as a JAR; agent plugin
tarballs must bundle js-language, polyglot, truffle-runtime, and related SDK
artifacts instead of the removed js and graal-sdk coordinates.

(cherry picked from commit 8a0a61e16215f69f90ccb5aaa273baa76fa256a2)
---
 distro/src/main/assembly/hbase-agent.xml | 14 +++++++++++---
 distro/src/main/assembly/hdfs-agent.xml  | 14 +++++++++++---
 distro/src/main/assembly/hive-agent.xml  | 14 +++++++++++---
 distro/src/main/assembly/plugin-solr.xml | 14 +++++++++++---
 distro/src/main/assembly/plugin-yarn.xml | 14 +++++++++++---
 5 files changed, 55 insertions(+), 15 deletions(-)

diff --git a/distro/src/main/assembly/hbase-agent.xml b/distro/src/main/assembly/hbase-agent.xml
index f3785ee1f98..7d910e7bc3c 100644
--- a/distro/src/main/assembly/hbase-agent.xml
+++ b/distro/src/main/assembly/hbase-agent.xml
@@ -75,12 +75,20 @@
           <include>org.glassfish.jersey.core:jersey-common</include>
           <include>org.glassfish.jersey.ext:jersey-entity-filtering:jar:${jersey-client.version}</include>
           <include>org.glassfish.jersey.media:jersey-media-json-jackson</include>
-          <include>org.graalvm.js:js:jar:${graalvm.version}</include>
+          <!-- GraalJS 25.x runtime (js is now a POM, not a JAR) -->
+          <include>org.graalvm.js:js-language:jar:${graalvm.version}</include>
           <include>org.graalvm.js:js-scriptengine:jar:${graalvm.version}</include>
+          <include>org.graalvm.polyglot:polyglot:jar:${graalvm.version}</include>
           <include>org.graalvm.regex:regex:jar:${graalvm.version}</include>
-          <include>org.graalvm.sdk:graal-sdk:jar:${graalvm.version}</include>
           <include>org.graalvm.truffle:truffle-api:jar:${graalvm.version}</include>
-          <include>com.ibm.icu:icu4j</include>
+          <include>org.graalvm.truffle:truffle-runtime:jar:${graalvm.version}</include>
+          <include>org.graalvm.truffle:truffle-compiler:jar:${graalvm.version}</include>
+          <include>org.graalvm.sdk:jniutils:jar:${graalvm.version}</include>
+          <include>org.graalvm.sdk:collections:jar:${graalvm.version}</include>
+          <include>org.graalvm.sdk:nativeimage:jar:${graalvm.version}</include>
+          <include>org.graalvm.sdk:word:jar:${graalvm.version}</include>
+          <include>org.graalvm.shadowed:icu4j:jar:${graalvm.version}</include>
+          <include>org.graalvm.shadowed:xz:jar:${graalvm.version}</include>
         </includes>
       </binaries>
     </moduleSet>
diff --git a/distro/src/main/assembly/hdfs-agent.xml b/distro/src/main/assembly/hdfs-agent.xml
index 171181c80bd..2c6c229d5f5 100644
--- a/distro/src/main/assembly/hdfs-agent.xml
+++ b/distro/src/main/assembly/hdfs-agent.xml
@@ -110,12 +110,20 @@
             <include>com.fasterxml.jackson.core:jackson-annotations:jar:${fasterxml.jackson.version}</include>
             <include>com.fasterxml.jackson.core:jackson-core:jar:${fasterxml.jackson.version}</include>
             <include>com.fasterxml.jackson.core:jackson-databind:jar:${fasterxml.jackson.databind.version}</include>
-            <include>org.graalvm.js:js:jar:${graalvm.version}</include>
+            <!-- GraalJS 25.x runtime (js is now a POM, not a JAR) -->
+            <include>org.graalvm.js:js-language:jar:${graalvm.version}</include>
             <include>org.graalvm.js:js-scriptengine:jar:${graalvm.version}</include>
+            <include>org.graalvm.polyglot:polyglot:jar:${graalvm.version}</include>
             <include>org.graalvm.regex:regex:jar:${graalvm.version}</include>
-            <include>org.graalvm.sdk:graal-sdk:jar:${graalvm.version}</include>
             <include>org.graalvm.truffle:truffle-api:jar:${graalvm.version}</include>
-            <include>com.ibm.icu:icu4j</include>
+            <include>org.graalvm.truffle:truffle-runtime:jar:${graalvm.version}</include>
+            <include>org.graalvm.truffle:truffle-compiler:jar:${graalvm.version}</include>
+            <include>org.graalvm.sdk:jniutils:jar:${graalvm.version}</include>
+            <include>org.graalvm.sdk:collections:jar:${graalvm.version}</include>
+            <include>org.graalvm.sdk:nativeimage:jar:${graalvm.version}</include>
+            <include>org.graalvm.sdk:word:jar:${graalvm.version}</include>
+            <include>org.graalvm.shadowed:icu4j:jar:${graalvm.version}</include>
+            <include>org.graalvm.shadowed:xz:jar:${graalvm.version}</include>
         </includes>
       </binaries>
     </moduleSet>
diff --git a/distro/src/main/assembly/hive-agent.xml b/distro/src/main/assembly/hive-agent.xml
index c26ea72afa2..9b4aa01694a 100644
--- a/distro/src/main/assembly/hive-agent.xml
+++ b/distro/src/main/assembly/hive-agent.xml
@@ -67,12 +67,20 @@
           <include>org.glassfish.jersey.core:jersey-common</include>
           <include>org.glassfish.jersey.media:jersey-media-json-jackson</include>
           <include>com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.16.1</include>
-          <include>org.graalvm.js:js:jar:${graalvm.version}</include>
+          <!-- GraalJS 25.x runtime (js is now a POM, not a JAR) -->
+          <include>org.graalvm.js:js-language:jar:${graalvm.version}</include>
           <include>org.graalvm.js:js-scriptengine:jar:${graalvm.version}</include>
+          <include>org.graalvm.polyglot:polyglot:jar:${graalvm.version}</include>
           <include>org.graalvm.regex:regex:jar:${graalvm.version}</include>
-          <include>org.graalvm.sdk:graal-sdk:jar:${graalvm.version}</include>
           <include>org.graalvm.truffle:truffle-api:jar:${graalvm.version}</include>
-          <include>com.ibm.icu:icu4j</include>
+          <include>org.graalvm.truffle:truffle-runtime:jar:${graalvm.version}</include>
+          <include>org.graalvm.truffle:truffle-compiler:jar:${graalvm.version}</include>
+          <include>org.graalvm.sdk:jniutils:jar:${graalvm.version}</include>
+          <include>org.graalvm.sdk:collections:jar:${graalvm.version}</include>
+          <include>org.graalvm.sdk:nativeimage:jar:${graalvm.version}</include>
+          <include>org.graalvm.sdk:word:jar:${graalvm.version}</include>
+          <include>org.graalvm.shadowed:icu4j:jar:${graalvm.version}</include>
+          <include>org.graalvm.shadowed:xz:jar:${graalvm.version}</include>
         </includes>
       </binaries>
     </moduleSet>
diff --git a/distro/src/main/assembly/plugin-solr.xml b/distro/src/main/assembly/plugin-solr.xml
index a478e27a460..6398f3aeeda 100644
--- a/distro/src/main/assembly/plugin-solr.xml
+++ b/distro/src/main/assembly/plugin-solr.xml
@@ -68,12 +68,20 @@
           <include>org.glassfish.hk2:hk2-api</include>
           <include>org.glassfish.hk2:hk2-core</include>
           <include>org.glassfish.hk2:hk2-runlevel</include>
-          <include>org.graalvm.js:js:jar:${graalvm.version}</include>
+          <!-- GraalJS 25.x runtime (js is now a POM, not a JAR) -->
+          <include>org.graalvm.js:js-language:jar:${graalvm.version}</include>
           <include>org.graalvm.js:js-scriptengine:jar:${graalvm.version}</include>
+          <include>org.graalvm.polyglot:polyglot:jar:${graalvm.version}</include>
           <include>org.graalvm.regex:regex:jar:${graalvm.version}</include>
-          <include>org.graalvm.sdk:graal-sdk:jar:${graalvm.version}</include>
           <include>org.graalvm.truffle:truffle-api:jar:${graalvm.version}</include>
-          <include>com.ibm.icu:icu4j</include>
+          <include>org.graalvm.truffle:truffle-runtime:jar:${graalvm.version}</include>
+          <include>org.graalvm.truffle:truffle-compiler:jar:${graalvm.version}</include>
+          <include>org.graalvm.sdk:jniutils:jar:${graalvm.version}</include>
+          <include>org.graalvm.sdk:collections:jar:${graalvm.version}</include>
+          <include>org.graalvm.sdk:nativeimage:jar:${graalvm.version}</include>
+          <include>org.graalvm.sdk:word:jar:${graalvm.version}</include>
+          <include>org.graalvm.shadowed:icu4j:jar:${graalvm.version}</include>
+          <include>org.graalvm.shadowed:xz:jar:${graalvm.version}</include>
         </includes>
       </binaries>
     </moduleSet>
diff --git a/distro/src/main/assembly/plugin-yarn.xml b/distro/src/main/assembly/plugin-yarn.xml
index e91295b9239..d1533188217 100644
--- a/distro/src/main/assembly/plugin-yarn.xml
+++ b/distro/src/main/assembly/plugin-yarn.xml
@@ -82,12 +82,20 @@
           <include>org.glassfish.jersey.core:jersey-common</include>
           <include>org.glassfish.jersey.media:jersey-media-json-jackson</include>
           <include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
-          <include>org.graalvm.js:js:jar:${graalvm.version}</include>
+          <!-- GraalJS 25.x runtime (js is now a POM, not a JAR) -->
+          <include>org.graalvm.js:js-language:jar:${graalvm.version}</include>
           <include>org.graalvm.js:js-scriptengine:jar:${graalvm.version}</include>
+          <include>org.graalvm.polyglot:polyglot:jar:${graalvm.version}</include>
           <include>org.graalvm.regex:regex:jar:${graalvm.version}</include>
-          <include>org.graalvm.sdk:graal-sdk:jar:${graalvm.version}</include>
           <include>org.graalvm.truffle:truffle-api:jar:${graalvm.version}</include>
-          <include>com.ibm.icu:icu4j</include>
+          <include>org.graalvm.truffle:truffle-runtime:jar:${graalvm.version}</include>
+          <include>org.graalvm.truffle:truffle-compiler:jar:${graalvm.version}</include>
+          <include>org.graalvm.sdk:jniutils:jar:${graalvm.version}</include>
+          <include>org.graalvm.sdk:collections:jar:${graalvm.version}</include>
+          <include>org.graalvm.sdk:nativeimage:jar:${graalvm.version}</include>
+          <include>org.graalvm.sdk:word:jar:${graalvm.version}</include>
+          <include>org.graalvm.shadowed:icu4j:jar:${graalvm.version}</include>
+          <include>org.graalvm.shadowed:xz:jar:${graalvm.version}</include>
         </includes>
       </binaries>
     </moduleSet>