You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by me...@apache.org on 2020/12/03 08:05:51 UTC
[ranger] branch master updated: RANGER-3089: Ranger Setup issue fix
This is an automated email from the ASF dual-hosted git repository.
mehul 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 4542ec6 RANGER-3089: Ranger Setup issue fix
4542ec6 is described below
commit 4542ec6d613f6e27dedde34b83b0c6f9d157c9e1
Author: Kishor Gollapalliwar <ki...@gmail.com>
AuthorDate: Thu Nov 26 14:25:37 2020 +0530
RANGER-3089: Ranger Setup issue fix
Signed-off-by: Mehul Parikh <me...@apache.org>
---
credentialbuilder/pom.xml | 15 ++++
distro/src/main/assembly/admin-web.xml | 2 +
distro/src/main/assembly/kms.xml | 6 +-
distro/src/main/assembly/tagsync.xml | 1 +
distro/src/main/assembly/usersync.xml | 2 +
embeddedwebserver/pom.xml | 5 ++
kms/pom.xml | 157 +++++++++++++++++++++------------
security-admin/pom.xml | 137 +++++++++++++++-------------
tagsync/pom.xml | 4 +
9 files changed, 212 insertions(+), 117 deletions(-)
diff --git a/credentialbuilder/pom.xml b/credentialbuilder/pom.xml
index b59d978..59d239b 100644
--- a/credentialbuilder/pom.xml
+++ b/credentialbuilder/pom.xml
@@ -71,11 +71,26 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-auth</artifactId>
<version>${hadoop.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ <version>${commons.compress.version}</version>
+ </dependency>
</dependencies>
</project>
diff --git a/distro/src/main/assembly/admin-web.xml b/distro/src/main/assembly/admin-web.xml
index 872747a..3a438d7 100644
--- a/distro/src/main/assembly/admin-web.xml
+++ b/distro/src/main/assembly/admin-web.xml
@@ -270,6 +270,7 @@
<include>joda-time:joda-time</include>
<include>org.apache.ranger:ranger-plugins-cred</include>
<include>org.apache.ranger:ugsyn-util</include>
+ <include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
</includes>
</binaries>
</moduleSet>
@@ -301,6 +302,7 @@
<include>com.fasterxml.woodstox:woodstox-core:jar:${fasterxml.woodstox.version}</include>
<include>org.codehaus.woodstox:stax2-api:jar:${codehaus.woodstox.stax2api.version}</include>
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
+ <include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
</includes>
</binaries>
</moduleSet>
diff --git a/distro/src/main/assembly/kms.xml b/distro/src/main/assembly/kms.xml
index 2c68d6a..f6b0d92 100755
--- a/distro/src/main/assembly/kms.xml
+++ b/distro/src/main/assembly/kms.xml
@@ -70,7 +70,7 @@
<include>commons-beanutils:commons-beanutils</include>
<include>commons-cli:commons-cli</include>
<include>commons-codec:commons-codec:jar:${commons.codec.version}</include>
- <include>org.apache.commons:commons-compress</include>
+ <include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
<include>org.apache.commons:commons-configuration2</include>
<include>commons-digester:commons-digester</include>
<include>commons-io:commons-io</include>
@@ -199,6 +199,8 @@
<include>net.java.dev.jna:jna:jar:${jna.version}</include>
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
<include>org.apache.ranger:credentialbuilder</include>
+ <include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
+ <include>org.apache.commons:commons-lang3</include>
</includes>
</binaries>
</moduleSet>
@@ -351,6 +353,8 @@
<include>org.apache.htrace:htrace-core4</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>com.fasterxml.woodstox:woodstox-core</include>
+ <include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
+ <include>org.apache.commons:commons-lang3</include>
</includes>
</binaries>
</moduleSet>
diff --git a/distro/src/main/assembly/tagsync.xml b/distro/src/main/assembly/tagsync.xml
index 1abb2d5..82d716f 100644
--- a/distro/src/main/assembly/tagsync.xml
+++ b/distro/src/main/assembly/tagsync.xml
@@ -93,6 +93,7 @@
<include>org.codehaus.woodstox:stax2-api:jar:${codehaus.woodstox.stax2api.version}</include>
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
<include>org.cloudera.logredactor:logredactor</include>
+ <include>org.apache.commons:commons-lang3</include>
</includes>
</dependencySet>
</dependencySets>
diff --git a/distro/src/main/assembly/usersync.xml b/distro/src/main/assembly/usersync.xml
index 3fb1a53..5279f65 100644
--- a/distro/src/main/assembly/usersync.xml
+++ b/distro/src/main/assembly/usersync.xml
@@ -81,6 +81,8 @@
<include>org.codehaus.jackson:jackson-jaxrs:jar:${codehaus.jackson.version}</include>
<include>org.codehaus.jettison:jettison:jar:${jettison.version}</include>
<include>org.codehaus.jackson:jackson-xc:jar:${codehaus.jackson.version}</include>
+ <include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
+ <include>org.apache.commons:commons-lang3</include>
</includes>
</dependencySet>
<dependencySet>
diff --git a/embeddedwebserver/pom.xml b/embeddedwebserver/pom.xml
index e00f5a1..a982f84 100644
--- a/embeddedwebserver/pom.xml
+++ b/embeddedwebserver/pom.xml
@@ -93,5 +93,10 @@
<artifactId>commons-lang3</artifactId>
<version>${commons.lang3.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ <version>${commons.compress.version}</version>
+ </dependency>
</dependencies>
</project>
diff --git a/kms/pom.xml b/kms/pom.xml
index e2936b6..66d6e36 100644
--- a/kms/pom.xml
+++ b/kms/pom.xml
@@ -32,25 +32,35 @@
<artifactId>hadoop-kms</artifactId>
<version>${hadoop.version}</version>
</dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>${fasterxml.jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>${fasterxml.jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>${fasterxml.jackson.databind.version}</version>
- </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${fasterxml.jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${fasterxml.jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${fasterxml.jackson.databind.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -143,6 +153,16 @@
<version>${hadoop.version}</version>
<scope>test</scope>
<type>test-jar</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -285,45 +305,69 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.microsoft.azure</groupId>
- <artifactId>azure</artifactId>
- <version>${com.microsoft.azure.version}</version>
- </dependency>
- <dependency>
- <groupId>com.microsoft.azure</groupId>
- <artifactId>azure-keyvault</artifactId>
- <version>${com.microsoft.azure.azure-keyvault.version}</version>
- </dependency>
- <dependency>
- <groupId>com.microsoft.azure</groupId>
- <artifactId>azure-mgmt-keyvault</artifactId>
- <version>${com.microsoft.azure.azure-mgmt-keyvault.version}</version>
- </dependency>
- <dependency>
- <groupId>com.microsoft.rest</groupId>
- <artifactId>client-runtime</artifactId>
- <version>${com.microsoft.rest.client-runtime.version}</version>
- </dependency>
- <dependency>
- <groupId>com.microsoft.azure</groupId>
- <artifactId>azure-client-runtime</artifactId>
- <version>${com.microsoft.azure.azure-client-runtime.version}</version>
- </dependency>
- <dependency>
- <groupId>com.microsoft.azure</groupId>
- <artifactId>adal4j</artifactId>
- <version>${com.microsoft.azure.adal4j.version}</version>
- </dependency>
- <dependency>
- <groupId>io.reactivex</groupId>
- <artifactId>rxjava</artifactId>
- <version>${io.reactivex.rxjava.version}</version>
- </dependency>
- <dependency>
- <groupId>net.minidev</groupId>
- <artifactId>asm</artifactId>
- <version>${net.minidev.asm.version}</version>
- </dependency>
+ <groupId>com.microsoft.azure</groupId>
+ <artifactId>azure</artifactId>
+ <version>${com.microsoft.azure.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.microsoft.azure</groupId>
+ <artifactId>azure-keyvault</artifactId>
+ <version>${com.microsoft.azure.azure-keyvault.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.microsoft.azure</groupId>
+ <artifactId>azure-mgmt-keyvault</artifactId>
+ <version>${com.microsoft.azure.azure-mgmt-keyvault.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.microsoft.rest</groupId>
+ <artifactId>client-runtime</artifactId>
+ <version>${com.microsoft.rest.client-runtime.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.microsoft.azure</groupId>
+ <artifactId>azure-client-runtime</artifactId>
+ <version>${com.microsoft.azure.azure-client-runtime.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.microsoft.azure</groupId>
+ <artifactId>adal4j</artifactId>
+ <version>${com.microsoft.azure.adal4j.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.reactivex</groupId>
+ <artifactId>rxjava</artifactId>
+ <version>${io.reactivex.rxjava.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.minidev</groupId>
+ <artifactId>asm</artifactId>
+ <version>${net.minidev.asm.version}</version>
+ </dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
@@ -353,6 +397,11 @@
<artifactId>commons-codec</artifactId>
<version>${commons.codec.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${commons.lang3.version}</version>
+ </dependency>
</dependencies>
<build>
<pluginManagement>
diff --git a/security-admin/pom.xml b/security-admin/pom.xml
index 72e8018..865a42e 100644
--- a/security-admin/pom.xml
+++ b/security-admin/pom.xml
@@ -74,6 +74,12 @@
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>${poi.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
@@ -260,32 +266,36 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-core</artifactId>
- <version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>${fasterxml.jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>${fasterxml.jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>${fasterxml.jackson.databind.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-core</artifactId>
+ <version>${hadoop.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${fasterxml.jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${fasterxml.jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${fasterxml.jackson.databind.version}</version>
+ </dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-multipart</artifactId>
@@ -401,11 +411,7 @@
<artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version>
<exclusions>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- </exclusion>
- <exclusion>
+ <exclusion>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</exclusion>
@@ -469,13 +475,21 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- <version>${netty-all.version}</version>
- </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ <version>${netty-all.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
@@ -546,17 +560,17 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>com.webcohesion.enunciate</groupId>
- <artifactId>enunciate-core-annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <dependency>
+ <groupId>com.webcohesion.enunciate</groupId>
+ <artifactId>enunciate-core-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${fasterxml.jackson.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.hbase.thirdparty</groupId>
<artifactId>hbase-shaded-protobuf</artifactId>
<version>${hbase-shaded-protobuf}</version>
@@ -576,7 +590,7 @@
<artifactId>zookeeper</artifactId>
<version>${zookeeper.version}</version>
</dependency>
- </dependencies>
+ </dependencies>
<build>
<pluginManagement>
<plugins>
@@ -623,13 +637,12 @@
<goal>war</goal>
</goals>
<configuration>
- <packagingExcludes>
- WEB-INF/lib/spring-*.SEC03.jar,
- WEB-INF/lib/spring-*.RC3.jar,
- WEB-INF/lib/spring-2.*.jar,
- WEB-INF/lib/jetty-*.jar,
- WEB-INF/lib/commons-compress-*.jar
- </packagingExcludes>
+ <packagingExcludes>
+ WEB-INF/lib/spring-*.SEC03.jar,
+ WEB-INF/lib/spring-*.RC3.jar,
+ WEB-INF/lib/spring-2.*.jar,
+ WEB-INF/lib/jetty-*.jar
+ </packagingExcludes>
<warSourceDirectory>${project.build.directory}/${project.build.finalName}</warSourceDirectory>
</configuration>
</execution>
@@ -669,13 +682,13 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>com.webcohesion.enunciate</groupId>
- <artifactId>enunciate-maven-plugin</artifactId>
- <configuration>
- <configFile>${basedir}/../enunciate.xml</configFile>
- <docsDir>${basedir}/../docs/target/</docsDir>
- </configuration>
+ <plugin>
+ <groupId>com.webcohesion.enunciate</groupId>
+ <artifactId>enunciate-maven-plugin</artifactId>
+ <configuration>
+ <configFile>${basedir}/../enunciate.xml</configFile>
+ <docsDir>${basedir}/../docs/target/</docsDir>
+ </configuration>
<dependencies>
<!-- dependency management version doesn't apply here, need to repeat the version numbers -->
<dependency>
@@ -689,7 +702,7 @@
<version>1.1</version>
</dependency>
</dependencies>
- </plugin>
+ </plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.7</version>
diff --git a/tagsync/pom.xml b/tagsync/pom.xml
index eb79078..982e0f3 100644
--- a/tagsync/pom.xml
+++ b/tagsync/pom.xml
@@ -120,6 +120,10 @@
<version>${atlas.version}</version>
<exclusions>
<exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.apache.kafka</groupId>
<artifactId>*</artifactId>
</exclusion>