From b70fa787dd2edc4235e7696d099616b2f8db88fe Mon Sep 17 00:00:00 2001
From: Halim Kim <halim.kim@navercorp.com>
Date: Tue, 14 Oct 2025 16:35:30 +0900
Subject: [PATCH 1/2] Downgrade Jetty version of trino ranger plugin

---
 plugin/trino-ranger/pom.xml | 40 +++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/plugin/trino-ranger/pom.xml b/plugin/trino-ranger/pom.xml
index 70103b0bf52a..726e7aecceb7 100644
--- a/plugin/trino-ranger/pom.xml
+++ b/plugin/trino-ranger/pom.xml
@@ -15,6 +15,7 @@
     <description>Trino - Apache Ranger access control</description>
 
     <properties>
+        <dep.jetty11.version>11.0.26</dep.jetty11.version>
         <dep.graalvm.version>25.0.0</dep.graalvm.version>
         <dep.ranger.version>2.7.0</dep.ranger.version>
     </properties>
@@ -69,6 +70,10 @@
                     <groupId>org.apache.hadoop</groupId>
                     <artifactId>hadoop-common</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -212,6 +217,41 @@
             <scope>runtime</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-alpn-client</artifactId>
+            <version>${dep.jetty11.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-client</artifactId>
+            <version>${dep.jetty11.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-http</artifactId>
+            <version>${dep.jetty11.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-io</artifactId>
+            <version>${dep.jetty11.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-util</artifactId>
+            <version>${dep.jetty11.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.graalvm.js</groupId>
             <artifactId>js-scriptengine</artifactId>

From aab5c8bf254768c450ea9aa240301bfb5ecb226a Mon Sep 17 00:00:00 2001
From: Halim Kim <halim.kim@navercorp.com>
Date: Thu, 16 Oct 2025 10:07:47 +0900
Subject: [PATCH 2/2] Modify Jetty exclusion in pom.xml

Removed exclusion for all Jetty artifacts from a dependency and added it back to another dependency.
---
 plugin/trino-ranger/pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugin/trino-ranger/pom.xml b/plugin/trino-ranger/pom.xml
index 726e7aecceb7..d3b71ae912ef 100644
--- a/plugin/trino-ranger/pom.xml
+++ b/plugin/trino-ranger/pom.xml
@@ -70,10 +70,6 @@
                     <groupId>org.apache.hadoop</groupId>
                     <artifactId>hadoop-common</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
 
@@ -208,6 +204,10 @@
                     <groupId>commons-logging</groupId>
                     <artifactId>commons-logging</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>