From 4c5e963d8893688c4848ff5a26e1f5b223c135fc Mon Sep 17 00:00:00 2001
From: Sanket-Shelar <sanket.shelar.dev@gmail.com>
Date: Wed, 29 Jan 2025 13:18:48 +0530
Subject: [PATCH] RANGER-4892: Upgrade Ranger Tomcat from 8.5.x to 9.x

---
 embeddedwebserver/pom.xml | 6 ++++++
 pom.xml                   | 2 +-
 security-admin/pom.xml    | 6 ++++++
 tagsync/pom.xml           | 6 ++++++
 ugsync/pom.xml            | 6 ++++++
 5 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/embeddedwebserver/pom.xml b/embeddedwebserver/pom.xml
index 486a6903e5..f0d6e9a616 100644
--- a/embeddedwebserver/pom.xml
+++ b/embeddedwebserver/pom.xml
@@ -82,6 +82,12 @@
             <groupId>org.apache.ranger</groupId>
             <artifactId>ranger-plugins-common</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.graalvm.sdk</groupId>
+                    <artifactId>graal-sdk</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.tomcat</groupId>
diff --git a/pom.xml b/pom.xml
index d5d1bfe147..bdc17a1f87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -213,7 +213,7 @@
         <storm.version>1.2.4</storm.version>
         <sun-jersey-bundle.version>1.19</sun-jersey-bundle.version>
         <testng.version>7.5.1</testng.version>
-        <tomcat.embed.version>8.5.94</tomcat.embed.version>
+        <tomcat.embed.version>9.0.98</tomcat.embed.version>
 
         <!-- trino plugin deps -->
         <trino.airlift.version>0.192</trino.airlift.version>
diff --git a/security-admin/pom.xml b/security-admin/pom.xml
index 96bf334bd6..51f258fe39 100644
--- a/security-admin/pom.xml
+++ b/security-admin/pom.xml
@@ -555,6 +555,12 @@
             <groupId>org.apache.ranger</groupId>
             <artifactId>ranger-plugins-common</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.graalvm.sdk</groupId>
+                    <artifactId>graal-sdk</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.ranger</groupId>
diff --git a/tagsync/pom.xml b/tagsync/pom.xml
index 8152f34905..d8c7fc363b 100644
--- a/tagsync/pom.xml
+++ b/tagsync/pom.xml
@@ -257,6 +257,12 @@
             <groupId>org.apache.ranger</groupId>
             <artifactId>ranger-plugins-common</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.graalvm.sdk</groupId>
+                    <artifactId>graal-sdk</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.ranger</groupId>
diff --git a/ugsync/pom.xml b/ugsync/pom.xml
index 3ca1724720..88b6dd6132 100644
--- a/ugsync/pom.xml
+++ b/ugsync/pom.xml
@@ -165,6 +165,12 @@
             <groupId>org.apache.ranger</groupId>
             <artifactId>ranger-plugins-common</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.graalvm.sdk</groupId>
+                    <artifactId>graal-sdk</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.ranger</groupId>