From 3a1d70eb0df2c1ac9ac883ed755b2f6d75df1cb8 Mon Sep 17 00:00:00 2001 From: Madhan Neethiraj Date: Wed, 29 Jan 2025 17:01:36 -0800 Subject: [PATCH] RANGER-4892: reverted dependency additions to plugins and other modules --- agents-audit/pom.xml | 9 --------- agents-common/pom.xml | 9 --------- agents-cred/pom.xml | 9 --------- credentialbuilder/pom.xml | 9 --------- embeddedwebserver/pom.xml | 6 ------ hbase-agent/pom.xml | 9 --------- hive-agent/pom.xml | 9 --------- kms/pom.xml | 9 --------- plugin-atlas/pom.xml | 9 --------- plugin-kafka/pom.xml | 9 --------- plugin-ozone/pom.xml | 9 --------- plugin-schema-registry/pom.xml | 2 +- plugin-solr/pom.xml | 9 --------- plugin-yarn/pom.xml | 9 --------- ranger-atlas-plugin-shim/pom.xml | 9 --------- ranger-authn/pom.xml | 11 ----------- ranger-common-ha/pom.xml | 9 --------- ranger-examples/plugin-sampleapp/pom.xml | 9 --------- ranger-hbase-plugin-shim/pom.xml | 9 --------- ranger-metrics/pom.xml | 11 ----------- ranger-solr-plugin-shim/pom.xml | 9 --------- ranger-yarn-plugin-shim/pom.xml | 9 --------- security-admin/pom.xml | 6 ------ storm-agent/pom.xml | 9 --------- tagsync/pom.xml | 6 ------ ugsync/pom.xml | 6 ------ 26 files changed, 1 insertion(+), 218 deletions(-) diff --git a/agents-audit/pom.xml b/agents-audit/pom.xml index 9e7756b760..324a20dc2c 100644 --- a/agents-audit/pom.xml +++ b/agents-audit/pom.xml @@ -58,11 +58,6 @@ - - javax.servlet - javax.servlet-api - ${javax.servlet.version} - joda-time joda-time @@ -95,10 +90,6 @@ io.netty netty-transport-native-epoll - - javax.servlet - javax.servlet-api - log4j * diff --git a/agents-common/pom.xml b/agents-common/pom.xml index a2a4fc5079..b438a76ffc 100644 --- a/agents-common/pom.xml +++ b/agents-common/pom.xml @@ -83,11 +83,6 @@ commons-lang ${commons.lang.version} - - javax.servlet - javax.servlet-api - ${javax.servlet.version} - mysql mysql-connector-java @@ -130,10 +125,6 @@ io.netty netty-transport-native-epoll - - javax.servlet - javax.servlet-api - log4j * diff --git a/agents-cred/pom.xml b/agents-cred/pom.xml index 4ca6f20964..e10573f0c2 100644 --- a/agents-cred/pom.xml +++ b/agents-cred/pom.xml @@ -36,11 +36,6 @@ nimbus-jose-jwt ${nimbus-jose-jwt.version} - - javax.servlet - javax.servlet-api - ${javax.servlet.version} - net.minidev json-smart @@ -74,10 +69,6 @@ io.netty netty-transport-native-epoll - - javax.servlet - javax.servlet-api - log4j * diff --git a/credentialbuilder/pom.xml b/credentialbuilder/pom.xml index e5662431ab..f37579ea32 100644 --- a/credentialbuilder/pom.xml +++ b/credentialbuilder/pom.xml @@ -53,11 +53,6 @@ commons-logging ${commons.logging.version} - - javax.servlet - javax.servlet-api - ${javax.servlet.version} - net.minidev json-smart @@ -115,10 +110,6 @@ io.netty netty-transport-native-epoll - - javax.servlet - javax.servlet-api - log4j * diff --git a/embeddedwebserver/pom.xml b/embeddedwebserver/pom.xml index f0d6e9a616..486a6903e5 100644 --- a/embeddedwebserver/pom.xml +++ b/embeddedwebserver/pom.xml @@ -82,12 +82,6 @@ org.apache.ranger ranger-plugins-common ${project.version} - - - org.graalvm.sdk - graal-sdk - - org.apache.tomcat diff --git a/hbase-agent/pom.xml b/hbase-agent/pom.xml index a8412dbe72..47e6443101 100644 --- a/hbase-agent/pom.xml +++ b/hbase-agent/pom.xml @@ -91,11 +91,6 @@ opentelemetry-semconv ${io.opentelemetry-semconv.version} - - javax.servlet - javax.servlet-api - ${javax.servlet.version} - org.apache.commons commons-configuration2 @@ -111,10 +106,6 @@ hadoop-common ${hadoop.version} - - javax.servlet - javax.servlet-api - log4j * diff --git a/hive-agent/pom.xml b/hive-agent/pom.xml index 250c41e4d0..d2ad706258 100644 --- a/hive-agent/pom.xml +++ b/hive-agent/pom.xml @@ -41,11 +41,6 @@ commons-lang ${commons.lang.version} - - javax.servlet - javax.servlet-api - ${javax.servlet.version} - javax.validation validation-api @@ -56,10 +51,6 @@ hive-common ${hive.version} - - javax.servlet - javax.servlet-api - log4j * diff --git a/kms/pom.xml b/kms/pom.xml index 052c436b1b..ee02b1cfd9 100644 --- a/kms/pom.xml +++ b/kms/pom.xml @@ -50,10 +50,6 @@ com.fasterxml.jackson.dataformat jackson-dataformat-cbor - - javax.servlet - javax.servlet-api - software.amazon.ion ion-java @@ -269,11 +265,6 @@ rxjava ${io.reactivex.rxjava.version} - - javax.servlet - javax.servlet-api - ${javax.servlet.version} - jline jline diff --git a/plugin-atlas/pom.xml b/plugin-atlas/pom.xml index 78727464b7..908685caae 100644 --- a/plugin-atlas/pom.xml +++ b/plugin-atlas/pom.xml @@ -40,20 +40,11 @@ commons-lang ${commons.lang.version} - - javax.servlet - javax.servlet-api - ${javax.servlet.version} - org.apache.atlas atlas-authorization ${atlas.version} - - javax.servlet - javax.servlet-api - org.slf4j * diff --git a/plugin-kafka/pom.xml b/plugin-kafka/pom.xml index cfdcc14291..e085527d21 100644 --- a/plugin-kafka/pom.xml +++ b/plugin-kafka/pom.xml @@ -51,11 +51,6 @@ commons-codec ${commons.codec.version} - - javax.servlet - javax.servlet-api - ${javax.servlet.version} - org.apache.hadoop hadoop-hdfs @@ -69,10 +64,6 @@ io.netty netty-all - - javax.servlet - javax.servlet-api - log4j * diff --git a/plugin-ozone/pom.xml b/plugin-ozone/pom.xml index b8d273b838..39335475e7 100644 --- a/plugin-ozone/pom.xml +++ b/plugin-ozone/pom.xml @@ -41,11 +41,6 @@ limitations under the License. protobuf-java ${protobuf-java.version} - - javax.servlet - javax.servlet-api - ${javax.servlet.version} - org.apache.hadoop hadoop-hdfs @@ -59,10 +54,6 @@ limitations under the License. io.netty netty-all - - javax.servlet - javax.servlet-api - log4j * diff --git a/plugin-schema-registry/pom.xml b/plugin-schema-registry/pom.xml index ab16254fc6..5fe8b5f8b6 100644 --- a/plugin-schema-registry/pom.xml +++ b/plugin-schema-registry/pom.xml @@ -34,7 +34,7 @@ 2.22.1 1.5.4 0.9.1 - 4.0.0 + 3.0.1 2.2 diff --git a/plugin-solr/pom.xml b/plugin-solr/pom.xml index 167ff6ece5..3dbeff448d 100644 --- a/plugin-solr/pom.xml +++ b/plugin-solr/pom.xml @@ -31,11 +31,6 @@ UTF-8 - - javax.servlet - javax.servlet-api - ${javax.servlet.version} - org.apache.commons commons-text @@ -93,10 +88,6 @@ io.netty netty-transport-native-unix-common - - javax.servlet - javax.servlet-api - jdk.tools jdk.tools diff --git a/plugin-yarn/pom.xml b/plugin-yarn/pom.xml index c493c3db7e..add03e76c1 100644 --- a/plugin-yarn/pom.xml +++ b/plugin-yarn/pom.xml @@ -36,11 +36,6 @@ jackson-core ${fasterxml.jackson.version} - - javax.servlet - javax.servlet-api - ${javax.servlet.version} - org.apache.hadoop hadoop-yarn-api @@ -51,10 +46,6 @@ hadoop-yarn-common ${hadoop.version} - - javax.servlet - javax.servlet-api - log4j * diff --git a/ranger-atlas-plugin-shim/pom.xml b/ranger-atlas-plugin-shim/pom.xml index d3d3dcc4d2..948a473bea 100644 --- a/ranger-atlas-plugin-shim/pom.xml +++ b/ranger-atlas-plugin-shim/pom.xml @@ -40,20 +40,11 @@ commons-lang ${commons.lang.version} - - javax.servlet - javax.servlet-api - ${javax.servlet.version} - org.apache.atlas atlas-authorization ${atlas.version} - - javax.servlet - javax.servlet-api - org.slf4j * diff --git a/ranger-authn/pom.xml b/ranger-authn/pom.xml index 4c883e33e0..0167fde4ee 100644 --- a/ranger-authn/pom.xml +++ b/ranger-authn/pom.xml @@ -46,11 +46,6 @@ commons-lang ${commons.lang.version} - - javax.servlet - javax.servlet-api - ${javax.servlet.version} - org.apache.commons @@ -67,12 +62,6 @@ org.apache.hadoop hadoop-common - - - javax.servlet - javax.servlet-api - - diff --git a/ranger-common-ha/pom.xml b/ranger-common-ha/pom.xml index c67f5c4971..ddd568e5aa 100644 --- a/ranger-common-ha/pom.xml +++ b/ranger-common-ha/pom.xml @@ -40,11 +40,6 @@ javax.inject 1 - - javax.servlet - javax.servlet-api - ${javax.servlet.version} - org.apache.curator curator-client @@ -101,10 +96,6 @@ io.netty netty-all - - javax.servlet - javax.servlet-api - org.slf4j slf4j-log4j12 diff --git a/ranger-examples/plugin-sampleapp/pom.xml b/ranger-examples/plugin-sampleapp/pom.xml index 2e0d68d11f..09e43bae4f 100644 --- a/ranger-examples/plugin-sampleapp/pom.xml +++ b/ranger-examples/plugin-sampleapp/pom.xml @@ -68,11 +68,6 @@ commons-lang ${commons.lang.version} - - javax.servlet - javax.servlet-api - ${javax.servlet.version} - org.apache.commons commons-configuration2 @@ -96,10 +91,6 @@ io.netty netty-transport-native-epoll - - javax.servlet - javax.servlet-api - log4j * diff --git a/ranger-hbase-plugin-shim/pom.xml b/ranger-hbase-plugin-shim/pom.xml index 026e2899b7..789831364e 100644 --- a/ranger-hbase-plugin-shim/pom.xml +++ b/ranger-hbase-plugin-shim/pom.xml @@ -35,11 +35,6 @@ com.google.code.gson gson - - javax.servlet - javax.servlet-api - ${javax.servlet.version} - org.apache.hbase hbase-server @@ -53,10 +48,6 @@ io.netty netty-all - - javax.servlet - javax.servlet-api - jdk.tools jdk.tools diff --git a/ranger-metrics/pom.xml b/ranger-metrics/pom.xml index b099f9bac9..5ee81bfb6e 100644 --- a/ranger-metrics/pom.xml +++ b/ranger-metrics/pom.xml @@ -35,20 +35,9 @@ - - javax.servlet - javax.servlet-api - ${javax.servlet.version} - org.apache.hadoop hadoop-common - - - javax.servlet - javax.servlet-api - - diff --git a/ranger-solr-plugin-shim/pom.xml b/ranger-solr-plugin-shim/pom.xml index ea9b626939..e265bbe2d5 100644 --- a/ranger-solr-plugin-shim/pom.xml +++ b/ranger-solr-plugin-shim/pom.xml @@ -31,11 +31,6 @@ UTF-8 - - javax.servlet - javax.servlet-api - ${javax.servlet.version} - org.apache.ranger credentialbuilder @@ -93,10 +88,6 @@ io.netty netty-transport-native-unix-common - - javax.servlet - javax.servlet-api - jdk.tools jdk.tools diff --git a/ranger-yarn-plugin-shim/pom.xml b/ranger-yarn-plugin-shim/pom.xml index e989c8cfc4..d669ed6c69 100644 --- a/ranger-yarn-plugin-shim/pom.xml +++ b/ranger-yarn-plugin-shim/pom.xml @@ -31,20 +31,11 @@ UTF-8 - - javax.servlet - javax.servlet-api - ${javax.servlet.version} - org.apache.hadoop hadoop-yarn-common ${hadoop.version} - - javax.servlet - javax.servlet-api - log4j * diff --git a/security-admin/pom.xml b/security-admin/pom.xml index 51f258fe39..96bf334bd6 100644 --- a/security-admin/pom.xml +++ b/security-admin/pom.xml @@ -555,12 +555,6 @@ org.apache.ranger ranger-plugins-common ${project.version} - - - org.graalvm.sdk - graal-sdk - - org.apache.ranger diff --git a/storm-agent/pom.xml b/storm-agent/pom.xml index 2bf61b0f9c..e7009ad300 100644 --- a/storm-agent/pom.xml +++ b/storm-agent/pom.xml @@ -41,11 +41,6 @@ commons-codec ${commons.codec.version} - - javax.servlet - javax.servlet-api - ${javax.servlet.version} - org.apache.commons commons-configuration2 @@ -143,10 +138,6 @@ io.netty netty-transport-native-epoll - - javax.servlet - javax.servlet-api - org.apache.hadoop hadoop-common diff --git a/tagsync/pom.xml b/tagsync/pom.xml index d8c7fc363b..8152f34905 100644 --- a/tagsync/pom.xml +++ b/tagsync/pom.xml @@ -257,12 +257,6 @@ org.apache.ranger ranger-plugins-common ${project.version} - - - org.graalvm.sdk - graal-sdk - - org.apache.ranger diff --git a/ugsync/pom.xml b/ugsync/pom.xml index 88b6dd6132..3ca1724720 100644 --- a/ugsync/pom.xml +++ b/ugsync/pom.xml @@ -165,12 +165,6 @@ org.apache.ranger ranger-plugins-common ${project.version} - - - org.graalvm.sdk - graal-sdk - - org.apache.ranger