This is an automated email from the ASF dual-hosted git repository.
pradeep pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/master by this push:
new 4eb8401 RANGER-3653: Replace aws java sdk bom dependencies with
bundled dependencies
4eb8401 is described below
commit 4eb8401215549c169f7fb9726eb21527e3f4e151
Author: pradeep <[email protected]>
AuthorDate: Fri Mar 4 16:36:43 2022 +0530
RANGER-3653: Replace aws java sdk bom dependencies with bundled dependencies
---
agents-audit/pom.xml | 14 ++------------
.../destination/AmazonCloudWatchAuditDestination.java | 2 +-
agents-common/pom.xml | 5 +++++
.../hadoop/config/RangerChainedPluginConfig.java | 2 +-
.../ranger/plugin/model/RangerPolicyResourceSignature.java | 2 +-
.../nifi/registry/client/NiFiRegistryConnectionMgr.java | 2 +-
.../ranger/services/nifi/client/NiFiConnectionMgr.java | 2 +-
pom.xml | 2 +-
security-admin/pom.xml | 14 ++------------
.../org/apache/ranger/amazon/cloudwatch/CloudWatchMgr.java | 2 +-
.../apache/ranger/amazon/cloudwatch/CloudWatchUtil.java | 2 +-
.../patch/PatchForHBaseDefaultPolicyUpdate_J10045.java | 2 +-
.../apache/ranger/patch/cliutil/ChangePasswordUtil.java | 2 +-
.../apache/ranger/patch/cliutil/ChangeUserNameUtil.java | 2 +-
.../src/main/java/org/apache/ranger/rest/RoleREST.java | 2 +-
15 files changed, 21 insertions(+), 36 deletions(-)
diff --git a/agents-audit/pom.xml b/agents-audit/pom.xml
index f322210..3f261b3 100644
--- a/agents-audit/pom.xml
+++ b/agents-audit/pom.xml
@@ -31,17 +31,6 @@
<version>3.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk-bom</artifactId>
- <version>${com.amazonaws.aws-java-sdk-bom.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.ranger</groupId>
@@ -356,7 +345,8 @@
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk-logs</artifactId>
+ <artifactId>aws-java-sdk-bundle</artifactId>
+ <version>${aws-java-sdk.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git
a/agents-audit/src/main/java/org/apache/ranger/audit/destination/AmazonCloudWatchAuditDestination.java
b/agents-audit/src/main/java/org/apache/ranger/audit/destination/AmazonCloudWatchAuditDestination.java
index 6758e21..e8ea2ba 100644
---
a/agents-audit/src/main/java/org/apache/ranger/audit/destination/AmazonCloudWatchAuditDestination.java
+++
b/agents-audit/src/main/java/org/apache/ranger/audit/destination/AmazonCloudWatchAuditDestination.java
@@ -33,7 +33,7 @@ import com.amazonaws.services.logs.model.PutLogEventsRequest;
import com.amazonaws.services.logs.model.PutLogEventsResult;
import com.amazonaws.services.logs.model.ResourceNotFoundException;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.ranger.audit.model.AuditEventBase;
import org.apache.ranger.audit.provider.MiscUtil;
import org.slf4j.Logger;
diff --git a/agents-common/pom.xml b/agents-common/pom.xml
index ac7fe6f..b4ab454 100644
--- a/agents-common/pom.xml
+++ b/agents-common/pom.xml
@@ -111,6 +111,11 @@
</dependency>
<dependency>
<groupId>org.apache.ranger</groupId>
+ <artifactId>ranger-plugins-cred</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ranger</groupId>
<artifactId>ranger-plugins-audit</artifactId>
<version>${project.version}</version>
</dependency>
diff --git
a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerChainedPluginConfig.java
b/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerChainedPluginConfig.java
index 8507e99..ae8f01f 100644
---
a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerChainedPluginConfig.java
+++
b/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerChainedPluginConfig.java
@@ -19,7 +19,7 @@
package org.apache.ranger.authorization.hadoop.config;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicyResourceSignature.java
b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicyResourceSignature.java
index 260a3b8..02d0a86 100644
---
a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicyResourceSignature.java
+++
b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicyResourceSignature.java
@@ -32,7 +32,7 @@ import org.apache.commons.collections.MapUtils;
import org.apache.ranger.authorization.hadoop.config.RangerAdminConfig;
import org.apache.ranger.plugin.model.RangerPolicy.RangerPolicyResource;
import org.apache.ranger.plugin.model.RangerPolicy.RangerPolicyItemCondition;
-import org.apache.solr.common.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/plugin-nifi-registry/src/main/java/org/apache/ranger/services/nifi/registry/client/NiFiRegistryConnectionMgr.java
b/plugin-nifi-registry/src/main/java/org/apache/ranger/services/nifi/registry/client/NiFiRegistryConnectionMgr.java
index e4851c5..99eeced 100644
---
a/plugin-nifi-registry/src/main/java/org/apache/ranger/services/nifi/registry/client/NiFiRegistryConnectionMgr.java
+++
b/plugin-nifi-registry/src/main/java/org/apache/ranger/services/nifi/registry/client/NiFiRegistryConnectionMgr.java
@@ -19,7 +19,7 @@
package org.apache.ranger.services.nifi.registry.client;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.ranger.plugin.client.BaseClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/plugin-nifi/src/main/java/org/apache/ranger/services/nifi/client/NiFiConnectionMgr.java
b/plugin-nifi/src/main/java/org/apache/ranger/services/nifi/client/NiFiConnectionMgr.java
index 34392fc..8a2577c 100644
---
a/plugin-nifi/src/main/java/org/apache/ranger/services/nifi/client/NiFiConnectionMgr.java
+++
b/plugin-nifi/src/main/java/org/apache/ranger/services/nifi/client/NiFiConnectionMgr.java
@@ -19,7 +19,7 @@
package org.apache.ranger.services.nifi.client;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.ranger.plugin.client.BaseClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pom.xml b/pom.xml
index 69f8add..49a0641 100644
--- a/pom.xml
+++ b/pom.xml
@@ -233,7 +233,7 @@
<joda.time.version>2.10.6</joda.time.version>
<jsonsmart.version>2.3.1</jsonsmart.version>
<nimbus-jose-jwt.version>8.22.1</nimbus-jose-jwt.version>
-
<com.amazonaws.aws-java-sdk-bom.version>1.12.125</com.amazonaws.aws-java-sdk-bom.version>
+ <aws-java-sdk.version>1.12.125</aws-java-sdk.version>
<!-- GCP HSM -->
<google.cloud.kms>2.3.0</google.cloud.kms>
diff --git a/security-admin/pom.xml b/security-admin/pom.xml
index 9b784d3..a2060e1 100644
--- a/security-admin/pom.xml
+++ b/security-admin/pom.xml
@@ -29,17 +29,6 @@
<properties>
<skipJSTests>false</skipJSTests>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk-bom</artifactId>
- <version>${com.amazonaws.aws-java-sdk-bom.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
<dependencies>
<dependency>
<groupId>org.antlr</groupId>
@@ -742,7 +731,8 @@
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk-logs</artifactId>
+ <artifactId>aws-java-sdk-bundle</artifactId>
+ <version>${aws-java-sdk.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git
a/security-admin/src/main/java/org/apache/ranger/amazon/cloudwatch/CloudWatchMgr.java
b/security-admin/src/main/java/org/apache/ranger/amazon/cloudwatch/CloudWatchMgr.java
index 82325d1..4dcc6b2 100644
---
a/security-admin/src/main/java/org/apache/ranger/amazon/cloudwatch/CloudWatchMgr.java
+++
b/security-admin/src/main/java/org/apache/ranger/amazon/cloudwatch/CloudWatchMgr.java
@@ -22,7 +22,7 @@ package org.apache.ranger.amazon.cloudwatch;
import static
org.apache.ranger.audit.destination.AmazonCloudWatchAuditDestination.CONFIG_PREFIX;
import static
org.apache.ranger.audit.destination.AmazonCloudWatchAuditDestination.PROP_REGION;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.ranger.common.PropertiesUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/security-admin/src/main/java/org/apache/ranger/amazon/cloudwatch/CloudWatchUtil.java
b/security-admin/src/main/java/org/apache/ranger/amazon/cloudwatch/CloudWatchUtil.java
index ab5ccf6..b7d3cad 100644
---
a/security-admin/src/main/java/org/apache/ranger/amazon/cloudwatch/CloudWatchUtil.java
+++
b/security-admin/src/main/java/org/apache/ranger/amazon/cloudwatch/CloudWatchUtil.java
@@ -33,7 +33,7 @@ import java.util.TimeZone;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.time.DateUtils;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.ranger.common.PropertiesUtil;
import org.apache.ranger.common.SearchCriteria;
import org.apache.ranger.common.SearchField;
diff --git
a/security-admin/src/main/java/org/apache/ranger/patch/PatchForHBaseDefaultPolicyUpdate_J10045.java
b/security-admin/src/main/java/org/apache/ranger/patch/PatchForHBaseDefaultPolicyUpdate_J10045.java
index 2c246e7..302a266 100644
---
a/security-admin/src/main/java/org/apache/ranger/patch/PatchForHBaseDefaultPolicyUpdate_J10045.java
+++
b/security-admin/src/main/java/org/apache/ranger/patch/PatchForHBaseDefaultPolicyUpdate_J10045.java
@@ -27,7 +27,7 @@ import org.apache.ranger.plugin.model.RangerServiceDef;
import org.apache.ranger.plugin.store.EmbeddedServiceDefsUtil;
import org.apache.ranger.plugin.util.SearchFilter;
import org.apache.ranger.util.CLIUtil;
-import org.apache.solr.common.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git
a/security-admin/src/main/java/org/apache/ranger/patch/cliutil/ChangePasswordUtil.java
b/security-admin/src/main/java/org/apache/ranger/patch/cliutil/ChangePasswordUtil.java
index 0cc4fe2..9f86bf3 100644
---
a/security-admin/src/main/java/org/apache/ranger/patch/cliutil/ChangePasswordUtil.java
+++
b/security-admin/src/main/java/org/apache/ranger/patch/cliutil/ChangePasswordUtil.java
@@ -25,7 +25,7 @@ import org.apache.ranger.db.RangerDaoManager;
import org.apache.ranger.entity.XXPortalUser;
import org.apache.ranger.patch.BaseLoader;
import org.apache.ranger.util.CLIUtil;
-import org.apache.solr.common.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git
a/security-admin/src/main/java/org/apache/ranger/patch/cliutil/ChangeUserNameUtil.java
b/security-admin/src/main/java/org/apache/ranger/patch/cliutil/ChangeUserNameUtil.java
index 1fa5bf3..4be81d6 100644
---
a/security-admin/src/main/java/org/apache/ranger/patch/cliutil/ChangeUserNameUtil.java
+++
b/security-admin/src/main/java/org/apache/ranger/patch/cliutil/ChangeUserNameUtil.java
@@ -23,7 +23,7 @@ import org.apache.ranger.db.RangerDaoManager;
import org.apache.ranger.entity.XXPortalUser;
import org.apache.ranger.patch.BaseLoader;
import org.apache.ranger.util.CLIUtil;
-import org.apache.solr.common.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/security-admin/src/main/java/org/apache/ranger/rest/RoleREST.java
b/security-admin/src/main/java/org/apache/ranger/rest/RoleREST.java
index e3cdef1..11a2b3e 100644
--- a/security-admin/src/main/java/org/apache/ranger/rest/RoleREST.java
+++ b/security-admin/src/main/java/org/apache/ranger/rest/RoleREST.java
@@ -31,7 +31,7 @@ import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.*;
import javax.ws.rs.core.Context;
-import org.apache.commons.codec.binary.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.collections.CollectionUtils;
import org.apache.ranger.admin.client.datatype.RESTResponse;
import org.apache.ranger.authorization.utils.StringUtil;
