From 4c79e0a815e7868cb4884f093f2193a312e91eaf Mon Sep 17 00:00:00 2001
From: mchades <liminghuang@datastrato.com>
Date: Thu, 29 Aug 2024 19:13:00 +0800
Subject: [PATCH] fix ranger dependency

---
 .../authorization-ranger/build.gradle.kts        | 16 +++++++++++-----
 gradle/libs.versions.toml                        |  6 ++++++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/authorizations/authorization-ranger/build.gradle.kts b/authorizations/authorization-ranger/build.gradle.kts
index 51dc592a7ae..b197dc20cf4 100644
--- a/authorizations/authorization-ranger/build.gradle.kts
+++ b/authorizations/authorization-ranger/build.gradle.kts
@@ -31,11 +31,17 @@ dependencies {
   implementation(project(":core")) {
     exclude(group = "*")
   }
+
   implementation(libs.bundles.log4j)
   implementation(libs.commons.lang3)
   implementation(libs.guava)
-
+  implementation(libs.javax.jaxb.api) {
+    exclude("*")
+  }
+  implementation(libs.javax.ws.rs.api)
+  implementation(libs.jettison)
   compileOnly(libs.lombok)
+  implementation(libs.mail)
   implementation(libs.ranger.intg) {
     exclude("org.apache.hadoop", "hadoop-common")
     exclude("org.apache.hive", "hive-storage-api")
@@ -50,11 +56,9 @@ dependencies {
     exclude("org.apache.ranger", "ranger-plugin-classloader")
     exclude("net.java.dev.jna")
     exclude("javax.ws.rs")
+    exclude("org.eclipse.jetty")
   }
-  implementation(libs.javax.ws.rs.api)
-  implementation(libs.javax.jaxb.api) {
-    exclude("*")
-  }
+  implementation(libs.rome)
 
   testImplementation(project(":common"))
   testImplementation(project(":clients:client-java"))
@@ -70,6 +74,7 @@ dependencies {
     exclude("org.apache.lucene")
     exclude("org.apache.solr")
     exclude("org.apache.kafka")
+    exclude("org.eclipse.jetty")
     exclude("org.elasticsearch")
     exclude("org.elasticsearch.client")
     exclude("org.elasticsearch.plugin")
@@ -78,6 +83,7 @@ dependencies {
   }
   testImplementation(libs.hive2.jdbc) {
     exclude("org.slf4j")
+    exclude("org.eclipse.jetty.aggregate")
   }
   testImplementation(libs.mysql.driver)
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4e07eb1daaf..f278e95a416 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -92,6 +92,9 @@ commons-cli = "1.2"
 sun-activation-version = "1.2.0"
 error-prone = "3.1.0"
 woodstox-core = "5.3.0"
+mail = "1.4.1"
+rome = "1.0"
+jettison = "1.1"
 
 [libraries]
 protobuf-java = { group = "com.google.protobuf", name = "protobuf-java", version.ref = "protoc" }
@@ -205,6 +208,9 @@ mybatis = { group = "org.mybatis", name = "mybatis", version.ref = "mybatis"}
 h2db = { group = "com.h2database", name = "h2", version.ref = "h2db"}
 awaitility = { group = "org.awaitility", name = "awaitility", version.ref = "awaitility" }
 servlet = { group = "javax.servlet", name = "javax.servlet-api", version.ref = "servlet" }
+mail = { group = "javax.mail", name = "mail", version.ref = "mail" }
+rome = { group = "rome", name = "rome", version.ref = "rome" }
+jettison = { group = "org.codehaus.jettison", name = "jettison", version.ref = "jettison" }
 
 [bundles]
 log4j = ["slf4j-api", "log4j-slf4j2-impl", "log4j-api", "log4j-core", "log4j-12-api"]