diff --git a/agents-audit/pom.xml b/agents-audit/pom.xml index 06e81650f9..c09433eb8f 100644 --- a/agents-audit/pom.xml +++ b/agents-audit/pom.xml @@ -169,11 +169,6 @@ httpmime ${httpcomponents.httpmime.version} - - com.google.guava - guava - ${google.guava.version} - org.elasticsearch elasticsearch 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 b81c30e515..8324d998b2 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.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 51a3aae6fb..75328b985a 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.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.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 9cbea7f61e..0e65db0d6e 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 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.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 5521146b97..bc53f55a24 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.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.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 f1f2b0920e..546412b530 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.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 @@ private String decrypt() throws IOException { } 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 a1df53fac1..2b1e17a413 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 ec64e33e4c..f2efa52536 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.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 2c69bcc6fd..281080861c 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 3ec20d99ad..ad989195e8 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 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 7e16082bcc..2372048cf6 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.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.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 b0c1085303..a667c9b0b1 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.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.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 8a297bde06..f588f3e2a4 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 3727b30d42..9083725743 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 cc73076154..dd10a6b69b 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 d0b1806457..c624ddbdac 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 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 0f61148eee..cc0e7ec95c 100644 --- a/credentialbuilder/pom.xml +++ b/credentialbuilder/pom.xml @@ -48,11 +48,6 @@ commons-lang3 ${commons.lang3.version} - - com.google.guava - guava - ${google.guava.version} - org.slf4j slf4j-api diff --git a/distro/src/main/assembly/admin-web.xml b/distro/src/main/assembly/admin-web.xml index 0c8afa9d07..b8964c3043 100644 --- a/distro/src/main/assembly/admin-web.xml +++ b/distro/src/main/assembly/admin-web.xml @@ -191,7 +191,6 @@ org.apache.commons:commons-compress:jar:1.4.1 org.bouncycastle:bcpkix-jdk15on:jar:${org.bouncycastle.bcpkix-jdk15on} commons-net:commons-net:jar:${commons.net.version} - com.google.guava:guava io.jaegertracing:jaeger-core:jar:1.6.0 io.opentracing:opentracing-api:jar:0.33.0 io.opentracing:opentracing-noop:jar:0.33.0 @@ -240,7 +239,6 @@ org.apache.hadoop:hadoop-common commons-logging:commons-logging com.sun.jersey.contribs:jersey-multipart - com.google.guava:guava commons-collections:commons-collections commons-lang:commons-lang commons-io:commons-io @@ -302,7 +300,6 @@ commons-io:commons-io:jar:${commons.io.version} commons-lang:commons-lang commons-logging:commons-logging - com.google.guava:guava org.slf4j:slf4j-api:jar:${slf4j.version} org.apache.commons:commons-lang3 org.apache.hadoop:hadoop-common diff --git a/distro/src/main/assembly/hbase-agent.xml b/distro/src/main/assembly/hbase-agent.xml index b36652091b..52db3e4df3 100644 --- a/distro/src/main/assembly/hbase-agent.xml +++ b/distro/src/main/assembly/hbase-agent.xml @@ -60,7 +60,6 @@ org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version} org.noggit:noggit:jar:${noggit.version} org.apache.solr:solr-solrj:jar:${solr.version} - com.google.guava:guava:jar:${google.guava.version} com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version} net.java.dev.jna:jna:jar:${jna.version} net.java.dev.jna:jna-platform:jar:${jna-platform.version} @@ -103,7 +102,6 @@ commons-logging:commons-logging:jar:${commons.logging.version} org.apache.commons:commons-lang3:jar:${commons.lang3.version} org.apache.commons:commons-compress:jar:${commons.compress.version} - com.google.guava:guava:jar:${google.guava.version} org.slf4j:slf4j-api:jar:${slf4j-api.version} org.apache.hadoop:hadoop-common:jar:${hadoop.version} org.apache.hadoop:hadoop-auth:jar:${hadoop.version} diff --git a/distro/src/main/assembly/hdfs-agent.xml b/distro/src/main/assembly/hdfs-agent.xml index 498b2ff2b6..3764620adc 100644 --- a/distro/src/main/assembly/hdfs-agent.xml +++ b/distro/src/main/assembly/hdfs-agent.xml @@ -57,7 +57,6 @@ commons-io:commons-io:jar:${commons.io.version} commons-lang:commons-lang commons-logging:commons-logging:jar:${commons.logging.version} - com.google.guava:guava:jar:${google.guava.version} org.slf4j:slf4j-api:jar:${slf4j-api.version} org.apache.hadoop:hadoop-common:jar:${hadoop.version} org.apache.hadoop:hadoop-auth:jar:${hadoop.version} diff --git a/distro/src/main/assembly/hive-agent.xml b/distro/src/main/assembly/hive-agent.xml index 17757f90bb..29ab7b528f 100644 --- a/distro/src/main/assembly/hive-agent.xml +++ b/distro/src/main/assembly/hive-agent.xml @@ -98,7 +98,6 @@ commons-io:commons-io:jar:${commons.io.version} commons-lang:commons-lang commons-logging:commons-logging:jar:${commons.logging.version} - com.google.guava:guava:jar:${google.guava.version} org.slf4j:slf4j-api:jar:${slf4j-api.version} org.apache.hadoop:hadoop-common:jar:${hadoop.version} org.apache.hadoop:hadoop-auth:jar:${hadoop.version} diff --git a/distro/src/main/assembly/kms.xml b/distro/src/main/assembly/kms.xml index c9b8630884..beeea46ff7 100755 --- a/distro/src/main/assembly/kms.xml +++ b/distro/src/main/assembly/kms.xml @@ -231,7 +231,6 @@ org.slf4j:log4j-over-slf4j:jar:${slf4j.version} ch.qos.logback:logback-classic:jar:${logback.version} ch.qos.logback:logback-core:jar:${logback.version} - com.google.guava:guava com.google.code.gson:gson com.sun.jersey:jersey-bundle org.codehaus.jackson:jackson-core-asl @@ -306,7 +305,6 @@ org.eclipse.persistence:javax.persistence commons-collections:commons-collections commons-logging:commons-logging:jar:${commons.logging.version} - com.google.guava:guava:jar:${google.guava.version} org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version} org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version} org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version} @@ -346,7 +344,6 @@ commons-io:commons-io:jar:${commons.io.version} commons-lang:commons-lang:jar:${commons.lang.version} commons-logging:commons-logging:jar:${commons.logging.version} - com.google.guava:guava:jar:${google.guava.version} org.slf4j:slf4j-api:jar:${slf4j-api.version} org.apache.hadoop:hadoop-common:jar:${hadoop.version} org.apache.hadoop:hadoop-auth:jar:${hadoop.version} @@ -393,7 +390,6 @@ commons-io:commons-io:jar:${commons.io.version} commons-lang:commons-lang commons-logging:commons-logging - com.google.guava:guava org.slf4j:slf4j-api org.apache.hadoop:hadoop-common org.apache.hadoop:hadoop-auth diff --git a/distro/src/main/assembly/knox-agent.xml b/distro/src/main/assembly/knox-agent.xml index e97a9c6c85..2f53019ded 100644 --- a/distro/src/main/assembly/knox-agent.xml +++ b/distro/src/main/assembly/knox-agent.xml @@ -110,7 +110,6 @@ commons-io:commons-io:jar:${commons.io.version} commons-lang:commons-lang commons-logging:commons-logging:jar:${commons.logging.version} - com.google.guava:guava:jar:${google.guava.version} org.slf4j:slf4j-api:jar:${slf4j-api.version} org.apache.hadoop:hadoop-common:jar:${hadoop.version} org.apache.hadoop:hadoop-auth:jar:${hadoop.version} diff --git a/distro/src/main/assembly/plugin-atlas.xml b/distro/src/main/assembly/plugin-atlas.xml index ed01084757..56da0a4e08 100644 --- a/distro/src/main/assembly/plugin-atlas.xml +++ b/distro/src/main/assembly/plugin-atlas.xml @@ -55,7 +55,6 @@ 644 com.sun.jersey:jersey-bundle - com.google.guava:guava:jar:${google.guava.version} org.codehaus.jackson:jackson-jaxrs org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version} org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version} @@ -116,7 +115,6 @@ commons-io:commons-io:jar:${commons.io.version} commons-lang:commons-lang:jar:${commons.lang.version} commons-logging:commons-logging - com.google.guava:guava:jar:${google.guava.version} org.slf4j:slf4j-api:jar:${slf4j-api.version} org.apache.hadoop:hadoop-common:jar:${hadoop.version} org.apache.hadoop:hadoop-auth:jar:${hadoop.version} diff --git a/distro/src/main/assembly/plugin-elasticsearch.xml b/distro/src/main/assembly/plugin-elasticsearch.xml index a627f641b2..3c3aaf8789 100644 --- a/distro/src/main/assembly/plugin-elasticsearch.xml +++ b/distro/src/main/assembly/plugin-elasticsearch.xml @@ -69,7 +69,6 @@ com.sun.jersey:jersey-bundle commons-logging:commons-logging:jar:${commons.logging.version} commons-io:commons-io - com.google.guava:guava:jar:${google.guava.version} org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version} org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version} org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version} @@ -125,7 +124,6 @@ commons-io:commons-io:jar:${commons.io.version} commons-lang:commons-lang:jar:${commons.lang.version} commons-logging:commons-logging:jar:${commons.logging.version} - com.google.guava:guava:jar:${google.guava.version} org.slf4j:slf4j-api:jar:${slf4j-api.version} org.apache.hadoop:hadoop-common:jar:${hadoop.version} org.apache.hadoop:hadoop-auth:jar:${hadoop.version} diff --git a/distro/src/main/assembly/plugin-kafka.xml b/distro/src/main/assembly/plugin-kafka.xml index 782f0ab792..b8fedb1b77 100644 --- a/distro/src/main/assembly/plugin-kafka.xml +++ b/distro/src/main/assembly/plugin-kafka.xml @@ -64,7 +64,6 @@ org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version} org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version} org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version} - com.google.guava:guava:jar:${google.guava.version} com.google.protobuf:protobuf-java:jar:${protobuf-java.version} org.noggit:noggit:jar:${noggit.version} org.codehaus.jackson:jackson-core-asl @@ -121,7 +120,6 @@ commons-io:commons-io:jar:${commons.io.version} commons-lang:commons-lang:jar:${commons.lang.version} commons-logging:commons-logging - com.google.guava:guava:jar:${google.guava.version} org.slf4j:slf4j-api:jar:${slf4j-api.version} org.apache.hadoop:hadoop-common:jar:${hadoop.version} org.apache.hadoop:hadoop-auth:jar:${hadoop.version} diff --git a/distro/src/main/assembly/plugin-kms.xml b/distro/src/main/assembly/plugin-kms.xml index 928db20416..605bdeff9b 100755 --- a/distro/src/main/assembly/plugin-kms.xml +++ b/distro/src/main/assembly/plugin-kms.xml @@ -59,7 +59,6 @@ org.eclipse.jetty:jetty-client:jar:${jetty-client.version} commons-collections:commons-collections commons-logging:commons-logging:jar:${commons.logging.version} - com.google.guava:guava:jar:${google.guava.version} org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version} org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version} org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version} @@ -99,7 +98,6 @@ commons-io:commons-io:jar:${commons.io.version} commons-lang:commons-lang:jar:${commons.lang.version} commons-logging:commons-logging:jar:${commons.logging.version} - com.google.guava:guava:jar:${google.guava.version} org.slf4j:slf4j-api:jar:${slf4j-api.version} org.apache.hadoop:hadoop-common:jar:${hadoop.version} org.apache.hadoop:hadoop-auth:jar:${hadoop.version} diff --git a/distro/src/main/assembly/plugin-kylin.xml b/distro/src/main/assembly/plugin-kylin.xml index 968197a4a8..3b8a3de9dd 100644 --- a/distro/src/main/assembly/plugin-kylin.xml +++ b/distro/src/main/assembly/plugin-kylin.xml @@ -96,7 +96,6 @@ commons-io:commons-io:jar:${commons.io.version} commons-lang:commons-lang:jar:${commons.lang.version} commons-logging:commons-logging:jar:${commons.logging.version} - com.google.guava:guava:jar:${google.guava.version} org.slf4j:slf4j-api:jar:${slf4j-api.version} org.apache.hadoop:hadoop-common:jar:${hadoop.version} org.apache.hadoop:hadoop-auth:jar:${hadoop.version} diff --git a/distro/src/main/assembly/plugin-ozone.xml b/distro/src/main/assembly/plugin-ozone.xml index f1b78699cd..596766ad9c 100644 --- a/distro/src/main/assembly/plugin-ozone.xml +++ b/distro/src/main/assembly/plugin-ozone.xml @@ -56,7 +56,6 @@ commons-io:commons-io:jar:${commons.io.version} commons-lang:commons-lang commons-logging:commons-logging:jar:${commons.logging.version} - com.google.guava:guava:jar:${google.guava.version} org.slf4j:slf4j-api:jar:${slf4j-api.version} org.apache.hadoop:hadoop-common:jar:${hadoop.version} org.apache.hadoop:hadoop-auth:jar:${hadoop.version} diff --git a/distro/src/main/assembly/plugin-presto.xml b/distro/src/main/assembly/plugin-presto.xml index b5fced211d..9549a4f229 100644 --- a/distro/src/main/assembly/plugin-presto.xml +++ b/distro/src/main/assembly/plugin-presto.xml @@ -37,7 +37,6 @@ 644 com.google.inject:guice:jar:${presto.guice.version} - com.google.guava:guava:jar:${presto.guava.version} io.airlift:bootstrap:jar:${presto.airlift.version} io.airlift:log:jar:${presto.airlift.version} io.airlift:log-manager:jar:${presto.airlift.version} @@ -82,7 +81,6 @@ commons-io:commons-io:jar:${commons.io.version} commons-lang:commons-lang:jar:${commons.lang.version} commons-logging:commons-logging:jar:${commons.logging.version} - com.google.guava:guava:jar:${google.guava.version} com.google.protobuf:protobuf-java:jar:${protobuf-java.version} com.google.re2j:re2j:jar:${presto.re2j.version} org.apache.commons:commons-configuration2:jar:${commons.configuration.version} @@ -139,12 +137,10 @@ commons-cli:commons-cli commons-collections:commons-collections - com.google.guava:guava:jar:${presto.guava.version} org.apache.commons:commons-configuration2:jar:${commons.configuration.version} commons-io:commons-io:jar:${commons.io.version} commons-lang:commons-lang commons-logging:commons-logging:jar:${commons.logging.version} - com.google.guava:guava:jar:${google.guava.version} org.slf4j:slf4j-api:jar:${slf4j-api.version} org.apache.hadoop:hadoop-common:jar:${hadoop.version} org.apache.hadoop:hadoop-auth:jar:${hadoop.version} diff --git a/distro/src/main/assembly/plugin-solr.xml b/distro/src/main/assembly/plugin-solr.xml index fb05fa2afb..9762d6fd24 100644 --- a/distro/src/main/assembly/plugin-solr.xml +++ b/distro/src/main/assembly/plugin-solr.xml @@ -50,7 +50,6 @@ com.google.code.gson:gson com.sun.jersey:jersey-bundle - com.google.guava:guava:jar:${google.guava.version} org.codehaus.jackson:jackson-core-asl org.codehaus.jackson:jackson-jaxrs org.codehaus.jackson:jackson-mapper-asl @@ -96,7 +95,6 @@ commons-io:commons-io:jar:${commons.io.version} commons-lang:commons-lang:jar:${commons.lang.version} commons-logging:commons-logging - com.google.guava:guava:jar:${google.guava.version} org.slf4j:slf4j-api:jar:${slf4j-api.version} org.apache.hadoop:hadoop-common:jar:${hadoop.version} org.apache.hadoop:hadoop-auth:jar:${hadoop.version} diff --git a/distro/src/main/assembly/plugin-sqoop.xml b/distro/src/main/assembly/plugin-sqoop.xml index 37c1a6f8fa..e2fe07e0d1 100644 --- a/distro/src/main/assembly/plugin-sqoop.xml +++ b/distro/src/main/assembly/plugin-sqoop.xml @@ -101,7 +101,6 @@ commons-io:commons-io:jar:${commons.io.version} commons-lang:commons-lang:jar:${commons.lang.version} commons-logging:commons-logging:jar:${commons.logging.version} - com.google.guava:guava:jar:${google.guava.version} org.slf4j:slf4j-api:jar:${slf4j-api.version} org.apache.hadoop:hadoop-common:jar:${hadoop.version} org.apache.hadoop:hadoop-auth:jar:${hadoop.version} diff --git a/distro/src/main/assembly/plugin-trino.xml b/distro/src/main/assembly/plugin-trino.xml index a2f4828a4e..e225554066 100644 --- a/distro/src/main/assembly/plugin-trino.xml +++ b/distro/src/main/assembly/plugin-trino.xml @@ -39,7 +39,6 @@ 644 com.google.inject:guice:jar:${trino.guice.version} - com.google.guava:guava:jar:${trino.guava.version} io.airlift:bootstrap:jar:${trino.airlift.version} io.airlift:log:jar:${trino.airlift.version} io.airlift:log-manager:jar:${trino.airlift.version} @@ -75,7 +74,6 @@ org.slf4j:slf4j-api:jar:${slf4j-api.version} ch.qos.logback:logback-classic:jar:${logback.version} ch.qos.logback:logback-core:jar:${logback.version} - com.google.guava:guava:jar:${google.guava.version} com.google.protobuf:protobuf-java:jar:${protobuf-java.version} com.google.re2j:re2j:jar:${trino.re2j.version} org.apache.commons:commons-configuration2:jar:${commons.configuration.version} @@ -133,7 +131,6 @@ commons-cli:commons-cli commons-collections:commons-collections - com.google.guava:guava:jar:${trino.guava.version} org.apache.commons:commons-configuration2:jar:${commons.configuration.version} commons-io:commons-io:jar:${commons.io.version} commons-lang:commons-lang @@ -141,7 +138,6 @@ org.apache.htrace:htrace-core4:jar:${htrace-core.version} org.apache.commons:commons-compress:jar:${commons.compress.version} commons-logging:commons-logging:jar:${commons.logging.version} - com.google.guava:guava:jar:${google.guava.version} org.slf4j:slf4j-api:jar:${slf4j-api.version} org.apache.hadoop:hadoop-common:jar:${hadoop.version} org.apache.hadoop:hadoop-auth:jar:${hadoop.version} diff --git a/distro/src/main/assembly/plugin-yarn.xml b/distro/src/main/assembly/plugin-yarn.xml index 9f112dcbff..7f4e03f1b7 100644 --- a/distro/src/main/assembly/plugin-yarn.xml +++ b/distro/src/main/assembly/plugin-yarn.xml @@ -103,7 +103,6 @@ commons-io:commons-io:jar:${commons.io.version} commons-lang:commons-lang:jar:${commons.lang.version} commons-logging:commons-logging:jar:${commons.logging.version} - com.google.guava:guava:jar:${google.guava.version} org.slf4j:slf4j-api:jar:${slf4j-api.version} org.apache.hadoop:hadoop-common:jar:${hadoop.version} org.apache.hadoop:hadoop-auth:jar:${hadoop.version} diff --git a/distro/src/main/assembly/ranger-tools.xml b/distro/src/main/assembly/ranger-tools.xml index 518615c9b4..0d6de8ff5c 100644 --- a/distro/src/main/assembly/ranger-tools.xml +++ b/distro/src/main/assembly/ranger-tools.xml @@ -55,7 +55,6 @@ commons-collections:commons-collections com.sun.jersey:jersey-bundle commons-io:commons-io - com.google.guava:guava:jar:${google.guava.version} org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version} org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version} org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version} diff --git a/distro/src/main/assembly/sample-client.xml b/distro/src/main/assembly/sample-client.xml index b7c73ef8b0..80a6f7fac9 100644 --- a/distro/src/main/assembly/sample-client.xml +++ b/distro/src/main/assembly/sample-client.xml @@ -55,7 +55,6 @@ commons-collections:commons-collections com.sun.jersey:jersey-bundle commons-io:commons-io - com.google.guava:guava:jar:${google.guava.version} org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version} org.noggit:noggit:jar:${noggit.version} org.codehaus.jackson:jackson-core-asl diff --git a/distro/src/main/assembly/storm-agent.xml b/distro/src/main/assembly/storm-agent.xml index 1beb06c961..f89f6b0fda 100644 --- a/distro/src/main/assembly/storm-agent.xml +++ b/distro/src/main/assembly/storm-agent.xml @@ -64,7 +64,6 @@ org.eclipse.jetty:jetty-client:jar:${jetty-client.version} commons-collections:commons-collections commons-logging:commons-logging:jar:${commons.logging.version} - com.google.guava:guava:jar:${google.guava.version} org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version} org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version} org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version} @@ -114,7 +113,6 @@ commons-io:commons-io:jar:${commons.io.version} commons-lang:commons-lang:jar:${commons.lang.version} commons-logging:commons-logging - com.google.guava:guava:jar:${google.guava.version} org.slf4j:slf4j-api:jar:${slf4j-api.version} org.apache.hadoop:hadoop-common:jar org.apache.hadoop:hadoop-auth:jar diff --git a/distro/src/main/assembly/tagsync.xml b/distro/src/main/assembly/tagsync.xml index 616f577f12..2e1b0ecb90 100644 --- a/distro/src/main/assembly/tagsync.xml +++ b/distro/src/main/assembly/tagsync.xml @@ -42,7 +42,6 @@ com.101tec:zkclient com.google.code.gson:gson:jar:${gson.version} - com.google.guava:guava:jar:${google.guava.version} com.sun.jersey:jersey-bundle:jar:${jersey-bundle.version} com.sun.jersey.contribs:jersey-multipart:jar:${sun-jersey-bundle.version} org.apache.atlas:atlas-notification:jar:${atlas.version} diff --git a/distro/src/main/assembly/usersync.xml b/distro/src/main/assembly/usersync.xml index 7ade678590..0dbf4232c0 100644 --- a/distro/src/main/assembly/usersync.xml +++ b/distro/src/main/assembly/usersync.xml @@ -46,7 +46,6 @@ commons-collections:commons-collections commons-lang:commons-lang commons-logging:commons-logging - com.google.guava:guava org.apache.hadoop:hadoop-auth org.slf4j:slf4j-api:jar:${slf4j.version} org.apache.hadoop:hadoop-common diff --git a/hbase-agent/pom.xml b/hbase-agent/pom.xml index 5b4e4313ee..c598330955 100644 --- a/hbase-agent/pom.xml +++ b/hbase-agent/pom.xml @@ -24,7 +24,6 @@ UTF-8 9.3.27.v20190418 - 3.1.1 org.apache.ranger 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 2e8eeafea0..152c8a6976 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 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.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 cc9a68f27e..c5f108b9ef 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.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.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 6e3900a184..3cccd01690 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.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 e009347b8b..6b97c30645 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.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 e226da8a53..aa59e3ad63 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.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.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 4ba327337d..2ec60b27a5 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.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.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 bfac6424a1..7d02ba90a3 100644 --- a/kms/pom.xml +++ b/kms/pom.xml @@ -200,12 +200,6 @@ - - com.google.guava - guava - ${google.guava.version} - compile - com.sun.jersey jersey-core 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 7b5e8bf7bd..db3750ecc7 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.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.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 4f5da64711..5bc0e71326 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 281ff45542..31f66384f0 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.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 @@ private void op(final OpStatus opStatus, final Object op, 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 f0ed18309f..f7330a8b4d 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 @@ 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.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 e631549423..8bcc6db5c2 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.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 @@ private void authorizeCreateKey(String keyName, Options options, UserGroupInform 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. 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 50a92b507b..c787806e28 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.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 @@ public void initialize(Configuration conf) throws IOException { @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 @@ private void logAuditSimpleFormat(final OpStatus status, 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 4c51e592eb..0ab9205bef 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.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 ad950f70dc..13bed52a4f 100644 --- a/plugin-atlas/pom.xml +++ b/plugin-atlas/pom.xml @@ -89,11 +89,6 @@ httpcore ${httpcomponents.httpcore.version} - - com.google.guava - guava - ${google.guava.version} - 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 a09319f63b..75977eda18 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 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.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 799eb322c0..2785cc9a22 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.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.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 14e9c3bd19..5f58f985f2 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.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 @@ private String[] createProvider(String uri) throws IOException, 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 bcfaaafef6..1679a145fd 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.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.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 53cc0201ec..f67e182bd2 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 ed8c837d55..608cadff08 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 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 ba5f7d478c..4a24c184b6 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 e9b053381e..7d91ba4de5 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.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 1ea4d28434..e065c9bc18 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 65e08e41b3..16ad9ab02e 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.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.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 e4d1614175..3275981eba 100644 --- a/plugin-trino/pom.xml +++ b/plugin-trino/pom.xml @@ -45,11 +45,6 @@ logback-core ${logback.version} - - com.google.guava - guava - ${trino.guava.version} - com.google.inject guice 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 de3493eb6b..5c5e7718f0 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.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.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 68fc34a725..14e211442c 100644 --- a/pom.xml +++ b/pom.xml @@ -117,7 +117,6 @@ 7.10.2 2.13.2 4.7.3.5 - 27.0-jre 1.2 22.3.0 2.9.0 @@ -222,7 +221,6 @@ 0.192 2.0.0 4.2.2 - 26.0-jre 2.0.1.Final 1.1 @@ -230,7 +228,6 @@ 0.192 2.0.0 5.1.0 - 26.0-jre 2.0.1.Final 1.1 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 758516a0e9..fd18faaa1d 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.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 6ae4a33f7c..e84a0e49db 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 @@ 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 01a034fabc..a38dd51837 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 16f60bc1d4..7a841434a4 100644 --- a/ranger-examples/distro/src/main/assembly/plugin-sampleapp.xml +++ b/ranger-examples/distro/src/main/assembly/plugin-sampleapp.xml @@ -42,7 +42,6 @@ commons-configuration:commons-configuration:jar:${commons.configuration.version} commons-io:commons-io:jar:${commons.io.version} commons-lang:commons-lang:jar:${commons.lang.version} - com.google.guava:guava:jar:${google.guava.version} org.codehaus.jackson:jackson-jaxrs:jar:${codehaus.jackson.storm.version} org.codehaus.jackson:jackson-core-asl:jar:${codehaus.jackson.storm.version} org.codehaus.jackson:jackson-mapper-asl:jar:${codehaus.jackson.storm.version} diff --git a/ranger-examples/distro/src/main/assembly/sample-client.xml b/ranger-examples/distro/src/main/assembly/sample-client.xml index 681df2f6ae..de83545e93 100644 --- a/ranger-examples/distro/src/main/assembly/sample-client.xml +++ b/ranger-examples/distro/src/main/assembly/sample-client.xml @@ -50,7 +50,6 @@ commons-collections:commons-collections com.sun.jersey:jersey-bundle commons-io:commons-io - com.google.guava:guava:jar:${google.guava.version} org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version} org.noggit:noggit:jar:${noggit.version} org.codehaus.jackson:jackson-core-asl diff --git a/ranger-examples/plugin-sampleapp/pom.xml b/ranger-examples/plugin-sampleapp/pom.xml index d9823cd7bd..d0d44023e6 100644 --- a/ranger-examples/plugin-sampleapp/pom.xml +++ b/ranger-examples/plugin-sampleapp/pom.xml @@ -113,10 +113,5 @@ com.google.code.gson gson - - com.google.guava - guava - ${google.guava.version} - diff --git a/ranger-examples/sample-client/pom.xml b/ranger-examples/sample-client/pom.xml index e87844acdf..0e53f654c3 100644 --- a/ranger-examples/sample-client/pom.xml +++ b/ranger-examples/sample-client/pom.xml @@ -50,11 +50,6 @@ commons-cli ${commons.cli.version} - - com.google.guava - guava - ${google.guava.version} - org.slf4j log4j-over-slf4j diff --git a/ranger-presto-plugin-shim/pom.xml b/ranger-presto-plugin-shim/pom.xml index 6cd835b7f3..86fdc7b6b5 100644 --- a/ranger-presto-plugin-shim/pom.xml +++ b/ranger-presto-plugin-shim/pom.xml @@ -65,12 +65,6 @@ - - com.google.guava - guava - ${presto.guava.version} - - com.google.inject guice 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 e446ada030..3e8f53ddee 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 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 cef7bd9591..8c113659ff 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.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.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 187d202277..d319908db2 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.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.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 5ca5028d9c..d77f7aaf09 100644 --- a/security-admin/pom.xml +++ b/security-admin/pom.xml @@ -169,11 +169,6 @@ javax.persistence ${javax.persistence.version} - - com.google.guava - guava - ${google.guava.version} - net.htmlparser.jericho jericho-html 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 3adb7794ad..0501bebc3b 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.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -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 @@ private String[] createProvider(String dbKmsUrl, String uri) throws IOException, 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 a8234325b6..2fd5106f2f 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.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.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.support.TransactionCallback; import org.springframework.transaction.support.TransactionTemplate; -import com.google.common.base.Joiner; import static org.apache.ranger.db.XXGlobalStateDao.RANGER_GLOBAL_STATE_NAME_GDS; 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 b5c47d3e91..6ff9f0deb2 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 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.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 8f87d26fa0..dab430bfd2 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.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.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 29c1bcdef4..a6f54dea14 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.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 694976d680..9285ae756a 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.Map; import org.apache.commons.lang.StringUtils; +import org.apache.hadoop.thirdparty.com.google.common.base.Joiner; import org.apache.ranger.biz.GdsDBStore; import org.apache.ranger.biz.ServiceDBStore; import org.apache.ranger.db.XXServiceVersionInfoDao; @@ -38,7 +39,6 @@ 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 9cf352880a..3d5ddafe3e 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.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.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 fd42090b1e..e7094a0264 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.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.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 a1445fdd8b..c8960b3f8a 100644 --- a/tagsync/pom.xml +++ b/tagsync/pom.xml @@ -299,11 +299,6 @@ ranger-common-ha ${project.version} - - com.google.guava - guava - ${google.guava.version} - diff --git a/ugsync/pom.xml b/ugsync/pom.xml index 54f793aa34..823240706d 100644 --- a/ugsync/pom.xml +++ b/ugsync/pom.xml @@ -88,11 +88,6 @@ log4j-to-slf4j ${log4j2.version} - - com.google.guava - guava - ${google.guava.version} - org.apache.hadoop hadoop-auth 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 b1a6af1838..cce3064721 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 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.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 5525305b70..23fcb879aa 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.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 c7fc6f33ed..90384b4601 100644 --- a/unixauthclient/pom.xml +++ b/unixauthclient/pom.xml @@ -68,11 +68,6 @@ commons-text ${commons.text.version} - - com.google.guava - guava - ${google.guava.version} - org.apache.hadoop hadoop-auth diff --git a/unixauthservice/pom.xml b/unixauthservice/pom.xml index c26738ff65..471a02ed6d 100644 --- a/unixauthservice/pom.xml +++ b/unixauthservice/pom.xml @@ -73,11 +73,6 @@ commons-lang ${commons.lang.version} - - com.google.guava - guava - ${google.guava.version} - org.apache.hadoop hadoop-auth