This is an automated email from the ASF dual-hosted git repository.
madhan pushed a commit to branch ranger-2.5
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/ranger-2.5 by this push:
new 32ff5280b RANGER-4845: removed guava dependency
32ff5280b is described below
commit 32ff5280ba9376e025e304821470cd6a8b611b33
Author: Madhan Neethiraj <mad...@apache.org>
AuthorDate: Mon Jul 8 17:31:39 2024 -0700
RANGER-4845: removed guava dependency
(cherry picked from commit 8abe9e2321fba1099764c70109672fd57a2a01b7)
---
agents-audit/pom.xml | 5 ----
.../destination/ElasticSearchAuditDestination.java | 2 +-
.../model/validation/RangerServiceDefHelper.java | 4 +--
.../validation/RangerServiceDefValidator.java | 4 +--
.../model/validation/RangerServiceValidator.java | 2 +-
.../apache/ranger/plugin/util/PasswordUtils.java | 8 +++---
.../ranger/plugin/util/PerfDataRecorder.java | 3 +--
.../RangerTimeOfDayMatcherTest.java | 2 +-
.../plugin/errors/TestValidationErrorCode.java | 2 +-
.../plugin/model/validation/TestDirectedGraph.java | 5 ++--
.../validation/TestRangerPolicyValidator.java | 4 +--
.../validation/TestRangerServiceDefHelper.java | 2 +-
.../RangerDefaultResourceMatcherTest.java | 2 +-
.../RangerPathResourceMatcherTest.java | 2 +-
.../RangerURLResourceMatcherTest.java | 2 +-
.../ranger/plugin/util/PasswordUtilsTest.java | 2 +-
credentialbuilder/pom.xml | 5 ----
distro/src/main/assembly/admin-web.xml | 3 ---
distro/src/main/assembly/hbase-agent.xml | 2 --
distro/src/main/assembly/hdfs-agent.xml | 1 -
distro/src/main/assembly/hive-agent.xml | 1 -
distro/src/main/assembly/kms.xml | 4 ---
distro/src/main/assembly/knox-agent.xml | 1 -
distro/src/main/assembly/plugin-atlas.xml | 2 --
distro/src/main/assembly/plugin-elasticsearch.xml | 2 --
distro/src/main/assembly/plugin-kafka.xml | 2 --
distro/src/main/assembly/plugin-kms.xml | 2 --
distro/src/main/assembly/plugin-kylin.xml | 1 -
distro/src/main/assembly/plugin-ozone.xml | 1 -
distro/src/main/assembly/plugin-presto.xml | 4 ---
distro/src/main/assembly/plugin-solr.xml | 2 --
distro/src/main/assembly/plugin-sqoop.xml | 1 -
distro/src/main/assembly/plugin-trino.xml | 4 ---
distro/src/main/assembly/plugin-yarn.xml | 1 -
distro/src/main/assembly/ranger-tools.xml | 1 -
distro/src/main/assembly/sample-client.xml | 1 -
distro/src/main/assembly/storm-agent.xml | 2 --
distro/src/main/assembly/tagsync.xml | 1 -
distro/src/main/assembly/usersync.xml | 1 -
hbase-agent/pom.xml | 1 -
.../authorization/hbase/AuthorizationSession.java | 6 ++---
.../hbase/RangerAuthorizationCoprocessor.java | 8 +++---
.../hbase/RangerAuthorizationFilter.java | 2 +-
.../hbase/RangerAuthorizationFilterTest.java | 2 +-
.../authorization/hadoop/RangerHdfsAuthorizer.java | 2 +-
.../hive/authorizer/RangerHiveAuthorizer.java | 2 +-
kms/pom.xml | 6 -----
.../apache/hadoop/crypto/key/RangerMasterKey.java | 6 ++---
.../apache/hadoop/crypto/key/kms/server/KMS.java | 5 ++--
.../hadoop/crypto/key/kms/server/KMSAudit.java | 19 +++++++-------
.../hadoop/crypto/key/kms/server/KMSWebApp.java | 2 +-
.../kms/server/KeyAuthorizationKeyProvider.java | 8 +++---
.../key/kms/server/SimpleKMSAuditLogger.java | 12 ++++-----
.../services/knox/RangerAdminClientImpl.java | 2 +-
plugin-atlas/pom.xml | 5 ----
.../authorizer/RangerElasticsearchAuthorizer.java | 2 +-
.../kms/authorizer/RangerKmsAuthorizer.java | 2 +-
.../ranger/services/kms/client/KMSClient.java | 3 +--
.../kylin/authorizer/RangerKylinAuthorizer.java | 2 +-
.../ozone/authorizer/RangerOzoneAuthorizer.java | 2 +-
.../authorizer/RangerSystemAccessControlTest.java | 2 +-
.../solr/authorizer/FieldToAttributeMapping.java | 4 +--
.../solr/authorizer/RangerSolrAuthorizer.java | 4 +--
.../solr/authorizer/SubsetQueryPlugin.java | 2 +-
.../sqoop/authorizer/RangerSqoopAuthorizer.java | 2 +-
plugin-trino/pom.xml | 5 ----
.../yarn/authorizer/RangerYarnAuthorizer.java | 2 +-
pom.xml | 3 ---
.../java/org/apache/ranger/ha/CuratorFactory.java | 4 +--
.../java/org/apache/ranger/ha/ServiceState.java | 2 +-
.../ranger/ha/ZookeeperSecurityProperties.java | 4 +--
.../distro/src/main/assembly/plugin-sampleapp.xml | 1 -
.../distro/src/main/assembly/sample-client.xml | 1 -
ranger-examples/plugin-sampleapp/pom.xml | 5 ----
ranger-examples/sample-client/pom.xml | 5 ----
ranger-presto-plugin-shim/pom.xml | 6 -----
.../RangerSystemAccessControlFactory.java | 2 +-
.../perftest/v2/RangerPolicyFactory.java | 22 ++++++++--------
.../RangerPolicyEnginePerformanceTest.java | 29 +++++++++++-----------
security-admin/pom.xml | 5 ----
.../main/java/org/apache/ranger/biz/KmsKeyMgr.java | 3 +--
.../java/org/apache/ranger/biz/ServiceDBStore.java | 3 +--
.../org/apache/ranger/common/TimedExecutor.java | 2 +-
.../org/apache/ranger/rest/SecurityZoneREST.java | 2 +-
.../security/web/filter/RangerKrbFilter.java | 3 ++-
.../ranger/service/RangerServiceService.java | 2 +-
.../authorization/storm/StormRangerPlugin.java | 2 +-
.../storm/authorizer/RangerStormAuthorizer.java | 2 +-
tagsync/pom.xml | 5 ----
ugsync/pom.xml | 5 ----
.../ldapusersync/process/LdapUserGroupBuilder.java | 4 +--
.../unixusersync/process/UnixUserGroupBuilder.java | 6 ++---
unixauthclient/pom.xml | 10 --------
unixauthservice/pom.xml | 10 --------
94 files changed, 117 insertions(+), 247 deletions(-)
diff --git a/agents-audit/pom.xml b/agents-audit/pom.xml
index 249331848..1dc717450 100644
--- a/agents-audit/pom.xml
+++ b/agents-audit/pom.xml
@@ -165,11 +165,6 @@
<artifactId>httpmime</artifactId>
<version>${httpcomponents.httpmime.version}</version>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${google.guava.version}</version>
- </dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
diff --git
a/agents-audit/src/main/java/org/apache/ranger/audit/destination/ElasticSearchAuditDestination.java
b/agents-audit/src/main/java/org/apache/ranger/audit/destination/ElasticSearchAuditDestination.java
index e38f37f63..8d02d9d6f 100644
---
a/agents-audit/src/main/java/org/apache/ranger/audit/destination/ElasticSearchAuditDestination.java
+++
b/agents-audit/src/main/java/org/apache/ranger/audit/destination/ElasticSearchAuditDestination.java
@@ -34,8 +34,8 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.apache.commons.lang.StringUtils;
+import
org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.apache.http.HttpHost;
import org.apache.http.auth.AuthSchemeProvider;
import org.apache.http.client.CredentialsProvider;
diff --git
a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefHelper.java
b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefHelper.java
index d99d342bd..d14c1ec78 100644
---
a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefHelper.java
+++
b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefHelper.java
@@ -31,9 +31,10 @@ import java.util.Objects;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import com.google.common.collect.Sets;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
import org.apache.ranger.plugin.model.RangerPolicy;
import org.apache.ranger.plugin.model.RangerServiceDef;
import org.apache.ranger.plugin.model.RangerServiceDef.RangerAccessTypeDef;
@@ -41,7 +42,6 @@ import
org.apache.ranger.plugin.model.RangerServiceDef.RangerResourceDef;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.Lists;
import org.apache.ranger.plugin.resourcematcher.RangerAbstractResourceMatcher;
import org.apache.ranger.plugin.resourcematcher.RangerPathResourceMatcher;
diff --git
a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefValidator.java
b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefValidator.java
index 9cbea7f61..0e65db0d6 100644
---
a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefValidator.java
+++
b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefValidator.java
@@ -30,6 +30,8 @@ import java.util.HashMap;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableSet;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
import org.apache.ranger.plugin.errors.ValidationErrorCode;
import org.apache.ranger.plugin.model.RangerPolicy;
import org.apache.ranger.plugin.model.RangerServiceDef;
@@ -44,8 +46,6 @@ import org.apache.ranger.plugin.store.ServiceStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
import org.apache.ranger.plugin.util.ServiceDefUtil;
public class RangerServiceDefValidator extends RangerValidator {
diff --git
a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceValidator.java
b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceValidator.java
index 6ae6b6610..bab30e3d9 100644
---
a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceValidator.java
+++
b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceValidator.java
@@ -24,6 +24,7 @@ import java.util.List;
import java.util.Set;
import java.util.regex.Pattern;
import org.apache.commons.lang.StringUtils;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
import org.apache.ranger.plugin.errors.ValidationErrorCode;
import org.apache.ranger.plugin.model.RangerService;
import org.apache.ranger.plugin.model.RangerServiceDef;
@@ -32,7 +33,6 @@ import org.apache.ranger.plugin.store.ServiceStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.Sets;
public class RangerServiceValidator extends RangerValidator {
private static final Logger LOG =
LoggerFactory.getLogger(RangerServiceValidator.class);
diff --git
a/agents-common/src/main/java/org/apache/ranger/plugin/util/PasswordUtils.java
b/agents-common/src/main/java/org/apache/ranger/plugin/util/PasswordUtils.java
index f1f2b0920..546412b53 100644
---
a/agents-common/src/main/java/org/apache/ranger/plugin/util/PasswordUtils.java
+++
b/agents-common/src/main/java/org/apache/ranger/plugin/util/PasswordUtils.java
@@ -28,12 +28,12 @@ import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.PBEKeySpec;
import javax.crypto.spec.PBEParameterSpec;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.hadoop.thirdparty.com.google.common.base.Splitter;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Splitter;
-import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
import com.sun.jersey.core.util.Base64;
public class PasswordUtils {
@@ -169,7 +169,7 @@ public class PasswordUtils {
}
public static boolean needsIv(String cryptoAlgo) {
- if (Strings.isNullOrEmpty(cryptoAlgo))
+ if (StringUtils.isEmpty(cryptoAlgo))
return false;
return
PBE_SHA512_AES_128.toLowerCase().equals(cryptoAlgo.toLowerCase())
diff --git
a/agents-common/src/main/java/org/apache/ranger/plugin/util/PerfDataRecorder.java
b/agents-common/src/main/java/org/apache/ranger/plugin/util/PerfDataRecorder.java
index a1df53fac..2b1e17a41 100644
---
a/agents-common/src/main/java/org/apache/ranger/plugin/util/PerfDataRecorder.java
+++
b/agents-common/src/main/java/org/apache/ranger/plugin/util/PerfDataRecorder.java
@@ -20,11 +20,10 @@
package org.apache.ranger.plugin.util;
import org.apache.commons.collections.CollectionUtils;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.ImmutableMap;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
diff --git
a/agents-common/src/test/java/org/apache/ranger/plugin/conditionevaluator/RangerTimeOfDayMatcherTest.java
b/agents-common/src/test/java/org/apache/ranger/plugin/conditionevaluator/RangerTimeOfDayMatcherTest.java
index ec64e33e4..f2efa5253 100644
---
a/agents-common/src/test/java/org/apache/ranger/plugin/conditionevaluator/RangerTimeOfDayMatcherTest.java
+++
b/agents-common/src/test/java/org/apache/ranger/plugin/conditionevaluator/RangerTimeOfDayMatcherTest.java
@@ -30,12 +30,12 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import org.apache.ranger.plugin.model.RangerPolicy.RangerPolicyItemCondition;
import org.apache.ranger.plugin.policyengine.RangerAccessRequest;
import org.junit.Assert;
import org.junit.Test;
-import com.google.common.collect.Lists;
public class RangerTimeOfDayMatcherTest {
diff --git
a/agents-common/src/test/java/org/apache/ranger/plugin/errors/TestValidationErrorCode.java
b/agents-common/src/test/java/org/apache/ranger/plugin/errors/TestValidationErrorCode.java
index 2c69bcc6f..281080861 100644
---
a/agents-common/src/test/java/org/apache/ranger/plugin/errors/TestValidationErrorCode.java
+++
b/agents-common/src/test/java/org/apache/ranger/plugin/errors/TestValidationErrorCode.java
@@ -19,7 +19,7 @@
package org.apache.ranger.plugin.errors;
-import com.google.common.collect.ImmutableSet;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableSet;
import org.junit.Assert;
import org.junit.Test;
diff --git
a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestDirectedGraph.java
b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestDirectedGraph.java
index 3ec20d99a..ad989195e 100644
---
a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestDirectedGraph.java
+++
b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestDirectedGraph.java
@@ -23,12 +23,11 @@ import static org.junit.Assert.assertEquals;
import java.util.HashSet;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
import
org.apache.ranger.plugin.model.validation.RangerServiceDefHelper.DirectedGraph;
import org.junit.Test;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-
public class TestDirectedGraph {
@Test
diff --git
a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerPolicyValidator.java
b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerPolicyValidator.java
index 7e16082bc..2372048cf 100644
---
a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerPolicyValidator.java
+++
b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerPolicyValidator.java
@@ -31,6 +31,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableMap;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
import org.apache.ranger.plugin.model.RangerPolicy;
import org.apache.ranger.plugin.model.RangerPolicy.RangerPolicyItem;
import org.apache.ranger.plugin.model.RangerPolicy.RangerPolicyItemAccess;
@@ -48,8 +50,6 @@ import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentMatcher;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Sets;
public class TestRangerPolicyValidator {
diff --git
a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceDefHelper.java
b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceDefHelper.java
index b0c108530..a667c9b0b 100644
---
a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceDefHelper.java
+++
b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceDefHelper.java
@@ -31,6 +31,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import org.apache.ranger.plugin.model.RangerPolicy;
import org.apache.ranger.plugin.model.RangerServiceDef;
import org.apache.ranger.plugin.model.RangerServiceDef.RangerResourceDef;
@@ -38,7 +39,6 @@ import
org.apache.ranger.plugin.model.validation.RangerServiceDefHelper.Delegate
import org.junit.Before;
import org.junit.Test;
-import com.google.common.collect.Lists;
public class TestRangerServiceDefHelper {
diff --git
a/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/RangerDefaultResourceMatcherTest.java
b/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/RangerDefaultResourceMatcherTest.java
index 8a297bde0..f588f3e2a 100644
---
a/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/RangerDefaultResourceMatcherTest.java
+++
b/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/RangerDefaultResourceMatcherTest.java
@@ -19,7 +19,7 @@
package org.apache.ranger.plugin.resourcematcher;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import org.apache.ranger.plugin.model.RangerPolicy;
import org.apache.ranger.plugin.model.RangerServiceDef.RangerResourceDef;
import
org.apache.ranger.plugin.policyengine.RangerAccessRequest.ResourceElementMatchingScope;
diff --git
a/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/RangerPathResourceMatcherTest.java
b/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/RangerPathResourceMatcherTest.java
index 3727b30d4..908372574 100644
---
a/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/RangerPathResourceMatcherTest.java
+++
b/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/RangerPathResourceMatcherTest.java
@@ -19,7 +19,7 @@
package org.apache.ranger.plugin.resourcematcher;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import org.apache.ranger.plugin.model.RangerPolicy;
import org.apache.ranger.plugin.model.RangerServiceDef.RangerResourceDef;
import
org.apache.ranger.plugin.policyengine.RangerAccessRequest.ResourceElementMatchingScope;
diff --git
a/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/RangerURLResourceMatcherTest.java
b/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/RangerURLResourceMatcherTest.java
index cc7307615..dd10a6b69 100644
---
a/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/RangerURLResourceMatcherTest.java
+++
b/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/RangerURLResourceMatcherTest.java
@@ -19,7 +19,7 @@
package org.apache.ranger.plugin.resourcematcher;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import org.apache.ranger.plugin.model.RangerPolicy;
import org.apache.ranger.plugin.model.RangerServiceDef.RangerResourceDef;
import
org.apache.ranger.plugin.policyengine.RangerAccessRequest.ResourceElementMatchingScope;
diff --git
a/agents-common/src/test/java/org/apache/ranger/plugin/util/PasswordUtilsTest.java
b/agents-common/src/test/java/org/apache/ranger/plugin/util/PasswordUtilsTest.java
index d0b180645..c624ddbda 100644
---
a/agents-common/src/test/java/org/apache/ranger/plugin/util/PasswordUtilsTest.java
+++
b/agents-common/src/test/java/org/apache/ranger/plugin/util/PasswordUtilsTest.java
@@ -24,9 +24,9 @@ import static org.junit.Assert.assertNull;
import java.io.IOException;
import java.security.NoSuchAlgorithmException;
+import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
import org.junit.Test;
-import com.google.common.base.Joiner;
public class PasswordUtilsTest {
diff --git a/credentialbuilder/pom.xml b/credentialbuilder/pom.xml
index d9bcd396a..8ada454c0 100644
--- a/credentialbuilder/pom.xml
+++ b/credentialbuilder/pom.xml
@@ -48,11 +48,6 @@
<artifactId>commons-lang3</artifactId>
<version>${commons.lang3.version}</version>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${google.guava.version}</version>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
diff --git a/distro/src/main/assembly/admin-web.xml
b/distro/src/main/assembly/admin-web.xml
index 8cc6d15cf..6d268536f 100644
--- a/distro/src/main/assembly/admin-web.xml
+++ b/distro/src/main/assembly/admin-web.xml
@@ -191,7 +191,6 @@
<include>org.apache.commons:commons-compress:jar:1.4.1</include>
<include>org.bouncycastle:bcpkix-jdk15on:jar:${org.bouncycastle.bcpkix-jdk15on}</include>
<include>commons-net:commons-net:jar:${commons.net.version}</include>
- <include>com.google.guava:guava</include>
<include>io.jaegertracing:jaeger-core:jar:1.6.0</include>
<include>io.opentracing:opentracing-api:jar:0.33.0</include>
<include>io.opentracing:opentracing-noop:jar:0.33.0</include>
@@ -240,7 +239,6 @@
<include>org.apache.hadoop:hadoop-common</include>
<include>commons-logging:commons-logging</include>
<include>com.sun.jersey.contribs:jersey-multipart</include>
- <include>com.google.guava:guava</include>
<include>commons-collections:commons-collections</include>
<include>commons-lang:commons-lang</include>
<include>commons-io:commons-io</include>
@@ -303,7 +301,6 @@
<include>commons-io:commons-io:jar:${commons.io.version}</include>
<include>commons-lang:commons-lang</include>
<include>commons-logging:commons-logging</include>
- <include>com.google.guava:guava</include>
<include>org.slf4j:slf4j-api:jar:${slf4j.version}</include>
<include>org.apache.commons:commons-lang3</include>
<include>org.apache.hadoop:hadoop-common</include>
diff --git a/distro/src/main/assembly/hbase-agent.xml
b/distro/src/main/assembly/hbase-agent.xml
index b36652091..52db3e4df 100644
--- a/distro/src/main/assembly/hbase-agent.xml
+++ b/distro/src/main/assembly/hbase-agent.xml
@@ -60,7 +60,6 @@
<include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
<include>org.noggit:noggit:jar:${noggit.version}</include>
<include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
- <include>com.google.guava:guava:jar:${google.guava.version}</include>
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
<include>net.java.dev.jna:jna:jar:${jna.version}</include>
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
@@ -103,7 +102,6 @@
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
- <include>com.google.guava:guava:jar:${google.guava.version}</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
diff --git a/distro/src/main/assembly/hdfs-agent.xml
b/distro/src/main/assembly/hdfs-agent.xml
index 498b2ff2b..3764620ad 100644
--- a/distro/src/main/assembly/hdfs-agent.xml
+++ b/distro/src/main/assembly/hdfs-agent.xml
@@ -57,7 +57,6 @@
<include>commons-io:commons-io:jar:${commons.io.version}</include>
<include>commons-lang:commons-lang</include>
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
- <include>com.google.guava:guava:jar:${google.guava.version}</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
diff --git a/distro/src/main/assembly/hive-agent.xml
b/distro/src/main/assembly/hive-agent.xml
index 17757f90b..29ab7b528 100644
--- a/distro/src/main/assembly/hive-agent.xml
+++ b/distro/src/main/assembly/hive-agent.xml
@@ -98,7 +98,6 @@
<include>commons-io:commons-io:jar:${commons.io.version}</include>
<include>commons-lang:commons-lang</include>
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
- <include>com.google.guava:guava:jar:${google.guava.version}</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
diff --git a/distro/src/main/assembly/kms.xml b/distro/src/main/assembly/kms.xml
index c9b863088..beeea46ff 100755
--- a/distro/src/main/assembly/kms.xml
+++ b/distro/src/main/assembly/kms.xml
@@ -231,7 +231,6 @@
<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.guava:guava</include>
<include>com.google.code.gson:gson</include>
<include>com.sun.jersey:jersey-bundle</include>
<include>org.codehaus.jackson:jackson-core-asl</include>
@@ -306,7 +305,6 @@
<include>org.eclipse.persistence:javax.persistence</include>
<include>commons-collections:commons-collections</include>
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
-
<include>com.google.guava:guava:jar:${google.guava.version}</include>
<include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
<include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
<include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
@@ -346,7 +344,6 @@
<include>commons-io:commons-io:jar:${commons.io.version}</include>
<include>commons-lang:commons-lang:jar:${commons.lang.version}</include>
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
-
<include>com.google.guava:guava:jar:${google.guava.version}</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
@@ -393,7 +390,6 @@
<include>commons-io:commons-io:jar:${commons.io.version}</include>
<include>commons-lang:commons-lang</include>
<include>commons-logging:commons-logging</include>
- <include>com.google.guava:guava</include>
<include>org.slf4j:slf4j-api</include>
<include>org.apache.hadoop:hadoop-common</include>
<include>org.apache.hadoop:hadoop-auth</include>
diff --git a/distro/src/main/assembly/knox-agent.xml
b/distro/src/main/assembly/knox-agent.xml
index e97a9c6c8..2f53019de 100644
--- a/distro/src/main/assembly/knox-agent.xml
+++ b/distro/src/main/assembly/knox-agent.xml
@@ -110,7 +110,6 @@
<include>commons-io:commons-io:jar:${commons.io.version}</include>
<include>commons-lang:commons-lang</include>
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
- <include>com.google.guava:guava:jar:${google.guava.version}</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
diff --git a/distro/src/main/assembly/plugin-atlas.xml
b/distro/src/main/assembly/plugin-atlas.xml
index ed0108475..56da0a4e0 100644
--- a/distro/src/main/assembly/plugin-atlas.xml
+++ b/distro/src/main/assembly/plugin-atlas.xml
@@ -55,7 +55,6 @@
<fileMode>644</fileMode>
<includes>
<include>com.sun.jersey:jersey-bundle</include>
- <include>com.google.guava:guava:jar:${google.guava.version}</include>
<include>org.codehaus.jackson:jackson-jaxrs</include>
<include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
<include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
@@ -116,7 +115,6 @@
<include>commons-io:commons-io:jar:${commons.io.version}</include>
<include>commons-lang:commons-lang:jar:${commons.lang.version}</include>
<include>commons-logging:commons-logging</include>
- <include>com.google.guava:guava:jar:${google.guava.version}</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
diff --git a/distro/src/main/assembly/plugin-elasticsearch.xml
b/distro/src/main/assembly/plugin-elasticsearch.xml
index a627f641b..3c3aaf878 100644
--- a/distro/src/main/assembly/plugin-elasticsearch.xml
+++ b/distro/src/main/assembly/plugin-elasticsearch.xml
@@ -69,7 +69,6 @@
<include>com.sun.jersey:jersey-bundle</include>
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
<include>commons-io:commons-io</include>
- <include>com.google.guava:guava:jar:${google.guava.version}</include>
<include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
<include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
<include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
@@ -125,7 +124,6 @@
<include>commons-io:commons-io:jar:${commons.io.version}</include>
<include>commons-lang:commons-lang:jar:${commons.lang.version}</include>
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
- <include>com.google.guava:guava:jar:${google.guava.version}</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
diff --git a/distro/src/main/assembly/plugin-kafka.xml
b/distro/src/main/assembly/plugin-kafka.xml
index 782f0ab79..b8fedb1b7 100644
--- a/distro/src/main/assembly/plugin-kafka.xml
+++ b/distro/src/main/assembly/plugin-kafka.xml
@@ -64,7 +64,6 @@
<include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
<include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
<include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
-
<include>com.google.guava:guava:jar:${google.guava.version}</include>
<include>com.google.protobuf:protobuf-java:jar:${protobuf-java.version}</include>
<include>org.noggit:noggit:jar:${noggit.version}</include>
<include>org.codehaus.jackson:jackson-core-asl</include>
@@ -121,7 +120,6 @@
<include>commons-io:commons-io:jar:${commons.io.version}</include>
<include>commons-lang:commons-lang:jar:${commons.lang.version}</include>
<include>commons-logging:commons-logging</include>
-
<include>com.google.guava:guava:jar:${google.guava.version}</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
diff --git a/distro/src/main/assembly/plugin-kms.xml
b/distro/src/main/assembly/plugin-kms.xml
index 928db2041..605bdeff9 100755
--- a/distro/src/main/assembly/plugin-kms.xml
+++ b/distro/src/main/assembly/plugin-kms.xml
@@ -59,7 +59,6 @@
<include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
<include>commons-collections:commons-collections</include>
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
- <include>com.google.guava:guava:jar:${google.guava.version}</include>
<include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
<include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
<include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
@@ -99,7 +98,6 @@
<include>commons-io:commons-io:jar:${commons.io.version}</include>
<include>commons-lang:commons-lang:jar:${commons.lang.version}</include>
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
- <include>com.google.guava:guava:jar:${google.guava.version}</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
diff --git a/distro/src/main/assembly/plugin-kylin.xml
b/distro/src/main/assembly/plugin-kylin.xml
index 968197a4a..3b8a3de9d 100644
--- a/distro/src/main/assembly/plugin-kylin.xml
+++ b/distro/src/main/assembly/plugin-kylin.xml
@@ -96,7 +96,6 @@
<include>commons-io:commons-io:jar:${commons.io.version}</include>
<include>commons-lang:commons-lang:jar:${commons.lang.version}</include>
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
-
<include>com.google.guava:guava:jar:${google.guava.version}</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
diff --git a/distro/src/main/assembly/plugin-ozone.xml
b/distro/src/main/assembly/plugin-ozone.xml
index acb973f15..90a198791 100644
--- a/distro/src/main/assembly/plugin-ozone.xml
+++ b/distro/src/main/assembly/plugin-ozone.xml
@@ -56,7 +56,6 @@
<include>commons-io:commons-io:jar:${commons.io.version}</include>
<include>commons-lang:commons-lang</include>
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
-
<include>com.google.guava:guava:jar:${google.guava.version}</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
diff --git a/distro/src/main/assembly/plugin-presto.xml
b/distro/src/main/assembly/plugin-presto.xml
index b5fced211..9549a4f22 100644
--- a/distro/src/main/assembly/plugin-presto.xml
+++ b/distro/src/main/assembly/plugin-presto.xml
@@ -37,7 +37,6 @@
<fileMode>644</fileMode>
<includes>
<include>com.google.inject:guice:jar:${presto.guice.version}</include>
-
<include>com.google.guava:guava:jar:${presto.guava.version}</include>
<include>io.airlift:bootstrap:jar:${presto.airlift.version}</include>
<include>io.airlift:log:jar:${presto.airlift.version}</include>
<include>io.airlift:log-manager:jar:${presto.airlift.version}</include>
@@ -82,7 +81,6 @@
<include>commons-io:commons-io:jar:${commons.io.version}</include>
<include>commons-lang:commons-lang:jar:${commons.lang.version}</include>
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
-
<include>com.google.guava:guava:jar:${google.guava.version}</include>
<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>
@@ -139,12 +137,10 @@
<includes>
<include>commons-cli:commons-cli</include>
<include>commons-collections:commons-collections</include>
-
<include>com.google.guava:guava:jar:${presto.guava.version}</include>
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
<include>commons-io:commons-io:jar:${commons.io.version}</include>
<include>commons-lang:commons-lang</include>
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
-
<include>com.google.guava:guava:jar:${google.guava.version}</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
diff --git a/distro/src/main/assembly/plugin-solr.xml
b/distro/src/main/assembly/plugin-solr.xml
index fb05fa2af..9762d6fd2 100644
--- a/distro/src/main/assembly/plugin-solr.xml
+++ b/distro/src/main/assembly/plugin-solr.xml
@@ -50,7 +50,6 @@
<includes>
<include>com.google.code.gson:gson</include>
<include>com.sun.jersey:jersey-bundle</include>
- <include>com.google.guava:guava:jar:${google.guava.version}</include>
<include>org.codehaus.jackson:jackson-core-asl</include>
<include>org.codehaus.jackson:jackson-jaxrs</include>
<include>org.codehaus.jackson:jackson-mapper-asl</include>
@@ -96,7 +95,6 @@
<include>commons-io:commons-io:jar:${commons.io.version}</include>
<include>commons-lang:commons-lang:jar:${commons.lang.version}</include>
<include>commons-logging:commons-logging</include>
- <include>com.google.guava:guava:jar:${google.guava.version}</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
diff --git a/distro/src/main/assembly/plugin-sqoop.xml
b/distro/src/main/assembly/plugin-sqoop.xml
index 37c1a6f8f..e2fe07e0d 100644
--- a/distro/src/main/assembly/plugin-sqoop.xml
+++ b/distro/src/main/assembly/plugin-sqoop.xml
@@ -101,7 +101,6 @@
<include>commons-io:commons-io:jar:${commons.io.version}</include>
<include>commons-lang:commons-lang:jar:${commons.lang.version}</include>
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
- <include>com.google.guava:guava:jar:${google.guava.version}</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
diff --git a/distro/src/main/assembly/plugin-trino.xml
b/distro/src/main/assembly/plugin-trino.xml
index a2f4828a4..e22555406 100644
--- a/distro/src/main/assembly/plugin-trino.xml
+++ b/distro/src/main/assembly/plugin-trino.xml
@@ -39,7 +39,6 @@
<fileMode>644</fileMode>
<includes>
<include>com.google.inject:guice:jar:${trino.guice.version}</include>
-
<include>com.google.guava:guava:jar:${trino.guava.version}</include>
<include>io.airlift:bootstrap:jar:${trino.airlift.version}</include>
<include>io.airlift:log:jar:${trino.airlift.version}</include>
<include>io.airlift:log-manager:jar:${trino.airlift.version}</include>
@@ -75,7 +74,6 @@
<include>org.slf4j:slf4j-api:jar:${slf4j-api.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.guava:guava:jar:${google.guava.version}</include>
<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>
@@ -133,7 +131,6 @@
<includes>
<include>commons-cli:commons-cli</include>
<include>commons-collections:commons-collections</include>
-
<include>com.google.guava:guava:jar:${trino.guava.version}</include>
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
<include>commons-io:commons-io:jar:${commons.io.version}</include>
<include>commons-lang:commons-lang</include>
@@ -141,7 +138,6 @@
<include>org.apache.htrace:htrace-core4:jar:${htrace-core.version}</include>
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
-
<include>com.google.guava:guava:jar:${google.guava.version}</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
diff --git a/distro/src/main/assembly/plugin-yarn.xml
b/distro/src/main/assembly/plugin-yarn.xml
index 9f112dcbf..7f4e03f1b 100644
--- a/distro/src/main/assembly/plugin-yarn.xml
+++ b/distro/src/main/assembly/plugin-yarn.xml
@@ -103,7 +103,6 @@
<include>commons-io:commons-io:jar:${commons.io.version}</include>
<include>commons-lang:commons-lang:jar:${commons.lang.version}</include>
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
- <include>com.google.guava:guava:jar:${google.guava.version}</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
diff --git a/distro/src/main/assembly/ranger-tools.xml
b/distro/src/main/assembly/ranger-tools.xml
index 518615c9b..0d6de8ff5 100644
--- a/distro/src/main/assembly/ranger-tools.xml
+++ b/distro/src/main/assembly/ranger-tools.xml
@@ -55,7 +55,6 @@
<include>commons-collections:commons-collections</include>
<include>com.sun.jersey:jersey-bundle</include>
<include>commons-io:commons-io</include>
-
<include>com.google.guava:guava:jar:${google.guava.version}</include>
<include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
<include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
<include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
diff --git a/distro/src/main/assembly/sample-client.xml
b/distro/src/main/assembly/sample-client.xml
index 2648e1e61..f82573d90 100644
--- a/distro/src/main/assembly/sample-client.xml
+++ b/distro/src/main/assembly/sample-client.xml
@@ -55,7 +55,6 @@
<include>commons-collections:commons-collections</include>
<include>com.sun.jersey:jersey-bundle</include>
<include>commons-io:commons-io</include>
-
<include>com.google.guava:guava:jar:${google.guava.version}</include>
<include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
<include>org.noggit:noggit:jar:${noggit.version}</include>
<include>org.codehaus.jackson:jackson-core-asl</include>
diff --git a/distro/src/main/assembly/storm-agent.xml
b/distro/src/main/assembly/storm-agent.xml
index 1beb06c96..f89f6b0fd 100644
--- a/distro/src/main/assembly/storm-agent.xml
+++ b/distro/src/main/assembly/storm-agent.xml
@@ -64,7 +64,6 @@
<include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
<include>commons-collections:commons-collections</include>
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
-
<include>com.google.guava:guava:jar:${google.guava.version}</include>
<include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
<include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
<include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
@@ -114,7 +113,6 @@
<include>commons-io:commons-io:jar:${commons.io.version}</include>
<include>commons-lang:commons-lang:jar:${commons.lang.version}</include>
<include>commons-logging:commons-logging</include>
-
<include>com.google.guava:guava:jar:${google.guava.version}</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
<include>org.apache.hadoop:hadoop-common:jar</include>
<include>org.apache.hadoop:hadoop-auth:jar</include>
diff --git a/distro/src/main/assembly/tagsync.xml
b/distro/src/main/assembly/tagsync.xml
index 616f577f1..2e1b0ecb9 100644
--- a/distro/src/main/assembly/tagsync.xml
+++ b/distro/src/main/assembly/tagsync.xml
@@ -42,7 +42,6 @@
<includes>
<include>com.101tec:zkclient</include>
<include>com.google.code.gson:gson:jar:${gson.version}</include>
-
<include>com.google.guava:guava:jar:${google.guava.version}</include>
<include>com.sun.jersey:jersey-bundle:jar:${jersey-bundle.version}</include>
<include>com.sun.jersey.contribs:jersey-multipart:jar:${sun-jersey-bundle.version}</include>
<include>org.apache.atlas:atlas-notification:jar:${atlas.version}</include>
diff --git a/distro/src/main/assembly/usersync.xml
b/distro/src/main/assembly/usersync.xml
index 77c386d07..58208433c 100644
--- a/distro/src/main/assembly/usersync.xml
+++ b/distro/src/main/assembly/usersync.xml
@@ -47,7 +47,6 @@
<include>commons-collections:commons-collections</include>
<include>commons-lang:commons-lang</include>
<include>commons-logging:commons-logging</include>
-
<include>com.google.guava:guava</include>
<include>org.apache.hadoop:hadoop-auth</include>
<include>org.slf4j:slf4j-api:jar:${slf4j.version}</include>
<include>org.apache.hadoop:hadoop-common</include>
diff --git a/hbase-agent/pom.xml b/hbase-agent/pom.xml
index aeaa6307d..0701382db 100644
--- a/hbase-agent/pom.xml
+++ b/hbase-agent/pom.xml
@@ -24,7 +24,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<hbase.jetty.version>9.3.27.v20190418</hbase.jetty.version>
- <hadoop.version>3.1.1</hadoop.version>
</properties>
<parent>
<groupId>org.apache.ranger</groupId>
diff --git
a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/AuthorizationSession.java
b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/AuthorizationSession.java
index 2e8eeafea..152c8a697 100644
---
a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/AuthorizationSession.java
+++
b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/AuthorizationSession.java
@@ -26,6 +26,9 @@ import java.util.Set;
import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.hbase.security.AccessDeniedException;
import org.apache.hadoop.hbase.security.User;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
+import org.apache.hadoop.thirdparty.com.google.common.base.MoreObjects;
import org.apache.ranger.audit.model.AuthzAuditEvent;
import org.apache.ranger.plugin.policyengine.RangerAccessRequest;
import org.apache.ranger.plugin.policyengine.RangerAccessRequestImpl;
@@ -35,9 +38,6 @@ import org.apache.ranger.plugin.service.RangerBasePlugin;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
public class AuthorizationSession {
diff --git
a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java
b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java
index cc9a68f27..c5f108b9e 100644
---
a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java
+++
b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java
@@ -54,6 +54,10 @@ import
org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.PrepareBul
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Pair;
import org.apache.hadoop.hbase.wal.WALEdit;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
+import org.apache.hadoop.thirdparty.com.google.common.base.MoreObjects;
+import org.apache.hadoop.thirdparty.com.google.common.collect.MapMaker;
import org.apache.hadoop.security.AccessControlException;
import org.apache.ranger.audit.model.AuthzAuditEvent;
import org.apache.ranger.audit.provider.AuditProviderFactory;
@@ -75,10 +79,6 @@ import org.apache.ranger.plugin.util.GrantRevokeRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.Lists;
-import com.google.common.collect.MapMaker;
-import com.google.common.collect.Sets;
import com.google.protobuf.RpcCallback;
import com.google.protobuf.RpcController;
import org.apache.ranger.plugin.util.RangerPerfTracer;
diff --git
a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationFilter.java
b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationFilter.java
index 6e3900a18..3cccd0169 100644
---
a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationFilter.java
+++
b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationFilter.java
@@ -24,11 +24,11 @@ import java.util.Collections;
import java.util.Map;
import java.util.Set;
-import com.google.common.base.MoreObjects;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.filter.FilterBase;
import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.thirdparty.com.google.common.base.MoreObjects;
import org.apache.ranger.audit.model.AuthzAuditEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/RangerAuthorizationFilterTest.java
b/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/RangerAuthorizationFilterTest.java
index e009347b8..6b97c3064 100644
---
a/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/RangerAuthorizationFilterTest.java
+++
b/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/RangerAuthorizationFilterTest.java
@@ -28,9 +28,9 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import com.google.common.collect.ImmutableSet;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.filter.Filter.ReturnCode;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableSet;
import org.junit.Test;
public class RangerAuthorizationFilterTest {
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 698150d56..fa4a90c65 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
@@ -61,6 +61,7 @@ import org.apache.hadoop.hdfs.util.ReadOnlyList;
import org.apache.hadoop.ipc.CallerContext;
import org.apache.hadoop.ipc.Server;
import org.apache.hadoop.security.AccessControlException;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
import org.apache.ranger.authorization.utils.JsonUtils;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.ranger.audit.model.AuthzAuditEvent;
@@ -79,7 +80,6 @@ import org.apache.ranger.plugin.util.RangerPerfTracer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.Sets;
import org.apache.ranger.plugin.util.RangerAccessRequestUtil;
diff --git
a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
index 4ba327337..2ec60b27a 100644
---
a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
+++
b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
@@ -68,6 +68,7 @@ import
org.apache.hadoop.hive.ql.security.authorization.plugin.HiveRoleGrant;
import
org.apache.hadoop.hive.ql.security.authorization.plugin.HiveResourceACLs;
import org.apache.hadoop.hive.ql.session.SessionState;
import org.apache.hadoop.security.UserGroupInformation;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
import org.apache.ranger.authorization.hadoop.constants.RangerHadoopConstants;
import org.apache.ranger.authorization.utils.StringUtil;
import org.apache.ranger.plugin.model.RangerPolicy;
@@ -87,7 +88,6 @@ import org.apache.ranger.plugin.util.GrantRevokeRoleRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.Sets;
import org.apache.ranger.plugin.util.RangerPerfTracer;
import org.apache.ranger.plugin.util.RangerRoles;
import org.apache.ranger.plugin.util.RangerRequestedResources;
diff --git a/kms/pom.xml b/kms/pom.xml
index e79c80b94..b5d851b50 100644
--- a/kms/pom.xml
+++ b/kms/pom.xml
@@ -193,12 +193,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${google.guava.version}</version>
- <scope>compile</scope>
- </dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
diff --git
a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java
b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java
index effc38de8..7e4880011 100755
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java
@@ -34,6 +34,9 @@ import javax.crypto.spec.PBEParameterSpec;
import javax.crypto.spec.SecretKeySpec;
import org.apache.commons.collections.CollectionUtils;
+import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
+import org.apache.hadoop.thirdparty.com.google.common.base.Splitter;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import org.apache.ranger.kms.dao.DaoManager;
import org.apache.ranger.kms.dao.RangerMasterKeyDao;
import org.apache.ranger.plugin.util.XMLUtils;
@@ -41,9 +44,6 @@ import org.apache.ranger.entity.XXRangerMasterKey;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Joiner;
-import com.google.common.base.Splitter;
-import com.google.common.collect.Lists;
import com.sun.org.apache.xml.internal.security.utils.Base64;
public class RangerMasterKey implements RangerKMSMKI {
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java
b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java
index 4f5da6471..5bc0e7132 100644
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java
@@ -17,9 +17,8 @@
*/
package org.apache.hadoop.crypto.key.kms.server;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Stopwatch;
-
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Stopwatch;
import org.apache.hadoop.util.KMSUtil;
import org.apache.commons.codec.binary.Base64;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git
a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSAudit.java
b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSAudit.java
index 281ff4554..31f66384f 100644
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSAudit.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSAudit.java
@@ -18,7 +18,15 @@
package org.apache.hadoop.crypto.key.kms.server;
import com.google.common.annotations.VisibleForTesting;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.security.UserGroupInformation;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.cache.Cache;
+import org.apache.hadoop.thirdparty.com.google.common.cache.CacheBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.cache.RemovalListener;
+import
org.apache.hadoop.thirdparty.com.google.common.cache.RemovalNotification;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
+import
org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static
org.apache.hadoop.crypto.key.kms.server.KMSAuditLogger.AuditEvent;
@@ -29,15 +37,6 @@ import org.apache.hadoop.util.ReflectionUtils;
import org.apache.hadoop.util.Time;
import org.apache.hadoop.conf.Configuration;
-import com.google.common.base.Strings;
-import com.google.common.base.Preconditions;
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.RemovalListener;
-import com.google.common.cache.RemovalNotification;
-import com.google.common.collect.Sets;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executors;
@@ -192,7 +191,7 @@ public class KMSAudit {
final UserGroupInformation ugi, final String key, final String
remoteHost,
final String extraMsg) {
final String user = ugi == null ? null: ugi.getUserName();
- if (!Strings.isNullOrEmpty(user) && !Strings.isNullOrEmpty(key)
+ if (!StringUtils.isEmpty(user) && !StringUtils.isEmpty(key)
&& (op != null)
&& AGGREGATE_OPS_WHITELIST.contains(op)) {
String cacheKey = createCacheKey(user, key, op);
diff --git
a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java
b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java
index 2da841f27..3ae06cc81 100755
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java
@@ -20,7 +20,6 @@ package org.apache.hadoop.crypto.key.kms.server;
import com.codahale.metrics.JmxReporter;
import com.codahale.metrics.Meter;
import com.codahale.metrics.MetricRegistry;
-import com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.crypto.key.CachingKeyProvider;
@@ -29,6 +28,7 @@ import
org.apache.hadoop.crypto.key.KeyProviderCryptoExtension;
import org.apache.hadoop.crypto.key.KeyProviderFactory;
import
org.apache.hadoop.crypto.key.kms.server.KeyAuthorizationKeyProvider.KeyACLs;
import org.apache.hadoop.security.UserGroupInformation;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.util.ReflectionUtils;
import org.apache.hadoop.util.ShutdownHookManager;
import org.apache.hadoop.util.VersionInfo;
diff --git
a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KeyAuthorizationKeyProvider.java
b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KeyAuthorizationKeyProvider.java
index e63154942..8bcc6db5c 100755
---
a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KeyAuthorizationKeyProvider.java
+++
b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KeyAuthorizationKeyProvider.java
@@ -25,18 +25,18 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.crypto.key.KeyProvider;
import org.apache.hadoop.crypto.key.KeyProviderCryptoExtension;
import org.apache.hadoop.crypto.key.kms.server.KMS.KMSOp;
import org.apache.hadoop.security.AccessControlException;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.authorize.AuthorizationException;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableMap;
import org.apache.ranger.plugin.util.AutoClosableLock.AutoClosableReadLock;
import org.apache.ranger.plugin.util.AutoClosableLock.AutoClosableWriteLock;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Strings;
-import com.google.common.collect.ImmutableMap;
/**
* A {@link KeyProvider} proxy that checks whether the current user derived via
@@ -295,7 +295,7 @@ public class KeyAuthorizationKeyProvider extends
KeyProviderCryptoExtension {
String aclName = attributes.get(KEY_ACL_NAME);
boolean success;
- if (Strings.isNullOrEmpty(aclName)) {
+ if (StringUtils.isEmpty(aclName)) {
if (acls.isACLPresent(keyName, KeyOpType.MANAGEMENT)) {
options.setAttributes(ImmutableMap.<String, String>
builder().putAll(attributes).put(KEY_ACL_NAME, keyName).build());
diff --git
a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/SimpleKMSAuditLogger.java
b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/SimpleKMSAuditLogger.java
index 50a92b507..c787806e2 100644
---
a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/SimpleKMSAuditLogger.java
+++
b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/SimpleKMSAuditLogger.java
@@ -23,9 +23,9 @@ import java.io.IOException;
import java.util.LinkedList;
import java.util.List;
-import com.google.common.base.Joiner;
-import com.google.common.base.Strings;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,8 +51,8 @@ class SimpleKMSAuditLogger implements KMSAuditLogger {
@Override
public void logAuditEvent(final OpStatus status, final AuditEvent event) {
- if (!Strings.isNullOrEmpty(event.getUser()) && !Strings
- .isNullOrEmpty(event.getKeyName()) && (event.getOp() != null)
+ if (!StringUtils.isEmpty(event.getUser()) && !StringUtils
+ .isEmpty(event.getKeyName()) && (event.getOp() != null)
&& KMSAudit.AGGREGATE_OPS_WHITELIST.contains(event.getOp())) {
switch (status) {
case OK:
@@ -80,10 +80,10 @@ class SimpleKMSAuditLogger implements KMSAuditLogger {
if (event.getOp() != null) {
kvs.add("op=" + event.getOp());
}
- if (!Strings.isNullOrEmpty(event.getKeyName())) {
+ if (!StringUtils.isEmpty(event.getKeyName())) {
kvs.add("key=" + event.getKeyName());
}
- if (!Strings.isNullOrEmpty(event.getUser())) {
+ if (!StringUtils.isEmpty(event.getUser())) {
kvs.add("user=" + event.getUser());
}
if (kvs.isEmpty()) {
diff --git
a/knox-agent/src/test/java/org/apache/ranger/services/knox/RangerAdminClientImpl.java
b/knox-agent/src/test/java/org/apache/ranger/services/knox/RangerAdminClientImpl.java
index 4c51e592e..0ab9205be 100644
---
a/knox-agent/src/test/java/org/apache/ranger/services/knox/RangerAdminClientImpl.java
+++
b/knox-agent/src/test/java/org/apache/ranger/services/knox/RangerAdminClientImpl.java
@@ -22,11 +22,11 @@ import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.util.List;
+import org.apache.hadoop.thirdparty.com.google.common.base.Charsets;
import org.apache.ranger.admin.client.AbstractRangerAdminClient;
import org.apache.ranger.plugin.util.ServicePolicies;
import org.apache.ranger.plugin.util.ServiceTags;
-import com.google.common.base.Charsets;
/**
* A test implementation of the RangerAdminClient interface that just reads
policies in from a file and returns them
diff --git a/plugin-atlas/pom.xml b/plugin-atlas/pom.xml
index f6fab4d3b..8cf822d93 100644
--- a/plugin-atlas/pom.xml
+++ b/plugin-atlas/pom.xml
@@ -89,11 +89,6 @@
<artifactId>httpcore</artifactId>
<version>${httpcomponents.httpcore.version}</version>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${google.guava.version}</version>
- </dependency>
</dependencies>
</project>
diff --git
a/plugin-elasticsearch/src/main/java/org/apache/ranger/authorization/elasticsearch/authorizer/RangerElasticsearchAuthorizer.java
b/plugin-elasticsearch/src/main/java/org/apache/ranger/authorization/elasticsearch/authorizer/RangerElasticsearchAuthorizer.java
index a09319f63..75977eda1 100644
---
a/plugin-elasticsearch/src/main/java/org/apache/ranger/authorization/elasticsearch/authorizer/RangerElasticsearchAuthorizer.java
+++
b/plugin-elasticsearch/src/main/java/org/apache/ranger/authorization/elasticsearch/authorizer/RangerElasticsearchAuthorizer.java
@@ -23,6 +23,7 @@ import java.util.List;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
import org.apache.ranger.audit.provider.MiscUtil;
import org.apache.ranger.plugin.policyengine.RangerAccessRequestImpl;
import org.apache.ranger.plugin.policyengine.RangerAccessResourceImpl;
@@ -33,7 +34,6 @@ import
org.apache.ranger.services.elasticsearch.privilege.IndexPrivilegeUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.Sets;
public class RangerElasticsearchAuthorizer implements
RangerElasticsearchAccessControl {
diff --git
a/plugin-kms/src/main/java/org/apache/ranger/authorization/kms/authorizer/RangerKmsAuthorizer.java
b/plugin-kms/src/main/java/org/apache/ranger/authorization/kms/authorizer/RangerKmsAuthorizer.java
index e05bc9aa1..e83833283 100755
---
a/plugin-kms/src/main/java/org/apache/ranger/authorization/kms/authorizer/RangerKmsAuthorizer.java
+++
b/plugin-kms/src/main/java/org/apache/ranger/authorization/kms/authorizer/RangerKmsAuthorizer.java
@@ -41,6 +41,7 @@ import org.apache.hadoop.security.SecureClientLogin;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.authorize.AccessControlList;
import org.apache.hadoop.security.authorize.AuthorizationException;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
import org.apache.ranger.audit.provider.MiscUtil;
import org.apache.ranger.plugin.audit.RangerDefaultAuditHandler;
import org.apache.ranger.plugin.policyengine.RangerAccessRequestImpl;
@@ -51,7 +52,6 @@ import org.apache.ranger.plugin.util.RangerPerfTracer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.Sets;
public class RangerKmsAuthorizer implements Runnable, KeyACLs {
private static final Logger LOG =
LoggerFactory.getLogger(RangerKmsAuthorizer.class);
diff --git
a/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSClient.java
b/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSClient.java
index 14e9c3bd1..5f58f985f 100755
---
a/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSClient.java
+++
b/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSClient.java
@@ -43,7 +43,6 @@ import org.apache.ranger.plugin.client.HadoopException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Strings;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.sun.jersey.api.client.Client;
@@ -95,7 +94,7 @@ public class KMSClient {
URL origUrl = new URL(extractKMSPath(providerUri).toString());
String authority = origUrl.getAuthority();
// check for ';' which delimits the backup hosts
- if (Strings.isNullOrEmpty(authority)) {
+ if (StringUtils.isEmpty(authority)) {
throw new IOException("No valid authority in kms uri ["
+ origUrl
+ "]");
}
diff --git
a/plugin-kylin/src/main/java/org/apache/ranger/authorization/kylin/authorizer/RangerKylinAuthorizer.java
b/plugin-kylin/src/main/java/org/apache/ranger/authorization/kylin/authorizer/RangerKylinAuthorizer.java
index 7a91b41fc..eaed19dd5 100644
---
a/plugin-kylin/src/main/java/org/apache/ranger/authorization/kylin/authorizer/RangerKylinAuthorizer.java
+++
b/plugin-kylin/src/main/java/org/apache/ranger/authorization/kylin/authorizer/RangerKylinAuthorizer.java
@@ -23,6 +23,7 @@ import java.util.Date;
import java.util.List;
import org.apache.commons.lang.StringUtils;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.common.util.Pair;
import org.apache.kylin.metadata.project.ProjectInstance;
@@ -40,7 +41,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.security.acls.model.Permission;
-import com.google.common.collect.Sets;
public class RangerKylinAuthorizer extends ExternalAclProvider {
private static final Logger LOG =
LoggerFactory.getLogger(RangerKylinAuthorizer.class);
diff --git
a/plugin-ozone/src/main/java/org/apache/ranger/authorization/ozone/authorizer/RangerOzoneAuthorizer.java
b/plugin-ozone/src/main/java/org/apache/ranger/authorization/ozone/authorizer/RangerOzoneAuthorizer.java
index 53cc0201e..f67e182bd 100644
---
a/plugin-ozone/src/main/java/org/apache/ranger/authorization/ozone/authorizer/RangerOzoneAuthorizer.java
+++
b/plugin-ozone/src/main/java/org/apache/ranger/authorization/ozone/authorizer/RangerOzoneAuthorizer.java
@@ -20,12 +20,12 @@
package org.apache.ranger.authorization.ozone.authorizer;
-import com.google.common.collect.Sets;
import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer;
import org.apache.hadoop.ozone.security.acl.IOzoneObj;
import org.apache.hadoop.ozone.security.acl.OzoneObj;
import org.apache.hadoop.ozone.security.acl.RequestContext;
import org.apache.hadoop.security.UserGroupInformation;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
import org.apache.ranger.audit.provider.MiscUtil;
import org.apache.ranger.plugin.audit.RangerDefaultAuditHandler;
import org.apache.ranger.plugin.policyengine.RangerAccessRequestImpl;
diff --git
a/plugin-presto/src/test/java/org/apache/ranger/authorization/presto/authorizer/RangerSystemAccessControlTest.java
b/plugin-presto/src/test/java/org/apache/ranger/authorization/presto/authorizer/RangerSystemAccessControlTest.java
index ed8c837d5..608cadff0 100644
---
a/plugin-presto/src/test/java/org/apache/ranger/authorization/presto/authorizer/RangerSystemAccessControlTest.java
+++
b/plugin-presto/src/test/java/org/apache/ranger/authorization/presto/authorizer/RangerSystemAccessControlTest.java
@@ -17,7 +17,6 @@
package org.apache.ranger.authorization.presto.authorizer;
-import com.google.common.collect.ImmutableSet;
import io.prestosql.spi.connector.CatalogSchemaName;
import io.prestosql.spi.connector.CatalogSchemaRoutineName;
import io.prestosql.spi.connector.CatalogSchemaTableName;
@@ -33,6 +32,7 @@ import static org.junit.Assert.*;
import io.prestosql.spi.security.ViewExpression;
import io.prestosql.spi.type.VarcharType;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableSet;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git
a/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/FieldToAttributeMapping.java
b/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/FieldToAttributeMapping.java
index ba5f7d478..4a24c184b 100644
---
a/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/FieldToAttributeMapping.java
+++
b/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/FieldToAttributeMapping.java
@@ -19,8 +19,8 @@
package org.apache.ranger.authorization.solr.authorizer;
-import com.google.common.base.Splitter;
-import com.google.common.collect.Sets;
+import org.apache.hadoop.thirdparty.com.google.common.base.Splitter;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
import java.util.Collection;
import java.util.Collections;
diff --git
a/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/RangerSolrAuthorizer.java
b/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/RangerSolrAuthorizer.java
index e9b053381..7d91ba4de 100644
---
a/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/RangerSolrAuthorizer.java
+++
b/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/RangerSolrAuthorizer.java
@@ -32,10 +32,10 @@ import java.util.ArrayList;
import java.util.LinkedList;
import java.util.HashSet;
-import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
+import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.ranger.audit.provider.MiscUtil;
import org.apache.ranger.plugin.contextenricher.RangerContextEnricher;
import org.apache.ranger.plugin.contextenricher.RangerUserStoreEnricher;
diff --git
a/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/SubsetQueryPlugin.java
b/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/SubsetQueryPlugin.java
index 1ea4d2843..e065c9bc1 100644
---
a/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/SubsetQueryPlugin.java
+++
b/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/SubsetQueryPlugin.java
@@ -19,7 +19,7 @@
package org.apache.ranger.authorization.solr.authorizer;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
diff --git
a/plugin-sqoop/src/main/java/org/apache/ranger/authorization/sqoop/authorizer/RangerSqoopAuthorizer.java
b/plugin-sqoop/src/main/java/org/apache/ranger/authorization/sqoop/authorizer/RangerSqoopAuthorizer.java
index ecb1e5bb0..6557c8902 100644
---
a/plugin-sqoop/src/main/java/org/apache/ranger/authorization/sqoop/authorizer/RangerSqoopAuthorizer.java
+++
b/plugin-sqoop/src/main/java/org/apache/ranger/authorization/sqoop/authorizer/RangerSqoopAuthorizer.java
@@ -23,6 +23,7 @@ import java.util.Date;
import java.util.List;
import org.apache.commons.collections.CollectionUtils;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
import org.apache.ranger.plugin.audit.RangerDefaultAuditHandler;
import org.apache.ranger.plugin.policyengine.RangerAccessRequestImpl;
import org.apache.ranger.plugin.policyengine.RangerAccessResourceImpl;
@@ -38,7 +39,6 @@ import org.apache.sqoop.security.SecurityError;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.Sets;
public class RangerSqoopAuthorizer extends AuthorizationValidator {
private static final Logger LOG =
LoggerFactory.getLogger(RangerSqoopAuthorizer.class);
diff --git a/plugin-trino/pom.xml b/plugin-trino/pom.xml
index 1fa03de4c..d1db14268 100644
--- a/plugin-trino/pom.xml
+++ b/plugin-trino/pom.xml
@@ -45,11 +45,6 @@
<artifactId>logback-core</artifactId>
<version>${logback.version}</version>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${trino.guava.version}</version>
- </dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
diff --git
a/plugin-yarn/src/main/java/org/apache/ranger/authorization/yarn/authorizer/RangerYarnAuthorizer.java
b/plugin-yarn/src/main/java/org/apache/ranger/authorization/yarn/authorizer/RangerYarnAuthorizer.java
index de3493eb6..5c5e7718f 100644
---
a/plugin-yarn/src/main/java/org/apache/ranger/authorization/yarn/authorizer/RangerYarnAuthorizer.java
+++
b/plugin-yarn/src/main/java/org/apache/ranger/authorization/yarn/authorizer/RangerYarnAuthorizer.java
@@ -31,6 +31,7 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.ipc.Server;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.authorize.AccessControlList;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
import org.apache.hadoop.yarn.security.*;
import org.apache.hadoop.yarn.security.PrivilegedEntity.EntityType;
import org.apache.ranger.audit.model.AuthzAuditEvent;
@@ -45,7 +46,6 @@ import org.apache.ranger.plugin.service.RangerBasePlugin;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.Sets;
import org.apache.ranger.plugin.util.RangerPerfTracer;
public class RangerYarnAuthorizer extends YarnAuthorizationProvider {
diff --git a/pom.xml b/pom.xml
index 4e47f9649..9914793d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,6 @@
<elasticsearch.version>7.10.2</elasticsearch.version>
<enunciate.version>2.13.2</enunciate.version>
<spotbugs.plugin.version>4.7.3.5</spotbugs.plugin.version>
- <google.guava.version>27.0-jre</google.guava.version>
<googlecode.log4jdbc.version>1.2</googlecode.log4jdbc.version>
<graalvm.version>22.3.0</graalvm.version>
<gson.version>2.9.0</gson.version>
@@ -223,7 +222,6 @@
<presto.airlift.version>0.192</presto.airlift.version>
<presto.bval-jsr.version>2.0.0</presto.bval-jsr.version>
<presto.guice.version>4.2.2</presto.guice.version>
- <presto.guava.version>26.0-jre</presto.guava.version>
<presto.validation-api.version>2.0.1.Final</presto.validation-api.version>
<presto.re2j.version>1.1</presto.re2j.version>
@@ -231,7 +229,6 @@
<trino.airlift.version>0.192</trino.airlift.version>
<trino.bval-jsr.version>2.0.0</trino.bval-jsr.version>
<trino.guice.version>5.1.0</trino.guice.version>
- <trino.guava.version>26.0-jre</trino.guava.version>
<trino.validation-api.version>2.0.1.Final</trino.validation-api.version>
<trino.re2j.version>1.1</trino.re2j.version>
diff --git
a/ranger-common-ha/src/main/java/org/apache/ranger/ha/CuratorFactory.java
b/ranger-common-ha/src/main/java/org/apache/ranger/ha/CuratorFactory.java
index 758516a0e..fd18faaa1 100644
--- a/ranger-common-ha/src/main/java/org/apache/ranger/ha/CuratorFactory.java
+++ b/ranger-common-ha/src/main/java/org/apache/ranger/ha/CuratorFactory.java
@@ -32,12 +32,12 @@ import
org.apache.curator.framework.recipes.locks.InterProcessMutex;
import org.apache.curator.retry.ExponentialBackoffRetry;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.security.UserGroupInformation;
+import
org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Charsets;
import org.apache.zookeeper.data.ACL;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Charsets;
/**
* A factory to create objects related to Curator.
diff --git
a/ranger-common-ha/src/main/java/org/apache/ranger/ha/ServiceState.java
b/ranger-common-ha/src/main/java/org/apache/ranger/ha/ServiceState.java
index 6ae4a33f7..e84a0e49d 100644
--- a/ranger-common-ha/src/main/java/org/apache/ranger/ha/ServiceState.java
+++ b/ranger-common-ha/src/main/java/org/apache/ranger/ha/ServiceState.java
@@ -22,10 +22,10 @@ package org.apache.ranger.ha;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Preconditions;
/**
* A class that maintains the state of this instance.
diff --git
a/ranger-common-ha/src/main/java/org/apache/ranger/ha/ZookeeperSecurityProperties.java
b/ranger-common-ha/src/main/java/org/apache/ranger/ha/ZookeeperSecurityProperties.java
index 01a034fab..a38dd5183 100644
---
a/ranger-common-ha/src/main/java/org/apache/ranger/ha/ZookeeperSecurityProperties.java
+++
b/ranger-common-ha/src/main/java/org/apache/ranger/ha/ZookeeperSecurityProperties.java
@@ -19,9 +19,9 @@
package org.apache.ranger.ha;
+import org.apache.hadoop.thirdparty.com.google.common.base.Charsets;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.zookeeper.data.ACL;
-import com.google.common.base.Charsets;
-import com.google.common.base.Preconditions;
import org.apache.commons.lang.StringUtils;
import org.apache.curator.framework.AuthInfo;
import org.apache.zookeeper.ZooDefs;
diff --git a/ranger-examples/distro/src/main/assembly/plugin-sampleapp.xml
b/ranger-examples/distro/src/main/assembly/plugin-sampleapp.xml
index bbc38e5d7..b6975093a 100644
--- a/ranger-examples/distro/src/main/assembly/plugin-sampleapp.xml
+++ b/ranger-examples/distro/src/main/assembly/plugin-sampleapp.xml
@@ -43,7 +43,6 @@
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
<include>commons-io:commons-io:jar:${commons.io.version}</include>
<include>commons-lang:commons-lang:jar:${commons.lang.version}</include>
-
<include>com.google.guava:guava:jar:${google.guava.version}</include>
<include>org.codehaus.jackson:jackson-jaxrs:jar:${codehaus.jackson.storm.version}</include>
<include>org.codehaus.jackson:jackson-core-asl:jar:${codehaus.jackson.storm.version}</include>
<include>org.codehaus.jackson:jackson-mapper-asl:jar:${codehaus.jackson.storm.version}</include>
diff --git a/ranger-examples/distro/src/main/assembly/sample-client.xml
b/ranger-examples/distro/src/main/assembly/sample-client.xml
index 49aac2142..a20cbbd7d 100644
--- a/ranger-examples/distro/src/main/assembly/sample-client.xml
+++ b/ranger-examples/distro/src/main/assembly/sample-client.xml
@@ -51,7 +51,6 @@
<include>commons-collections:commons-collections</include>
<include>com.sun.jersey:jersey-bundle</include>
<include>commons-io:commons-io</include>
-
<include>com.google.guava:guava:jar:${google.guava.version}</include>
<include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
<include>org.noggit:noggit:jar:${noggit.version}</include>
<include>org.codehaus.jackson:jackson-core-asl</include>
diff --git a/ranger-examples/plugin-sampleapp/pom.xml
b/ranger-examples/plugin-sampleapp/pom.xml
index 3c96eef7d..842db7882 100644
--- a/ranger-examples/plugin-sampleapp/pom.xml
+++ b/ranger-examples/plugin-sampleapp/pom.xml
@@ -113,10 +113,5 @@
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${google.guava.version}</version>
- </dependency>
</dependencies>
</project>
diff --git a/ranger-examples/sample-client/pom.xml
b/ranger-examples/sample-client/pom.xml
index d0732d985..c798db435 100644
--- a/ranger-examples/sample-client/pom.xml
+++ b/ranger-examples/sample-client/pom.xml
@@ -50,11 +50,6 @@
<artifactId>commons-cli</artifactId>
<version>${commons.cli.version}</version>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${google.guava.version}</version>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
diff --git a/ranger-presto-plugin-shim/pom.xml
b/ranger-presto-plugin-shim/pom.xml
index 13471fb99..23dd49ea5 100644
--- a/ranger-presto-plugin-shim/pom.xml
+++ b/ranger-presto-plugin-shim/pom.xml
@@ -65,12 +65,6 @@
</dependency>
<!-- for the assembly -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${presto.guava.version}</version>
- </dependency>
-
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
diff --git
a/ranger-presto-plugin-shim/src/main/java/org/apache/ranger/authorization/presto/authorizer/RangerSystemAccessControlFactory.java
b/ranger-presto-plugin-shim/src/main/java/org/apache/ranger/authorization/presto/authorizer/RangerSystemAccessControlFactory.java
index e446ada03..3e8f53dde 100644
---
a/ranger-presto-plugin-shim/src/main/java/org/apache/ranger/authorization/presto/authorizer/RangerSystemAccessControlFactory.java
+++
b/ranger-presto-plugin-shim/src/main/java/org/apache/ranger/authorization/presto/authorizer/RangerSystemAccessControlFactory.java
@@ -21,9 +21,9 @@ import io.prestosql.spi.security.SystemAccessControlFactory;
import java.util.Map;
-import static com.google.common.base.Throwables.throwIfUnchecked;
import static io.airlift.configuration.ConfigBinder.configBinder;
import static java.util.Objects.requireNonNull;
+import static
org.apache.hadoop.thirdparty.com.google.common.base.Throwables.throwIfUnchecked;
public class RangerSystemAccessControlFactory
implements SystemAccessControlFactory {
diff --git
a/ranger-tools/src/main/java/org/apache/ranger/policyengine/perftest/v2/RangerPolicyFactory.java
b/ranger-tools/src/main/java/org/apache/ranger/policyengine/perftest/v2/RangerPolicyFactory.java
index cef7bd959..8c113659f 100644
---
a/ranger-tools/src/main/java/org/apache/ranger/policyengine/perftest/v2/RangerPolicyFactory.java
+++
b/ranger-tools/src/main/java/org/apache/ranger/policyengine/perftest/v2/RangerPolicyFactory.java
@@ -19,8 +19,6 @@
package org.apache.ranger.policyengine.perftest.v2;
-import static com.google.common.base.Preconditions.checkState;
-
import java.io.File;
import java.lang.reflect.Type;
import java.util.Arrays;
@@ -30,6 +28,15 @@ import java.util.Map;
import java.util.Random;
import java.util.Set;
+import org.apache.hadoop.thirdparty.com.google.common.base.Charsets;
+import org.apache.hadoop.thirdparty.com.google.common.base.Function;
+import org.apache.hadoop.thirdparty.com.google.common.base.Throwables;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableList;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableMap;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Iterables;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
+import org.apache.hadoop.thirdparty.com.google.common.io.Files;
import org.apache.ranger.plugin.model.RangerPolicy;
import org.apache.ranger.plugin.model.RangerPolicy.RangerPolicyItem;
import org.apache.ranger.plugin.model.RangerPolicy.RangerPolicyItemAccess;
@@ -44,19 +51,12 @@ import org.apache.ranger.plugin.util.ServicePolicies;
import org.apache.ranger.policyengine.RangerAccessRequestDeserializer;
import org.apache.ranger.policyengine.RangerResourceDeserializer;
-import com.google.common.base.Charsets;
-import com.google.common.base.Function;
-import com.google.common.base.Throwables;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-import com.google.common.io.Files;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
+import static
org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.checkState;
+
/**
* Factory for creating and wiring the object graph of {@link ServicePolicies}
and {@link RangerAccessRequest}.
*/
diff --git
a/ranger-tools/src/test/java/org/apache/ranger/policyengine/RangerPolicyEnginePerformanceTest.java
b/ranger-tools/src/test/java/org/apache/ranger/policyengine/RangerPolicyEnginePerformanceTest.java
index 187d20227..d319908db 100644
---
a/ranger-tools/src/test/java/org/apache/ranger/policyengine/RangerPolicyEnginePerformanceTest.java
+++
b/ranger-tools/src/test/java/org/apache/ranger/policyengine/RangerPolicyEnginePerformanceTest.java
@@ -19,7 +19,7 @@
package org.apache.ranger.policyengine;
-import static com.google.common.collect.Iterables.get;
+import static
org.apache.hadoop.thirdparty.com.google.common.collect.Iterables.get;
import java.io.File;
import java.io.IOException;
@@ -32,6 +32,19 @@ import java.util.Set;
import java.util.concurrent.CountDownLatch;
import org.apache.commons.lang.text.StrSubstitutor;
+import org.apache.hadoop.thirdparty.com.google.common.base.Charsets;
+import org.apache.hadoop.thirdparty.com.google.common.base.Function;
+import org.apache.hadoop.thirdparty.com.google.common.base.Splitter;
+import org.apache.hadoop.thirdparty.com.google.common.cache.CacheBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.cache.CacheLoader;
+import org.apache.hadoop.thirdparty.com.google.common.cache.LoadingCache;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableMap;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Iterables;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Table;
+import org.apache.hadoop.thirdparty.com.google.common.collect.TreeBasedTable;
+import org.apache.hadoop.thirdparty.com.google.common.io.Files;
import org.apache.ranger.authorization.hadoop.config.RangerPluginConfig;
import org.apache.ranger.plugin.model.RangerPolicy;
import org.apache.ranger.plugin.policyengine.RangerAccessRequest;
@@ -51,20 +64,6 @@ import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameter;
import org.junit.runners.Parameterized.Parameters;
-import com.google.common.base.Charsets;
-import com.google.common.base.Function;
-import com.google.common.base.Splitter;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-import com.google.common.collect.Table;
-import com.google.common.collect.TreeBasedTable;
-import com.google.common.io.Files;
-
import be.ceau.chart.LineChart;
import be.ceau.chart.color.Color;
import be.ceau.chart.data.LineData;
diff --git a/security-admin/pom.xml b/security-admin/pom.xml
index 7e23eab6f..2901ada35 100644
--- a/security-admin/pom.xml
+++ b/security-admin/pom.xml
@@ -165,11 +165,6 @@
<artifactId>javax.persistence</artifactId>
<version>${javax.persistence.version}</version>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${google.guava.version}</version>
- </dependency>
<dependency>
<groupId>net.htmlparser.jericho</groupId>
<artifactId>jericho-html</artifactId>
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/KmsKeyMgr.java
b/security-admin/src/main/java/org/apache/ranger/biz/KmsKeyMgr.java
index 5263db345..f49b4a602 100755
--- a/security-admin/src/main/java/org/apache/ranger/biz/KmsKeyMgr.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/KmsKeyMgr.java
@@ -66,7 +66,6 @@ import org.springframework.stereotype.Component;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Strings;
import com.sun.jersey.api.client.Client;
import com.sun.jersey.api.client.UniformInterfaceException;
import com.sun.jersey.api.client.WebResource;
@@ -492,7 +491,7 @@ public class KmsKeyMgr {
URL origUrl = new URL(extractKMSPath(providerUri).toString());
String authority = origUrl.getAuthority();
// check for ';' which delimits the backup hosts
- if (Strings.isNullOrEmpty(authority)) {
+ if (StringUtils.isEmpty(authority)) {
throw new IOException("No valid authority in kms uri ["
+ origUrl+ "]");
}
// Check if port is present in authority
diff --git
a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
index 9864e4cee..fa39840df 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
@@ -51,6 +51,7 @@ import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
+import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellStyle;
@@ -204,7 +205,6 @@ import org.apache.ranger.view.VXPolicyLabelList;
import org.apache.ranger.view.VXPortalUser;
import org.apache.ranger.view.VXString;
import org.apache.ranger.view.VXUser;
-import org.apache.ranger.view.VXUserList;
import org.codehaus.jettison.json.JSONException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -216,7 +216,6 @@ import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionCallback;
import org.springframework.transaction.support.TransactionTemplate;
-import com.google.common.base.Joiner;
import static
org.apache.ranger.service.RangerBaseModelService.OPERATION_CREATE_CONTEXT;
diff --git
a/security-admin/src/main/java/org/apache/ranger/common/TimedExecutor.java
b/security-admin/src/main/java/org/apache/ranger/common/TimedExecutor.java
index 0c9bd4db8..63110e374 100755
--- a/security-admin/src/main/java/org/apache/ranger/common/TimedExecutor.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/TimedExecutor.java
@@ -36,6 +36,7 @@ import java.util.concurrent.TimeoutException;
import javax.annotation.PostConstruct;
import org.apache.commons.lang3.StringUtils;
+import
org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.apache.ranger.plugin.client.HadoopException;
import org.apache.ranger.plugin.service.RangerDefaultService;
import org.slf4j.Logger;
@@ -44,7 +45,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Service;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
@Service
@Scope("singleton")
diff --git
a/security-admin/src/main/java/org/apache/ranger/rest/SecurityZoneREST.java
b/security-admin/src/main/java/org/apache/ranger/rest/SecurityZoneREST.java
index 03bfa8d6a..3a010ceec 100644
--- a/security-admin/src/main/java/org/apache/ranger/rest/SecurityZoneREST.java
+++ b/security-admin/src/main/java/org/apache/ranger/rest/SecurityZoneREST.java
@@ -46,6 +46,7 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.DefaultValue;
import javax.ws.rs.QueryParam;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
import org.apache.ranger.biz.RangerPolicyAdmin;
import org.apache.ranger.biz.RangerBizUtil;
import org.apache.ranger.biz.SecurityZoneDBStore;
@@ -83,7 +84,6 @@ import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
-import com.google.common.collect.Sets;
@Path("zones")
@Component
diff --git
a/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerKrbFilter.java
b/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerKrbFilter.java
index 29c1bcdef..a6f54dea1 100644
---
a/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerKrbFilter.java
+++
b/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerKrbFilter.java
@@ -47,7 +47,8 @@ import java.security.Principal;
import java.text.SimpleDateFormat;
import java.util.*;
-import static com.google.common.io.ByteStreams.skipFully;
+import static
org.apache.hadoop.thirdparty.com.google.common.io.ByteStreams.skipFully;
+
@InterfaceAudience.Private
@InterfaceStability.Unstable
diff --git
a/security-admin/src/main/java/org/apache/ranger/service/RangerServiceService.java
b/security-admin/src/main/java/org/apache/ranger/service/RangerServiceService.java
index 4ef3ab7c1..44782c313 100644
---
a/security-admin/src/main/java/org/apache/ranger/service/RangerServiceService.java
+++
b/security-admin/src/main/java/org/apache/ranger/service/RangerServiceService.java
@@ -24,6 +24,7 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
+import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
import org.apache.ranger.biz.ServiceDBStore;
import org.apache.ranger.db.XXServiceVersionInfoDao;
import org.apache.ranger.entity.XXService;
@@ -34,7 +35,6 @@ import org.apache.ranger.plugin.util.PasswordUtils;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Service;
-import com.google.common.base.Joiner;
@Service
@Scope("singleton")
diff --git
a/storm-agent/src/main/java/org/apache/ranger/authorization/storm/StormRangerPlugin.java
b/storm-agent/src/main/java/org/apache/ranger/authorization/storm/StormRangerPlugin.java
index 9cf352880..3d5ddafe3 100644
---
a/storm-agent/src/main/java/org/apache/ranger/authorization/storm/StormRangerPlugin.java
+++
b/storm-agent/src/main/java/org/apache/ranger/authorization/storm/StormRangerPlugin.java
@@ -23,6 +23,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.hadoop.security.authentication.util.KerberosName;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
import
org.apache.ranger.authorization.storm.StormRangerPlugin.StormConstants.PluginConfiguration;
import
org.apache.ranger.authorization.storm.StormRangerPlugin.StormConstants.ResourceName;
import org.apache.ranger.plugin.audit.RangerDefaultAuditHandler;
@@ -33,7 +34,6 @@ import org.apache.ranger.plugin.service.RangerBasePlugin;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.Sets;
public class StormRangerPlugin extends RangerBasePlugin {
diff --git
a/storm-agent/src/main/java/org/apache/ranger/authorization/storm/authorizer/RangerStormAuthorizer.java
b/storm-agent/src/main/java/org/apache/ranger/authorization/storm/authorizer/RangerStormAuthorizer.java
index fd42090b1..e7094a026 100644
---
a/storm-agent/src/main/java/org/apache/ranger/authorization/storm/authorizer/RangerStormAuthorizer.java
+++
b/storm-agent/src/main/java/org/apache/ranger/authorization/storm/authorizer/RangerStormAuthorizer.java
@@ -24,6 +24,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.hadoop.security.UserGroupInformation;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
import org.apache.ranger.audit.provider.MiscUtil;
import org.apache.ranger.authorization.storm.StormRangerPlugin;
import org.apache.ranger.authorization.utils.StringUtil;
@@ -33,7 +34,6 @@ import org.apache.ranger.plugin.util.RangerPerfTracer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.Sets;
import org.apache.storm.Config;
import org.apache.storm.security.auth.IAuthorizer;
diff --git a/tagsync/pom.xml b/tagsync/pom.xml
index e4f04a131..5504f0ee9 100644
--- a/tagsync/pom.xml
+++ b/tagsync/pom.xml
@@ -299,11 +299,6 @@
<artifactId>ranger-common-ha</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${google.guava.version}</version>
- </dependency>
<!-- Test -->
<dependency>
diff --git a/ugsync/pom.xml b/ugsync/pom.xml
index 4bb0788ef..1a5adc1fc 100644
--- a/ugsync/pom.xml
+++ b/ugsync/pom.xml
@@ -88,11 +88,6 @@
<artifactId>log4j-to-slf4j</artifactId>
<version>${log4j2.version}</version>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${google.guava.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-auth</artifactId>
diff --git
a/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapUserGroupBuilder.java
b/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapUserGroupBuilder.java
index b1a6af183..cce306472 100644
---
a/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapUserGroupBuilder.java
+++
b/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapUserGroupBuilder.java
@@ -54,6 +54,8 @@ import javax.naming.ldap.StartTlsResponse;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang.StringUtils;
+import org.apache.hadoop.thirdparty.com.google.common.collect.HashBasedTable;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Table;
import org.apache.ranger.ugsyncutil.util.UgsyncCommonConstants;
import org.apache.ranger.unixusersync.config.UserGroupSyncConfig;
import org.apache.ranger.ugsyncutil.model.LdapSyncSourceInfo;
@@ -62,8 +64,6 @@ import org.apache.ranger.usergroupsync.UserGroupSink;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.HashBasedTable;
-import com.google.common.collect.Table;
import org.apache.ranger.usergroupsync.UserGroupSource;
public class LdapUserGroupBuilder implements UserGroupSource {
diff --git
a/ugsync/src/main/java/org/apache/ranger/unixusersync/process/UnixUserGroupBuilder.java
b/ugsync/src/main/java/org/apache/ranger/unixusersync/process/UnixUserGroupBuilder.java
index 5525305b7..23fcb879a 100644
---
a/ugsync/src/main/java/org/apache/ranger/unixusersync/process/UnixUserGroupBuilder.java
+++
b/ugsync/src/main/java/org/apache/ranger/unixusersync/process/UnixUserGroupBuilder.java
@@ -34,9 +34,9 @@ import java.util.Date;
import java.util.Arrays;
import java.util.Iterator;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.HashBasedTable;
-import com.google.common.collect.Table;
+import
org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.collect.HashBasedTable;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Table;
import org.apache.ranger.ugsyncutil.model.UgsyncAuditInfo;
import org.apache.ranger.ugsyncutil.model.UnixSyncSourceInfo;
import org.apache.ranger.ugsyncutil.util.UgsyncCommonConstants;
diff --git a/unixauthclient/pom.xml b/unixauthclient/pom.xml
index e4d53ffc7..62fd7bae6 100644
--- a/unixauthclient/pom.xml
+++ b/unixauthclient/pom.xml
@@ -68,16 +68,6 @@
<artifactId>commons-text</artifactId>
<version>${commons.text.version}</version>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons.logging.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${google.guava.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-auth</artifactId>
diff --git a/unixauthservice/pom.xml b/unixauthservice/pom.xml
index 1cbcb1684..153d0dc81 100644
--- a/unixauthservice/pom.xml
+++ b/unixauthservice/pom.xml
@@ -62,16 +62,6 @@
<artifactId>commons-lang</artifactId>
<version>${commons.lang.version}</version>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons.logging.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${google.guava.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-auth</artifactId>
