This is an automated email from the ASF dual-hosted git repository.
madhan pushed a commit to branch ranger-2.8
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/ranger-2.8 by this push:
new 82ad33f32 RANGER-5478: replace hadoop-common dependency with
hadoop-client-api and hadoop-client-runtime (#833)
82ad33f32 is described below
commit 82ad33f3272f4e19aff0f7637c94ca3f408e085b
Author: Madhan Neethiraj <[email protected]>
AuthorDate: Mon Feb 2 17:26:12 2026 -0800
RANGER-5478: replace hadoop-common dependency with hadoop-client-api and
hadoop-client-runtime (#833)
(cherry picked from commit 98af26f6a7661009cd65a8acfded8389772fbb01)
---
agents-audit/core/pom.xml | 16 +-
agents-audit/dest-cloudwatch/pom.xml | 11 +-
agents-audit/dest-es/pom.xml | 6 -
agents-audit/dest-hdfs/pom.xml | 55 +----
agents-audit/dest-kafka/pom.xml | 6 -
agents-audit/dest-log4j/pom.xml | 6 -
agents-audit/dest-solr/pom.xml | 6 -
agents-audit/orc-util/pom.xml | 6 -
agents-common/pom.xml | 61 ++----
.../org/apache/ranger/plugin/util/RangerCache.java | 5 +-
agents-cred/pom.xml | 56 +-----
credentialbuilder/pom.xml | 57 +-----
distro/src/main/assembly/admin-web.xml | 1 -
distro/src/main/assembly/hbase-agent.xml | 3 +-
distro/src/main/assembly/hdfs-agent.xml | 1 +
distro/src/main/assembly/hive-agent.xml | 3 +-
distro/src/main/assembly/kms.xml | 16 +-
distro/src/main/assembly/knox-agent.xml | 7 +-
distro/src/main/assembly/plugin-atlas.xml | 3 +-
distro/src/main/assembly/plugin-elasticsearch.xml | 9 +-
distro/src/main/assembly/plugin-kafka.xml | 10 +-
distro/src/main/assembly/plugin-kylin.xml | 3 +-
distro/src/main/assembly/plugin-ozone.xml | 3 +-
distro/src/main/assembly/plugin-presto.xml | 9 +-
distro/src/main/assembly/plugin-solr.xml | 5 +-
distro/src/main/assembly/plugin-sqoop.xml | 3 +-
distro/src/main/assembly/plugin-trino.xml | 8 +-
distro/src/main/assembly/plugin-yarn.xml | 3 +-
distro/src/main/assembly/ranger-tools.xml | 6 +-
distro/src/main/assembly/sample-client.xml | 4 +-
distro/src/main/assembly/storm-agent.xml | 13 +-
distro/src/main/assembly/tagsync.xml | 7 +-
distro/src/main/assembly/usersync.xml | 7 +-
embeddedwebserver/pom.xml | 5 -
hbase-agent/pom.xml | 39 +---
.../hadoop/RangerHdfsAuditHandler.java | 222 +++++++++++++++++++++
.../authorization/hadoop/RangerHdfsAuthorizer.java | 179 -----------------
kms/pom.xml | 5 -
knox-agent/pom.xml | 25 +--
plugin-kafka/pom.xml | 31 +--
plugin-nifi-registry/pom.xml | 10 +
.../registry/client/TestNiFiRegistryClient.java | 2 +-
plugin-ozone/pom.xml | 25 +--
plugin-presto/pom.xml | 6 -
plugin-schema-registry/pom.xml | 31 +--
plugin-sqoop/pom.xml | 6 -
plugin-trino/pom.xml | 6 -
plugin-yarn/pom.xml | 6 -
pom.xml | 20 +-
ranger-authn/pom.xml | 21 +-
ranger-common-ha/pom.xml | 34 +---
ranger-examples/plugin-sampleapp/pom.xml | 47 +----
ranger-examples/sample-client/pom.xml | 5 -
ranger-examples/sampleapp/pom.xml | 5 -
ranger-hbase-plugin-shim/pom.xml | 6 -
ranger-hdfs-plugin-shim/pom.xml | 6 -
ranger-hive-plugin-shim/pom.xml | 6 -
ranger-metrics/pom.xml | 9 +-
.../ranger/metrics/sink/RangerMetricsJsonSink.java | 6 +-
.../metrics/sink/RangerMetricsPrometheusSink.java | 16 +-
.../source/RangerMetricsContainerSource.java | 4 +-
ranger-ozone-plugin-shim/pom.xml | 6 -
ranger-presto-plugin-shim/pom.xml | 34 +---
ranger-sqoop-plugin-shim/pom.xml | 6 -
ranger-storm-plugin-shim/pom.xml | 6 -
ranger-tools/pom.xml | 5 -
ranger-yarn-plugin-shim/pom.xml | 6 -
security-admin/pom.xml | 36 ----
storm-agent/pom.xml | 58 +-----
tagsync/pom.xml | 5 -
ugsync/pom.xml | 5 -
unixauthclient/pom.xml | 12 +-
unixauthservice/pom.xml | 12 +-
73 files changed, 476 insertions(+), 913 deletions(-)
diff --git a/agents-audit/core/pom.xml b/agents-audit/core/pom.xml
index b8b7ef754..e03bf5a19 100644
--- a/agents-audit/core/pom.xml
+++ b/agents-audit/core/pom.xml
@@ -37,6 +37,16 @@
<artifactId>hppc</artifactId>
<version>${hppc.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${fasterxml.jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${fasterxml.jackson.databind.version}</version>
+ </dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
@@ -102,12 +112,6 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
diff --git a/agents-audit/dest-cloudwatch/pom.xml
b/agents-audit/dest-cloudwatch/pom.xml
index dbb97ff11..f65e1678d 100644
--- a/agents-audit/dest-cloudwatch/pom.xml
+++ b/agents-audit/dest-cloudwatch/pom.xml
@@ -37,6 +37,11 @@
<artifactId>aws-java-sdk-logs</artifactId>
<version>${aws-java-sdk.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>${jsr305.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.ranger</groupId>
<artifactId>ranger-audit-core</artifactId>
@@ -49,12 +54,6 @@
</dependency>
<!-- Test -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
diff --git a/agents-audit/dest-es/pom.xml b/agents-audit/dest-es/pom.xml
index c5d376ab9..e8e874d87 100644
--- a/agents-audit/dest-es/pom.xml
+++ b/agents-audit/dest-es/pom.xml
@@ -209,12 +209,6 @@
</dependency>
<!-- Test -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
diff --git a/agents-audit/dest-hdfs/pom.xml b/agents-audit/dest-hdfs/pom.xml
index f671ce92f..096dc1695 100644
--- a/agents-audit/dest-hdfs/pom.xml
+++ b/agents-audit/dest-hdfs/pom.xml
@@ -34,50 +34,13 @@
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
+ <artifactId>hadoop-client-api</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-runtime</artifactId>
<version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-epoll</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.minidev</groupId>
- <artifactId>json-smart</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-configuration2</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-text</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.ranger</groupId>
@@ -92,12 +55,6 @@
</dependency>
<!-- Test -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
diff --git a/agents-audit/dest-kafka/pom.xml b/agents-audit/dest-kafka/pom.xml
index a2beeb3c6..226315ae5 100644
--- a/agents-audit/dest-kafka/pom.xml
+++ b/agents-audit/dest-kafka/pom.xml
@@ -59,12 +59,6 @@
</dependency>
<!-- Test -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
diff --git a/agents-audit/dest-log4j/pom.xml b/agents-audit/dest-log4j/pom.xml
index 5c9205f54..e8d399924 100644
--- a/agents-audit/dest-log4j/pom.xml
+++ b/agents-audit/dest-log4j/pom.xml
@@ -44,12 +44,6 @@
</dependency>
<!-- Test -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
diff --git a/agents-audit/dest-solr/pom.xml b/agents-audit/dest-solr/pom.xml
index ddd0c5c0d..4ab132260 100644
--- a/agents-audit/dest-solr/pom.xml
+++ b/agents-audit/dest-solr/pom.xml
@@ -117,12 +117,6 @@
</dependency>
<!-- Test -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
diff --git a/agents-audit/orc-util/pom.xml b/agents-audit/orc-util/pom.xml
index d9e5ddc81..0c2dace20 100644
--- a/agents-audit/orc-util/pom.xml
+++ b/agents-audit/orc-util/pom.xml
@@ -77,12 +77,6 @@
</dependency>
<!-- Test -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
diff --git a/agents-common/pom.xml b/agents-common/pom.xml
index bdf5ed136..bff96b14d 100644
--- a/agents-common/pom.xml
+++ b/agents-common/pom.xml
@@ -57,6 +57,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>${jsr305.version}</version>
+ </dependency>
<dependency>
<groupId>com.kstruct</groupId>
<artifactId>gethostname4j</artifactId>
@@ -78,6 +83,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>${javax.servlet.version}</version>
+ </dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
@@ -110,46 +120,13 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
+ <artifactId>hadoop-client-api</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-runtime</artifactId>
<version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-epoll</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.minidev</groupId>
- <artifactId>json-smart</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-configuration2</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-text</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.ranger</groupId>
@@ -220,12 +197,6 @@
<version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
diff --git
a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerCache.java
b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerCache.java
index 9769aaa52..ee743dc44 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerCache.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerCache.java
@@ -17,11 +17,12 @@
package org.apache.ranger.plugin.util;
-import com.sun.istack.NotNull;
import org.apache.ranger.plugin.util.AutoClosableLock.AutoClosableTryLock;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.annotation.Nonnull;
+
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
@@ -363,7 +364,7 @@ private ThreadFactory createThreadFactory() {
private final AtomicInteger number = new AtomicInteger(1);
@Override
- public Thread newThread(@NotNull Runnable r) {
+ public Thread newThread(@Nonnull Runnable r) {
Thread t = new Thread(r, namePrefix +
number.getAndIncrement());
if (!t.isDaemon()) {
diff --git a/agents-cred/pom.xml b/agents-cred/pom.xml
index ddc719cae..7264c5990 100644
--- a/agents-cred/pom.xml
+++ b/agents-cred/pom.xml
@@ -58,46 +58,18 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
+ <artifactId>hadoop-auth</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-api</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-runtime</artifactId>
<version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-epoll</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.minidev</groupId>
- <artifactId>json-smart</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-configuration2</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-text</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -118,11 +90,5 @@
<version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/credentialbuilder/pom.xml b/credentialbuilder/pom.xml
index 6acc65a89..5b840d29b 100644
--- a/credentialbuilder/pom.xml
+++ b/credentialbuilder/pom.xml
@@ -58,6 +58,11 @@
<artifactId>json-smart</artifactId>
<version>${jsonsmart.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>${commons.collections4.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
@@ -99,46 +104,13 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
+ <artifactId>hadoop-client-api</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-runtime</artifactId>
<version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-epoll</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-configuration2</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-text</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
@@ -158,12 +130,5 @@
<version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/distro/src/main/assembly/admin-web.xml
b/distro/src/main/assembly/admin-web.xml
index dd7c90e53..bc4ab2d59 100644
--- a/distro/src/main/assembly/admin-web.xml
+++ b/distro/src/main/assembly/admin-web.xml
@@ -277,7 +277,6 @@
<include>org.apache.ranger:ugsyn-util</include>
<include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
- <include>org.slf4j:log4j-over-slf4j:jar:${slf4j.version}</include>
<include>ch.qos.logback:logback-classic:jar:${logback.version}</include>
<include>ch.qos.logback:logback-core:jar:${logback.version}</include>
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
diff --git a/distro/src/main/assembly/hbase-agent.xml
b/distro/src/main/assembly/hbase-agent.xml
index 74fb21a40..b714c78b7 100644
--- a/distro/src/main/assembly/hbase-agent.xml
+++ b/distro/src/main/assembly/hbase-agent.xml
@@ -113,7 +113,8 @@
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
-
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
diff --git a/distro/src/main/assembly/hdfs-agent.xml
b/distro/src/main/assembly/hdfs-agent.xml
index 42e112958..ef0b1be6d 100644
--- a/distro/src/main/assembly/hdfs-agent.xml
+++ b/distro/src/main/assembly/hdfs-agent.xml
@@ -87,6 +87,7 @@
<fileMode>644</fileMode>
<includes>
<include>commons-collections:commons-collections</include>
+
<include>org.apache.commons:commons-collections4:jar:${commons.collections4.version}</include>
<include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
<include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
<include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
diff --git a/distro/src/main/assembly/hive-agent.xml
b/distro/src/main/assembly/hive-agent.xml
index 6c412d02f..7a72129c5 100644
--- a/distro/src/main/assembly/hive-agent.xml
+++ b/distro/src/main/assembly/hive-agent.xml
@@ -105,7 +105,8 @@
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
-
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
diff --git a/distro/src/main/assembly/kms.xml b/distro/src/main/assembly/kms.xml
index d6c126781..a24ecc501 100755
--- a/distro/src/main/assembly/kms.xml
+++ b/distro/src/main/assembly/kms.xml
@@ -41,6 +41,7 @@
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
+ <include>com.google.code.gson:gson</include>
<include>org.eclipse.persistence:eclipselink</include>
<include>org.eclipse.persistence:javax.persistence</include>
<include>com.googlecode.log4jdbc:log4jdbc</include>
@@ -209,9 +210,9 @@
<include>org.eclipse.jdt.core.compiler:ecj:jar:P20140317-1600</include>
<include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
<include>com.google.protobuf:protobuf-java:jar:${gcp.protobuf-java.version}</include>
-
<include>org.apache.hadoop:hadoop-hdfs:jar:${hadoop.version}</include>
-
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
<include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
<include>org.apache.ranger:ranger-authz-api</include>
<include>org.apache.ranger:ranger-plugins-common</include>
@@ -227,10 +228,8 @@
<include>commons-collections:commons-collections</include>
<include>commons-logging:commons-logging</include>
<include>org.slf4j:slf4j-api</include>
-
<include>org.slf4j:log4j-over-slf4j:jar:${slf4j.version}</include>
<include>ch.qos.logback:logback-classic:jar:${logback.version}</include>
<include>ch.qos.logback:logback-core:jar:${logback.version}</include>
- <include>com.google.code.gson:gson</include>
<include>com.sun.jersey:jersey-bundle</include>
<include>com.fasterxml.jackson.core:jackson-annotations:jar:${fasterxml.jackson.version}</include>
<include>com.fasterxml.jackson.core:jackson-core:jar:${fasterxml.jackson.version}</include>
@@ -302,7 +301,6 @@
<unpack>false</unpack>
<includes>
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
- <include>com.google.code.gson:gson</include>
<include>org.eclipse.persistence:eclipselink</include>
<include>org.eclipse.persistence:javax.persistence</include>
<include>commons-collections:commons-collections</include>
@@ -350,7 +348,8 @@
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
-
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
@@ -392,8 +391,9 @@
<include>commons-io:commons-io:jar:${commons.io.version}</include>
<include>commons-logging:commons-logging</include>
<include>org.slf4j:slf4j-api</include>
- <include>org.apache.hadoop:hadoop-common</include>
- <include>org.apache.hadoop:hadoop-auth</include>
+
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>com.fasterxml.woodstox:woodstox-core</include>
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
diff --git a/distro/src/main/assembly/knox-agent.xml
b/distro/src/main/assembly/knox-agent.xml
index d20d5648e..e8679e822 100644
--- a/distro/src/main/assembly/knox-agent.xml
+++ b/distro/src/main/assembly/knox-agent.xml
@@ -67,8 +67,8 @@
<include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
<include>org.noggit:noggit:jar:${noggit.version}</include>
<include>com.google.protobuf:protobuf-java:jar:${protobuf-java.version}</include>
-
<include>org.apache.hadoop:hadoop-hdfs:jar:${hadoop.version}</include>
-
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
<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.version}</include>
@@ -118,7 +118,8 @@
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
-
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
diff --git a/distro/src/main/assembly/plugin-atlas.xml
b/distro/src/main/assembly/plugin-atlas.xml
index ca9e67c16..0e6f1b0be 100644
--- a/distro/src/main/assembly/plugin-atlas.xml
+++ b/distro/src/main/assembly/plugin-atlas.xml
@@ -125,7 +125,8 @@
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
-
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.apache.ranger:ranger-plugins-cred</include>
<include>org.codehaus.woodstox:stax2-api:jar:${codehaus.woodstox.stax2api.version}</include>
diff --git a/distro/src/main/assembly/plugin-elasticsearch.xml
b/distro/src/main/assembly/plugin-elasticsearch.xml
index e958595e5..5532cc07e 100644
--- a/distro/src/main/assembly/plugin-elasticsearch.xml
+++ b/distro/src/main/assembly/plugin-elasticsearch.xml
@@ -65,10 +65,10 @@
<includes>
<include>commons-collections:commons-collections</include>
<include>commons-configuration:commons-configuration:jar:${commons.configuration.version}</include>
-
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
-
<include>org.apache.hadoop:hadoop-common-plus:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
-
<include>org.apache.hadoop:hadoop-hdfs:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
<include>com.google.code.gson:gson</include>
<include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
<include>com.sun.jersey:jersey-bundle</include>
@@ -133,7 +133,8 @@
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
-
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
<include>org.apache.ranger:ranger-plugins-cred</include>
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
diff --git a/distro/src/main/assembly/plugin-kafka.xml
b/distro/src/main/assembly/plugin-kafka.xml
index 2ebf2ea15..15b9d85ab 100644
--- a/distro/src/main/assembly/plugin-kafka.xml
+++ b/distro/src/main/assembly/plugin-kafka.xml
@@ -56,10 +56,9 @@
<include>org.apache.commons:commons-collections4:jar:${commons.collections4.version}</include>
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
-
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
-
<include>org.apache.hadoop:hadoop-common-plus:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
-
<include>org.apache.hadoop:hadoop-hdfs:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
<include>com.google.code.gson:gson</include>
<include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
<include>commons-collections:commons-collections</include>
@@ -127,9 +126,10 @@
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
-
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
-
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
+
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.apache.ranger:ranger-plugins-cred</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
diff --git a/distro/src/main/assembly/plugin-kylin.xml
b/distro/src/main/assembly/plugin-kylin.xml
index 0cedb1830..819c842b8 100644
--- a/distro/src/main/assembly/plugin-kylin.xml
+++ b/distro/src/main/assembly/plugin-kylin.xml
@@ -106,7 +106,8 @@
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
-
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.apache.ranger:credentialbuilder</include>
<include>org.apache.ranger:ranger-plugins-cred</include>
diff --git a/distro/src/main/assembly/plugin-ozone.xml
b/distro/src/main/assembly/plugin-ozone.xml
index bf37b53c2..24f931a0a 100644
--- a/distro/src/main/assembly/plugin-ozone.xml
+++ b/distro/src/main/assembly/plugin-ozone.xml
@@ -66,7 +66,8 @@
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
-
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.codehaus.woodstox:stax2-api:jar:${codehaus.woodstox.stax2api.version}</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
diff --git a/distro/src/main/assembly/plugin-presto.xml
b/distro/src/main/assembly/plugin-presto.xml
index 66317cdcd..db3d74900 100644
--- a/distro/src/main/assembly/plugin-presto.xml
+++ b/distro/src/main/assembly/plugin-presto.xml
@@ -87,11 +87,9 @@
<include>com.google.protobuf:protobuf-java:jar:${protobuf-java.version}</include>
<include>com.google.re2j:re2j:jar:${presto.re2j.version}</include>
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
-
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
-
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
-
<include>org.apache.hadoop:hadoop-common-plus:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
-
<include>org.apache.hadoop:hadoop-hdfs:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
<include>org.apache.ranger:ranger-plugins-cred</include>
<include>org.apache.ranger:credentialbuilder</include>
<include>org.codehaus.woodstox:stax2-api</include>
@@ -149,7 +147,8 @@
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
-
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
diff --git a/distro/src/main/assembly/plugin-solr.xml
b/distro/src/main/assembly/plugin-solr.xml
index e71eba6fc..6a90731c5 100644
--- a/distro/src/main/assembly/plugin-solr.xml
+++ b/distro/src/main/assembly/plugin-solr.xml
@@ -55,6 +55,8 @@
<include>commons-collections:commons-collections</include>
<include>com.google.code.gson:gson</include>
<include>com.sun.jersey:jersey-bundle</include>
+
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
<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.version}</include>
@@ -107,7 +109,8 @@
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
-
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.apache.ranger:ranger-plugins-cred</include>
<include>org.apache.ranger:ranger-solr-plugin</include>
diff --git a/distro/src/main/assembly/plugin-sqoop.xml
b/distro/src/main/assembly/plugin-sqoop.xml
index 39645ea36..eb27afac7 100644
--- a/distro/src/main/assembly/plugin-sqoop.xml
+++ b/distro/src/main/assembly/plugin-sqoop.xml
@@ -111,7 +111,8 @@
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
-
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.apache.ranger:ranger-plugins-cred</include>
<include>org.codehaus.woodstox:stax2-api</include>
diff --git a/distro/src/main/assembly/plugin-trino.xml
b/distro/src/main/assembly/plugin-trino.xml
index 096f5ae37..c11d61d48 100644
--- a/distro/src/main/assembly/plugin-trino.xml
+++ b/distro/src/main/assembly/plugin-trino.xml
@@ -79,10 +79,9 @@
<include>com.google.protobuf:protobuf-java:jar:${protobuf-java.version}</include>
<include>com.google.re2j:re2j:jar:${trino.re2j.version}</include>
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
-
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
-
<include>org.apache.hadoop:hadoop-common-plus:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
-
<include>org.apache.hadoop:hadoop-hdfs:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
<include>org.apache.ranger:ranger-plugins-cred</include>
<include>org.apache.ranger:credentialbuilder</include>
<include>org.codehaus.woodstox:stax2-api</include>
@@ -141,7 +140,8 @@
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
-
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
diff --git a/distro/src/main/assembly/plugin-yarn.xml
b/distro/src/main/assembly/plugin-yarn.xml
index e116b3538..ce6fec0ee 100644
--- a/distro/src/main/assembly/plugin-yarn.xml
+++ b/distro/src/main/assembly/plugin-yarn.xml
@@ -112,7 +112,8 @@
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
-
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.apache.ranger:credentialbuilder</include>
<include>org.apache.ranger:ranger-plugins-cred</include>
diff --git a/distro/src/main/assembly/ranger-tools.xml
b/distro/src/main/assembly/ranger-tools.xml
index c6af0fcbe..7e018f349 100644
--- a/distro/src/main/assembly/ranger-tools.xml
+++ b/distro/src/main/assembly/ranger-tools.xml
@@ -44,11 +44,9 @@
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
<include>log4j:log4j</include>
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
-
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
-
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
-
<include>org.apache.hadoop:hadoop-common-plus:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
-
<include>org.apache.hadoop:hadoop-hdfs:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
<include>org.eclipse.persistence:eclipselink</include>
<include>org.eclipse.persistence:javax.persistence</include>
<include>commons-collections:commons-collections</include>
diff --git a/distro/src/main/assembly/sample-client.xml
b/distro/src/main/assembly/sample-client.xml
index 833f7963a..7a8df7d46 100644
--- a/distro/src/main/assembly/sample-client.xml
+++ b/distro/src/main/assembly/sample-client.xml
@@ -49,9 +49,9 @@
<include>org.slf4j:slf4j-log4j12</include>
<include>log4j:log4j</include>
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
-
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
-
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
<include>org.eclipse.persistence:eclipselink</include>
<include>org.eclipse.persistence:javax.persistence</include>
<include>commons-collections:commons-collections</include>
diff --git a/distro/src/main/assembly/storm-agent.xml
b/distro/src/main/assembly/storm-agent.xml
index 4b4ebe6b9..3dbd34914 100644
--- a/distro/src/main/assembly/storm-agent.xml
+++ b/distro/src/main/assembly/storm-agent.xml
@@ -62,8 +62,9 @@
<unpack>false</unpack>
<includes>
<include>commons-configuration:commons-configuration</include>
- <include>org.apache.hadoop:hadoop-common</include>
- <include>org.apache.hadoop:hadoop-common-plus</include>
+
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
<include>com.google.code.gson:gson</include>
<include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
<include>commons-collections:commons-collections</include>
@@ -73,7 +74,8 @@
<include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
<include>org.noggit:noggit:jar:${noggit.version}</include>
<include>com.google.protobuf:protobuf-java:jar:${protobuf-java.version}</include>
- <include>org.apache.hadoop:hadoop-hdfs</include>
+
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
<include>org.apache.htrace:htrace-core:jar:${htrace-core.version}</include>
<include>commons-cli:commons-cli:jar:${commons.cli.version}</include>
<include>commons-io:commons-io:jar:${commons.io.version}</include>
@@ -125,8 +127,9 @@
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
- <include>org.apache.hadoop:hadoop-auth:jar</include>
- <include>org.apache.hadoop:hadoop-common:jar</include>
+
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.apache.ranger:credentialbuilder</include>
<include>org.apache.ranger:ranger-plugins-cred</include>
diff --git a/distro/src/main/assembly/tagsync.xml
b/distro/src/main/assembly/tagsync.xml
index ecb0a2c04..659951674 100644
--- a/distro/src/main/assembly/tagsync.xml
+++ b/distro/src/main/assembly/tagsync.xml
@@ -50,8 +50,9 @@
<include>org.apache.atlas:atlas-client-v2:jar:${atlas.version}</include>
<include>org.apache.atlas:atlas-client-common:jar:${atlas.version}</include>
<include>org.apache.atlas:atlas-common:jar:${atlas.version}</include>
-
<include>org.apache.hadoop:hadoop-auth</include>
-
<include>org.apache.hadoop:hadoop-common</include>
+
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
<include>org.apache.commons:commons-compress</include>
<include>org.apache.kafka:kafka-clients:jar:${kafka.version}</include>
<include>org.apache.ranger:credentialbuilder</include>
@@ -101,7 +102,7 @@
<include>org.apache.zookeeper:zookeeper:jar:${zookeeper.version}</include>
<include>org.apache.zookeeper:zookeeper-jute:jar:${zookeeper.version}</include>
<include>com.google.guava:guava</include>
-
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
+
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
</includes>
</dependencySet>
</dependencySets>
diff --git a/distro/src/main/assembly/usersync.xml
b/distro/src/main/assembly/usersync.xml
index 79b808078..3404b9e04 100644
--- a/distro/src/main/assembly/usersync.xml
+++ b/distro/src/main/assembly/usersync.xml
@@ -46,9 +46,10 @@
<include>commons-cli:commons-cli</include>
<include>commons-collections:commons-collections</include>
<include>commons-logging:commons-logging</include>
-
<include>org.apache.hadoop:hadoop-auth</include>
+
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
+
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
<include>org.slf4j:slf4j-api:jar:${slf4j.version}</include>
-
<include>org.apache.hadoop:hadoop-common</include>
<include>org.apache.commons:commons-csv</include>
<include>org.apache.ranger:credentialbuilder</include>
<include>org.apache.ranger:ranger-util</include>
@@ -85,7 +86,7 @@
<include>ch.qos.logback:logback-classic:jar:${logback.version}</include>
<include>org.slf4j:log4j-over-slf4j:jar:${${slf4j.version}}</include>
<include>ch.qos.logback:logback-core:jar:${logback.version}</include>
-
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
+
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
</includes>
</dependencySet>
<dependencySet>
diff --git a/embeddedwebserver/pom.xml b/embeddedwebserver/pom.xml
index f6f7f0293..89ab51bb3 100644
--- a/embeddedwebserver/pom.xml
+++ b/embeddedwebserver/pom.xml
@@ -123,10 +123,5 @@
<artifactId>ecj</artifactId>
<version>P20140317-1600</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
</dependencies>
</project>
diff --git a/hbase-agent/pom.xml b/hbase-agent/pom.xml
index cd2788e0d..4bc987d14 100644
--- a/hbase-agent/pom.xml
+++ b/hbase-agent/pom.xml
@@ -103,34 +103,13 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
+ <artifactId>hadoop-client-api</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-runtime</artifactId>
<version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-configuration2</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-text</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
@@ -444,12 +423,6 @@
<version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<testResources>
diff --git
a/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/RangerHdfsAuditHandler.java
b/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/RangerHdfsAuditHandler.java
new file mode 100644
index 000000000..4f7e74cd3
--- /dev/null
+++
b/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/RangerHdfsAuditHandler.java
@@ -0,0 +1,222 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.ranger.authorization.hadoop;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.hadoop.fs.permission.FsAction;
+import org.apache.ranger.audit.model.AuthzAuditEvent;
+import org.apache.ranger.authorization.utils.JsonUtils;
+import org.apache.ranger.plugin.audit.RangerDefaultAuditHandler;
+import org.apache.ranger.plugin.policyengine.RangerAccessRequest;
+import org.apache.ranger.plugin.policyengine.RangerAccessResource;
+import org.apache.ranger.plugin.policyengine.RangerAccessResult;
+import org.apache.ranger.plugin.util.RangerAccessRequestUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import static
org.apache.ranger.authorization.hadoop.constants.RangerHadoopConstants.ACCESS_TYPE_MONITOR_HEALTH;
+import static
org.apache.ranger.authorization.hadoop.constants.RangerHadoopConstants.ALL_PERM;
+import static
org.apache.ranger.authorization.hadoop.constants.RangerHadoopConstants.READ_ACCCESS_TYPE;
+import static
org.apache.ranger.authorization.hadoop.constants.RangerHadoopConstants.READ_EXECUTE_PERM;
+import static
org.apache.ranger.authorization.hadoop.constants.RangerHadoopConstants.READ_WRITE_PERM;
+import static
org.apache.ranger.authorization.hadoop.constants.RangerHadoopConstants.WRITE_ACCCESS_TYPE;
+import static
org.apache.ranger.authorization.hadoop.constants.RangerHadoopConstants.WRITE_EXECUTE_PERM;
+
+class RangerHdfsAuditHandler extends RangerDefaultAuditHandler {
+ private static final Logger LOG =
LoggerFactory.getLogger(RangerHdfsAuditHandler.class);
+
+ private final String pathToBeValidated;
+ private final boolean auditOnlyIfDenied;
+ private final String hadoopModuleName;
+ private final Set<String> excludeUsers;
+ private final String callerContext;
+
+ private boolean isAuditEnabled;
+ private AuthzAuditEvent auditEvent;
+
+ public RangerHdfsAuditHandler(String pathToBeValidated, boolean
auditOnlyIfDenied, String hadoopModuleName, Set<String> excludedUsers, String
callerContext) {
+ this.pathToBeValidated = pathToBeValidated;
+ this.auditOnlyIfDenied = auditOnlyIfDenied;
+ this.hadoopModuleName = hadoopModuleName;
+ this.excludeUsers = excludedUsers;
+ this.callerContext = callerContext;
+ }
+
+ @Override
+ public void processResult(RangerAccessResult result) {
+ LOG.debug("==> RangerHdfsAuditHandler.logAudit({})", result);
+
+ if (result != null) {
+ isAuditEnabled = result.getIsAudited();
+
+ if (auditEvent == null) {
+ auditEvent = super.getAuthzEvents(result);
+ }
+
+ if (auditEvent != null) {
+ RangerAccessRequest request = result.getAccessRequest();
+ RangerAccessResource resource = request.getResource();
+ String resourcePath = resource != null ?
resource.getAsString() : null;
+
+ // Overwrite fields in original auditEvent
+ auditEvent.setEventTime(request.getAccessTime() != null ?
request.getAccessTime() : new Date());
+ auditEvent.setAccessType(request.getAction());
+ auditEvent.setResourcePath(this.pathToBeValidated);
+ auditEvent.setResultReason(resourcePath);
+
+ auditEvent.setAccessResult((short) (result.getIsAllowed() ? 1
: 0));
+ auditEvent.setPolicyId(result.getPolicyId());
+ auditEvent.setPolicyVersion(result.getPolicyVersion());
+
+ setRequestData();
+
+ auditEvent.setAction(getAccessType(request.getAccessType()));
+ auditEvent.setAdditionalInfo(getAdditionalInfo(request));
+
+ Set<String> tags = getTags(request);
+
+ if (tags != null) {
+ auditEvent.setTags(tags);
+ }
+ }
+ }
+
+ LOG.debug("<== RangerHdfsAuditHandler.logAudit({}): {}", result,
auditEvent);
+ }
+
+ @Override
+ public String getAdditionalInfo(RangerAccessRequest request) {
+ String additionalInfo = super.getAdditionalInfo(request);
+ Map<String, String> addInfoMap =
JsonUtils.jsonToMapStringString(additionalInfo);
+
+ if (addInfoMap == null || addInfoMap.isEmpty()) {
+ addInfoMap = new HashMap<>();
+ }
+
+ String accessTypes = getAccessTypesAsString(request);
+
+ if (accessTypes != null) {
+ addInfoMap.put("accessTypes", "[" + accessTypes + "]");
+ }
+
+ return JsonUtils.mapToJson(addInfoMap);
+ }
+
+ public void logHadoopEvent(String path, FsAction action, boolean
accessGranted) {
+ LOG.debug("==> RangerHdfsAuditHandler.logHadoopEvent({}, {}, {})",
path, action, accessGranted);
+
+ if (auditEvent != null) {
+ auditEvent.setResultReason(path);
+ auditEvent.setAccessResult((short) (accessGranted ? 1 : 0));
+ auditEvent.setAclEnforcer(hadoopModuleName);
+ auditEvent.setPolicyId(-1);
+
+ String accessType = (action == null) ? null : action.toString();
+
+ if (StringUtils.isBlank(auditEvent.getAccessType())) { // retain
existing value
+ auditEvent.setAccessType(accessType);
+ }
+
+ if (accessType != null) {
+ auditEvent.setAction(getAccessType(accessType));
+ }
+
+ setRequestData();
+ }
+
+ LOG.debug("<== RangerHdfsAuditHandler.logHadoopEvent({}, {}, {}): {}",
path, action, accessGranted, auditEvent);
+ }
+
+ public void flushAudit() {
+ LOG.debug("==> RangerHdfsAuditHandler.flushAudit({}, {})",
isAuditEnabled, auditEvent);
+
+ if (isAuditEnabled && auditEvent != null &&
!StringUtils.isEmpty(auditEvent.getAccessType())) {
+ String username = auditEvent.getUser();
+ String accessType = auditEvent.getAccessType();
+
+ boolean skipLog = (username != null && excludeUsers != null &&
excludeUsers.contains(username))
+ || (auditOnlyIfDenied && auditEvent.getAccessResult() != 0)
+ || (ACCESS_TYPE_MONITOR_HEALTH.equals(accessType));
+
+ if (!skipLog) {
+ super.logAuthzAudit(auditEvent);
+ }
+ }
+
+ LOG.debug("<== RangerHdfsAuditHandler.flushAudit({}, {})",
isAuditEnabled, auditEvent);
+ }
+
+ private String getAccessType(String accessType) {
+ String ret = accessType;
+
+ switch (accessType) {
+ case READ_EXECUTE_PERM:
+ ret = READ_ACCCESS_TYPE;
+ break;
+ case WRITE_EXECUTE_PERM:
+ case READ_WRITE_PERM:
+ case ALL_PERM:
+ ret = WRITE_ACCCESS_TYPE;
+ break;
+ default:
+ break;
+ }
+
+ return ret.toLowerCase();
+ }
+
+ private String getAccessTypesAsString(RangerAccessRequest request) {
+ String ret = null;
+ Set<String> accessTypes =
RangerAccessRequestUtil.getAllRequestedAccessTypes(request);
+
+ if (CollectionUtils.isNotEmpty(accessTypes)) {
+ try {
+ ret = getFormattedAccessType(accessTypes);
+ } catch (Throwable t) {
+ LOG.error("getAccessTypesAsString(): failed to get accessTypes
from context", t);
+ }
+ } else {
+ ret = request.getAccessType();
+ }
+ return ret;
+ }
+
+ private String getFormattedAccessType(Set<String> accessTypes) {
+ String ret = null;
+
+ if (CollectionUtils.isNotEmpty(accessTypes)) {
+ ret = String.join(", ", accessTypes);
+ }
+
+ return ret;
+ }
+
+ private void setRequestData() {
+ if (StringUtils.isNotBlank(auditEvent.getAccessType()) &&
StringUtils.isNotBlank(callerContext)) {
+ auditEvent.setRequestData(auditEvent.getAccessType() + "/" +
callerContext);
+ }
+ }
+}
diff --git
a/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/RangerHdfsAuthorizer.java
b/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/RangerHdfsAuthorizer.java
index 88451d434..3cb0245ef 100644
---
a/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/RangerHdfsAuthorizer.java
+++
b/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/RangerHdfsAuthorizer.java
@@ -1452,182 +1452,3 @@ public RangerAccessResult getLastResult() {
return lastResult;
}
}
-
-class RangerHdfsAuditHandler extends RangerDefaultAuditHandler {
- private static final Logger LOG =
LoggerFactory.getLogger(RangerHdfsAuditHandler.class);
-
- private boolean isAuditEnabled = false;
- private AuthzAuditEvent auditEvent = null;
- private final String pathToBeValidated;
- private final boolean auditOnlyIfDenied;
-
- private final String hadoopModuleName;
- private final Set<String> excludeUsers;
- private final String callerContext;
-
- public RangerHdfsAuditHandler(String pathToBeValidated, boolean
auditOnlyIfDenied, String hadoopModuleName, Set<String> excludedUsers, String
callerContext) {
- this.pathToBeValidated = pathToBeValidated;
- this.auditOnlyIfDenied = auditOnlyIfDenied;
- this.hadoopModuleName = hadoopModuleName;
- this.excludeUsers = excludedUsers;
- this.callerContext = callerContext;
- }
-
- @Override
- public void processResult(RangerAccessResult result) {
- if(LOG.isDebugEnabled()) {
- LOG.debug("==> RangerHdfsAuditHandler.logAudit(" +
result + ")");
- }
-
- if (result != null) {
- isAuditEnabled = result.getIsAudited();
-
- if (auditEvent == null) {
- auditEvent = super.getAuthzEvents(result);
- }
-
- if (auditEvent != null) {
- RangerAccessRequest request =
result.getAccessRequest();
- RangerAccessResource resource =
request.getResource();
- String resourcePath = resource != null ?
resource.getAsString() : null;
-
- // Overwrite fields in original auditEvent
- auditEvent.setEventTime(request.getAccessTime()
!= null ? request.getAccessTime() : new Date());
- auditEvent.setAccessType(request.getAction());
-
auditEvent.setResourcePath(this.pathToBeValidated);
- auditEvent.setResultReason(resourcePath);
-
- auditEvent.setAccessResult((short)
(result.getIsAllowed() ? 1 : 0));
- auditEvent.setPolicyId(result.getPolicyId());
-
auditEvent.setPolicyVersion(result.getPolicyVersion());
- setRequestData();
-
-
auditEvent.setAction(getAccessType(request.getAccessType()));
-
auditEvent.setAdditionalInfo(getAdditionalInfo(request));
-
- Set<String> tags = getTags(request);
- if (tags != null) {
- auditEvent.setTags(tags);
- }
- }
- }
-
- if(LOG.isDebugEnabled()) {
- LOG.debug("<== RangerHdfsAuditHandler.logAudit(" +
result + "): " + auditEvent);
- }
- }
-
- @Override
- public String getAdditionalInfo(RangerAccessRequest request) {
- String additionalInfo = super.getAdditionalInfo(request);
- Map addInfoMap =
JsonUtils.jsonToMapStringString(additionalInfo);
- if(addInfoMap == null || addInfoMap.isEmpty()) {
- addInfoMap = new HashMap<String,String>();
- }
- String accessTypes = getAccessTypesAsString(request);
- if (addInfoMap != null && accessTypes != null) {
- addInfoMap.put("accessTypes", "[" + accessTypes + "]");
- }
- return JsonUtils.mapToJson(addInfoMap);
- }
-
- public void logHadoopEvent(String path, FsAction action, boolean
accessGranted) {
- if(LOG.isDebugEnabled()) {
- LOG.debug("==> RangerHdfsAuditHandler.logHadoopEvent("
+ path + ", " + action + ", " + accessGranted + ")");
- }
-
- if(auditEvent != null) {
- auditEvent.setResultReason(path);
- auditEvent.setAccessResult((short) (accessGranted ? 1 :
0));
- auditEvent.setAclEnforcer(hadoopModuleName);
- auditEvent.setPolicyId(-1);
-
- String accessType = (action == null) ? null :
action.toString();
-
- if (StringUtils.isBlank(auditEvent.getAccessType())) {
// retain existing value
- auditEvent.setAccessType(accessType);
- }
-
- if (accessType != null) {
- auditEvent.setAction(getAccessType(accessType));
- }
-
- setRequestData();
- }
-
- if(LOG.isDebugEnabled()) {
- LOG.debug("<== RangerHdfsAuditHandler.logHadoopEvent("
+ path + ", " + action + ", " + accessGranted + "): " + auditEvent);
- }
- }
-
- public void flushAudit() {
- if(LOG.isDebugEnabled()) {
- LOG.debug("==> RangerHdfsAuditHandler.flushAudit(" +
isAuditEnabled + ", " + auditEvent + ")");
- }
-
- if(isAuditEnabled && auditEvent != null &&
!StringUtils.isEmpty(auditEvent.getAccessType())) {
- String username = auditEvent.getUser();
- String accessType = auditEvent.getAccessType();
-
- boolean skipLog = (username != null && excludeUsers !=
null && excludeUsers.contains(username))
- ||
(auditOnlyIfDenied && auditEvent.getAccessResult() != 0)
- ||
(ACCESS_TYPE_MONITOR_HEALTH.equals(accessType));
-
- if (! skipLog) {
- super.logAuthzAudit(auditEvent);
- }
- }
-
- if(LOG.isDebugEnabled()) {
- LOG.debug("<== RangerHdfsAuditHandler.flushAudit(" +
isAuditEnabled + ", " + auditEvent + ")");
- }
- }
-
- private String getAccessType(String accessType) {
- String ret = accessType;
-
- switch (accessType) {
- case READ_EXECUTE_PERM:
- ret = READ_ACCCESS_TYPE;
- break;
- case WRITE_EXECUTE_PERM:
- case READ_WRITE_PERM:
- case ALL_PERM:
- ret = WRITE_ACCCESS_TYPE;
- break;
- default:
- break;
- }
- return ret.toLowerCase();
- }
-
- private String getAccessTypesAsString(RangerAccessRequest request) {
- String ret = null;
- Set<String> accessTypes =
RangerAccessRequestUtil.getAllRequestedAccessTypes(request);
-
- if (CollectionUtils.isNotEmpty(accessTypes)) {
- try {
- ret = getFormattedAccessType(accessTypes);
- } catch (Throwable t) {
- LOG.error("getAccessTypesAsString(): failed to
get accessTypes from context", t);
- }
- } else {
- ret = request.getAccessType();
- }
- return ret;
- }
-
- private String getFormattedAccessType(Set<String> accessTypes) {
- String ret = null;
- if (CollectionUtils.isNotEmpty(accessTypes)) {
- ret = String.join(", ", accessTypes);
- }
- return ret;
- }
-
- private void setRequestData(){
- if (StringUtils.isNotBlank(auditEvent.getAccessType()) &&
StringUtils.isNotBlank(callerContext)) {
- auditEvent.setRequestData(auditEvent.getAccessType() +
"/" + callerContext);
- }
- }
-}
diff --git a/kms/pom.xml b/kms/pom.xml
index 86632aaa1..6465e6918 100644
--- a/kms/pom.xml
+++ b/kms/pom.xml
@@ -498,11 +498,6 @@
<version>${slf4j.version}</version>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
diff --git a/knox-agent/pom.xml b/knox-agent/pom.xml
index 1516e6ac4..a3cf4f725 100644
--- a/knox-agent/pom.xml
+++ b/knox-agent/pom.xml
@@ -67,26 +67,13 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
+ <artifactId>hadoop-client-api</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-runtime</artifactId>
<version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
diff --git a/plugin-kafka/pom.xml b/plugin-kafka/pom.xml
index b1cd8a8c6..1de123dc5 100644
--- a/plugin-kafka/pom.xml
+++ b/plugin-kafka/pom.xml
@@ -53,26 +53,13 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
+ <artifactId>hadoop-client-api</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-runtime</artifactId>
<version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@ -184,12 +171,6 @@
<version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<testResources>
diff --git a/plugin-nifi-registry/pom.xml b/plugin-nifi-registry/pom.xml
index c79058bff..7555d8a46 100644
--- a/plugin-nifi-registry/pom.xml
+++ b/plugin-nifi-registry/pom.xml
@@ -36,6 +36,16 @@
<artifactId>jackson-core</artifactId>
<version>${fasterxml.jackson.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-api</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-runtime</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.ranger</groupId>
<artifactId>credentialbuilder</artifactId>
diff --git
a/plugin-nifi-registry/src/test/java/org/apache/ranger/services/nifi/registry/client/TestNiFiRegistryClient.java
b/plugin-nifi-registry/src/test/java/org/apache/ranger/services/nifi/registry/client/TestNiFiRegistryClient.java
index e61bb2a81..ae21a03fd 100644
---
a/plugin-nifi-registry/src/test/java/org/apache/ranger/services/nifi/registry/client/TestNiFiRegistryClient.java
+++
b/plugin-nifi-registry/src/test/java/org/apache/ranger/services/nifi/registry/client/TestNiFiRegistryClient.java
@@ -18,9 +18,9 @@
*/
package org.apache.ranger.services.nifi.registry.client;
-import com.google.common.io.Resources;
import com.sun.jersey.api.client.ClientResponse;
import com.sun.jersey.api.client.WebResource;
+import org.apache.hadoop.shaded.com.google.common.io.Resources;
import org.apache.ranger.plugin.service.ResourceLookupContext;
import org.junit.Assert;
import org.junit.Before;
diff --git a/plugin-ozone/pom.xml b/plugin-ozone/pom.xml
index cc5398e59..ed0d79fc8 100644
--- a/plugin-ozone/pom.xml
+++ b/plugin-ozone/pom.xml
@@ -43,26 +43,13 @@ limitations under the License.
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
+ <artifactId>hadoop-client-api</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-runtime</artifactId>
<version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
diff --git a/plugin-presto/pom.xml b/plugin-presto/pom.xml
index fe14d4114..c42780e30 100644
--- a/plugin-presto/pom.xml
+++ b/plugin-presto/pom.xml
@@ -113,12 +113,6 @@
<version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<testResources>
diff --git a/plugin-schema-registry/pom.xml b/plugin-schema-registry/pom.xml
index 2d3799828..1426898c8 100644
--- a/plugin-schema-registry/pom.xml
+++ b/plugin-schema-registry/pom.xml
@@ -93,26 +93,13 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
+ <artifactId>hadoop-client-api</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-runtime</artifactId>
<version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-json</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
@@ -134,12 +121,6 @@
<artifactId>jersey-client</artifactId>
<version>${jersey.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git a/plugin-sqoop/pom.xml b/plugin-sqoop/pom.xml
index 059e479d8..df383b073 100644
--- a/plugin-sqoop/pom.xml
+++ b/plugin-sqoop/pom.xml
@@ -120,11 +120,5 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/plugin-trino/pom.xml b/plugin-trino/pom.xml
index 355396fdb..24fb74afb 100644
--- a/plugin-trino/pom.xml
+++ b/plugin-trino/pom.xml
@@ -173,12 +173,6 @@
<version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<testResources>
diff --git a/plugin-yarn/pom.xml b/plugin-yarn/pom.xml
index a701d24e7..070190cfe 100644
--- a/plugin-yarn/pom.xml
+++ b/plugin-yarn/pom.xml
@@ -81,11 +81,5 @@
<artifactId>ranger-plugins-common</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/pom.xml b/pom.xml
index d1aa35bae..60d38d72f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -254,29 +254,13 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
+ <artifactId>hadoop-client-api</artifactId>
<version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.avro</groupId>
- <artifactId>avro</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
+ <artifactId>hadoop-client-runtime</artifactId>
<version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/ranger-authn/pom.xml b/ranger-authn/pom.xml
index 33d9244df..30bd18dda 100644
--- a/ranger-authn/pom.xml
+++ b/ranger-authn/pom.xml
@@ -41,6 +41,12 @@
<version>${nimbus-jose-jwt.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>${javax.servlet.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
@@ -61,7 +67,20 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
+ <artifactId>hadoop-client-api</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-runtime</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
<!-- Test -->
diff --git a/ranger-common-ha/pom.xml b/ranger-common-ha/pom.xml
index 3c45b49e8..09edff2a9 100644
--- a/ranger-common-ha/pom.xml
+++ b/ranger-common-ha/pom.xml
@@ -58,30 +58,13 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
+ <artifactId>hadoop-client-api</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-runtime</artifactId>
<version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.minidev</groupId>
- <artifactId>json-smart</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
@@ -113,11 +96,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
diff --git a/ranger-examples/plugin-sampleapp/pom.xml
b/ranger-examples/plugin-sampleapp/pom.xml
index c41e7d79f..5743c97a4 100644
--- a/ranger-examples/plugin-sampleapp/pom.xml
+++ b/ranger-examples/plugin-sampleapp/pom.xml
@@ -80,42 +80,13 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
+ <artifactId>hadoop-client-api</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-runtime</artifactId>
<version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-epoll</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-configuration2</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-text</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.ranger</groupId>
@@ -132,11 +103,5 @@
<artifactId>ranger-plugins-common</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/ranger-examples/sample-client/pom.xml
b/ranger-examples/sample-client/pom.xml
index aa94d710e..8f81fa4db 100644
--- a/ranger-examples/sample-client/pom.xml
+++ b/ranger-examples/sample-client/pom.xml
@@ -49,10 +49,5 @@
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
</dependencies>
</project>
diff --git a/ranger-examples/sampleapp/pom.xml
b/ranger-examples/sampleapp/pom.xml
index 444f6059b..420d9bad7 100644
--- a/ranger-examples/sampleapp/pom.xml
+++ b/ranger-examples/sampleapp/pom.xml
@@ -32,10 +32,5 @@
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
</dependencies>
</project>
diff --git a/ranger-hbase-plugin-shim/pom.xml b/ranger-hbase-plugin-shim/pom.xml
index e8a9121ec..0329a2208 100644
--- a/ranger-hbase-plugin-shim/pom.xml
+++ b/ranger-hbase-plugin-shim/pom.xml
@@ -93,11 +93,5 @@
<artifactId>javax.el</artifactId>
<version>${javax.el.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/ranger-hdfs-plugin-shim/pom.xml b/ranger-hdfs-plugin-shim/pom.xml
index 930d3a176..ade1ab5df 100644
--- a/ranger-hdfs-plugin-shim/pom.xml
+++ b/ranger-hdfs-plugin-shim/pom.xml
@@ -64,11 +64,5 @@
<artifactId>ranger-plugins-common</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/ranger-hive-plugin-shim/pom.xml b/ranger-hive-plugin-shim/pom.xml
index fb71b2ab0..cb99e8f75 100644
--- a/ranger-hive-plugin-shim/pom.xml
+++ b/ranger-hive-plugin-shim/pom.xml
@@ -89,11 +89,5 @@
<artifactId>javax.el</artifactId>
<version>${javax.el.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/ranger-metrics/pom.xml b/ranger-metrics/pom.xml
index 8e0d5a18f..517193696 100644
--- a/ranger-metrics/pom.xml
+++ b/ranger-metrics/pom.xml
@@ -37,7 +37,14 @@
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
+ <artifactId>hadoop-client-api</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-runtime</artifactId>
+ <version>${hadoop.version}</version>
</dependency>
<dependency>
diff --git
a/ranger-metrics/src/main/java/org/apache/ranger/metrics/sink/RangerMetricsJsonSink.java
b/ranger-metrics/src/main/java/org/apache/ranger/metrics/sink/RangerMetricsJsonSink.java
index 4e23120dd..28383e6e0 100644
---
a/ranger-metrics/src/main/java/org/apache/ranger/metrics/sink/RangerMetricsJsonSink.java
+++
b/ranger-metrics/src/main/java/org/apache/ranger/metrics/sink/RangerMetricsJsonSink.java
@@ -24,11 +24,11 @@
import java.util.Objects;
import java.util.Set;
-import org.apache.commons.configuration2.SubsetConfiguration;
import org.apache.hadoop.metrics2.AbstractMetric;
import org.apache.hadoop.metrics2.MetricType;
import org.apache.hadoop.metrics2.MetricsRecord;
import org.apache.hadoop.metrics2.MetricsSink;
+import
org.apache.hadoop.shaded.org.apache.commons.configuration2.SubsetConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,8 +43,8 @@ public RangerMetricsJsonSink(Set<String> contexts) {
}
@Override
- public void init(SubsetConfiguration conf) {
- // Implementation not needed
+ public void init(SubsetConfiguration subsetConfiguration) {
+ // Implementation not needed
}
@Override
diff --git
a/ranger-metrics/src/main/java/org/apache/ranger/metrics/sink/RangerMetricsPrometheusSink.java
b/ranger-metrics/src/main/java/org/apache/ranger/metrics/sink/RangerMetricsPrometheusSink.java
index 141fa372a..58521dec7 100644
---
a/ranger-metrics/src/main/java/org/apache/ranger/metrics/sink/RangerMetricsPrometheusSink.java
+++
b/ranger-metrics/src/main/java/org/apache/ranger/metrics/sink/RangerMetricsPrometheusSink.java
@@ -19,6 +19,14 @@
package org.apache.ranger.metrics.sink;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.hadoop.metrics2.AbstractMetric;
+import org.apache.hadoop.metrics2.MetricType;
+import org.apache.hadoop.metrics2.MetricsRecord;
+import org.apache.hadoop.metrics2.MetricsSink;
+import org.apache.hadoop.metrics2.MetricsTag;
+import
org.apache.hadoop.shaded.org.apache.commons.configuration2.SubsetConfiguration;
+
import java.io.IOException;
import java.io.Writer;
import java.util.Collections;
@@ -28,14 +36,6 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.regex.Pattern;
-import org.apache.commons.configuration2.SubsetConfiguration;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.hadoop.metrics2.AbstractMetric;
-import org.apache.hadoop.metrics2.MetricType;
-import org.apache.hadoop.metrics2.MetricsRecord;
-import org.apache.hadoop.metrics2.MetricsSink;
-import org.apache.hadoop.metrics2.MetricsTag;
-
public class RangerMetricsPrometheusSink implements MetricsSink {
private static final Pattern SPLIT_PATTERN =
Pattern.compile("(?<!(^|[A-Z_]))(?=[A-Z])|(?<!^)(?=[A-Z][a-z])");
private static final Pattern DELIMITERS =
Pattern.compile("[^a-zA-Z0-9]+");
diff --git
a/ranger-metrics/src/main/java/org/apache/ranger/metrics/source/RangerMetricsContainerSource.java
b/ranger-metrics/src/main/java/org/apache/ranger/metrics/source/RangerMetricsContainerSource.java
index d380d9e66..cc938cde9 100644
---
a/ranger-metrics/src/main/java/org/apache/ranger/metrics/source/RangerMetricsContainerSource.java
+++
b/ranger-metrics/src/main/java/org/apache/ranger/metrics/source/RangerMetricsContainerSource.java
@@ -19,11 +19,11 @@
package org.apache.ranger.metrics.source;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.classification.VisibleForTesting;
+import org.apache.hadoop.metrics2.MetricsCollector;
import org.apache.ranger.metrics.RangerMetricsInfo;
import org.apache.ranger.server.tomcat.EmbeddedServer;
import org.apache.ranger.server.tomcat.EmbeddedServerMetricsCollector;
-import org.apache.hadoop.metrics2.MetricsCollector;
import java.util.Objects;
diff --git a/ranger-ozone-plugin-shim/pom.xml b/ranger-ozone-plugin-shim/pom.xml
index a66f07aae..1845d17f3 100644
--- a/ranger-ozone-plugin-shim/pom.xml
+++ b/ranger-ozone-plugin-shim/pom.xml
@@ -61,11 +61,5 @@
<artifactId>ranger-plugins-common</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/ranger-presto-plugin-shim/pom.xml
b/ranger-presto-plugin-shim/pom.xml
index b79d7d05c..6766b2187 100644
--- a/ranger-presto-plugin-shim/pom.xml
+++ b/ranger-presto-plugin-shim/pom.xml
@@ -111,26 +111,14 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
+ <artifactId>hadoop-client-api</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-runtime</artifactId>
<version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -172,13 +160,5 @@
</exclusion>
</exclusions>
</dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/ranger-sqoop-plugin-shim/pom.xml b/ranger-sqoop-plugin-shim/pom.xml
index 678679925..5e003e6a3 100644
--- a/ranger-sqoop-plugin-shim/pom.xml
+++ b/ranger-sqoop-plugin-shim/pom.xml
@@ -70,11 +70,5 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/ranger-storm-plugin-shim/pom.xml b/ranger-storm-plugin-shim/pom.xml
index fc1fd345f..22732cd1c 100644
--- a/ranger-storm-plugin-shim/pom.xml
+++ b/ranger-storm-plugin-shim/pom.xml
@@ -61,11 +61,5 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/ranger-tools/pom.xml b/ranger-tools/pom.xml
index 9deccd61e..795840060 100644
--- a/ranger-tools/pom.xml
+++ b/ranger-tools/pom.xml
@@ -64,11 +64,6 @@
<artifactId>ranger-plugins-common</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
<!-- Test -->
<dependency>
diff --git a/ranger-yarn-plugin-shim/pom.xml b/ranger-yarn-plugin-shim/pom.xml
index a338065a6..cb61a366c 100644
--- a/ranger-yarn-plugin-shim/pom.xml
+++ b/ranger-yarn-plugin-shim/pom.xml
@@ -61,11 +61,5 @@
<artifactId>ranger-plugins-common</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/security-admin/pom.xml b/security-admin/pom.xml
index 347e8f5eb..6de6517f6 100644
--- a/security-admin/pom.xml
+++ b/security-admin/pom.xml
@@ -393,37 +393,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
- <version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-core</artifactId>
@@ -708,11 +677,6 @@
<artifactId>cglib</artifactId>
<version>${cglib.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
diff --git a/storm-agent/pom.xml b/storm-agent/pom.xml
index 420cb1c03..9b202bb63 100644
--- a/storm-agent/pom.xml
+++ b/storm-agent/pom.xml
@@ -53,61 +53,13 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
+ <artifactId>hadoop-client-api</artifactId>
<version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-epoll</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-configuration2</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-text</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
+ <artifactId>hadoop-client-runtime</artifactId>
<version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@ -174,12 +126,6 @@
<version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<testResources>
diff --git a/tagsync/pom.xml b/tagsync/pom.xml
index 295cdd409..b9c6126ee 100644
--- a/tagsync/pom.xml
+++ b/tagsync/pom.xml
@@ -296,11 +296,6 @@
<artifactId>scala-library</artifactId>
<version>${scala.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
<!-- Test -->
<dependency>
diff --git a/ugsync/pom.xml b/ugsync/pom.xml
index b8ccc1753..4734ab473 100644
--- a/ugsync/pom.xml
+++ b/ugsync/pom.xml
@@ -181,11 +181,6 @@
<artifactId>jettison</artifactId>
<version>${jettison.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-annotations</artifactId>
diff --git a/unixauthclient/pom.xml b/unixauthclient/pom.xml
index 2b20dab20..d003601f9 100644
--- a/unixauthclient/pom.xml
+++ b/unixauthclient/pom.xml
@@ -103,9 +103,15 @@
<version>${libpam4j.version}</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-inline</artifactId>
+ <version>${mockito.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <version>${mockito.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/unixauthservice/pom.xml b/unixauthservice/pom.xml
index 37ad79a4a..965d8509d 100644
--- a/unixauthservice/pom.xml
+++ b/unixauthservice/pom.xml
@@ -102,9 +102,15 @@
<version>${slf4j.version}</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-inline</artifactId>
+ <version>${mockito.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <version>${mockito.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
