This is an automated email from the ASF dual-hosted git repository.
madhan pushed a commit to branch ranger-2.5
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/ranger-2.5 by this push:
new 0cde55e17 RANGER-4729: upgraded commons-compress to 1.26.0 - removed
duplicate dependencies in pom.xml
0cde55e17 is described below
commit 0cde55e170d74d73c43293cb7ba2da6accfe40ce
Author: Rakesh Gupta <[email protected]>
AuthorDate: Wed Jul 10 18:41:20 2024 +0530
RANGER-4729: upgraded commons-compress to 1.26.0
- removed duplicate dependencies in pom.xml
Signed-off-by: Madhan Neethiraj <[email protected]>
(cherry picked from commit 8953190fb3766caf0a6c4a92e43ba1c70d73d854)
---
agents-audit/pom.xml | 10 +++-----
agents-common/pom.xml | 4 +++
agents-cred/pom.xml | 9 +++++++
credentialbuilder/pom.xml | 6 -----
distro/src/main/assembly/admin-web.xml | 2 +-
hbase-agent/pom.xml | 42 +++-----------------------------
hdfs-agent/pom.xml | 4 +++
hive-agent/pom.xml | 8 ++++++
kms/pom.xml | 15 ------------
plugin-schema-registry/pom.xml | 4 +++
pom.xml | 2 +-
ranger-authn/pom.xml | 4 +++
ranger-common-ha/pom.xml | 4 +++
ranger-examples/plugin-sampleapp/pom.xml | 4 +++
ranger-hbase-plugin-shim/pom.xml | 4 +++
ranger-hdfs-plugin-shim/pom.xml | 4 +++
ranger-hive-plugin-shim/pom.xml | 8 ++++++
ranger-metrics/pom.xml | 4 +++
security-admin/pom.xml | 20 ---------------
19 files changed, 71 insertions(+), 87 deletions(-)
diff --git a/agents-audit/pom.xml b/agents-audit/pom.xml
index 1dc717450..edfafedbb 100644
--- a/agents-audit/pom.xml
+++ b/agents-audit/pom.xml
@@ -79,6 +79,10 @@
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -346,12 +350,6 @@
<artifactId>*</artifactId>
</exclusion>
</exclusions>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.orc</groupId>
diff --git a/agents-common/pom.xml b/agents-common/pom.xml
index 8367efb77..ff68a298d 100644
--- a/agents-common/pom.xml
+++ b/agents-common/pom.xml
@@ -101,6 +101,10 @@
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/agents-cred/pom.xml b/agents-cred/pom.xml
index f1044be01..eeb3fc786 100644
--- a/agents-cred/pom.xml
+++ b/agents-cred/pom.xml
@@ -79,6 +79,10 @@
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -96,6 +100,11 @@
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ <version>${commons.compress.version}</version>
+ </dependency>
<!-- Test -->
<dependency>
diff --git a/credentialbuilder/pom.xml b/credentialbuilder/pom.xml
index 8ada454c0..14a79da7a 100644
--- a/credentialbuilder/pom.xml
+++ b/credentialbuilder/pom.xml
@@ -127,12 +127,6 @@
<artifactId>commons-compress</artifactId>
<version>${commons.compress.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
diff --git a/distro/src/main/assembly/admin-web.xml
b/distro/src/main/assembly/admin-web.xml
index 55675afad..4cc4b00ac 100644
--- a/distro/src/main/assembly/admin-web.xml
+++ b/distro/src/main/assembly/admin-web.xml
@@ -187,7 +187,7 @@
<include>org.apache.ratis:ratis-common:jar:${ratis.version}</include>
<include>org.apache.ratis:ratis-proto:jar:${ratis.version}</include>
<include>org.apache.ratis:ratis-thirdparty-misc:jar:${ratis-thirdparty.version}</include>
- <include>org.apache.commons:commons-compress:jar:1.4.1</include>
+
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
<include>org.bouncycastle:bcpkix-jdk15on:jar:${org.bouncycastle.bcpkix-jdk15on}</include>
<include>commons-net:commons-net:jar:${commons.net.version}</include>
<include>io.jaegertracing:jaeger-core:jar:1.6.0</include>
diff --git a/hbase-agent/pom.xml b/hbase-agent/pom.xml
index 0701382db..31468d231 100644
--- a/hbase-agent/pom.xml
+++ b/hbase-agent/pom.xml
@@ -154,6 +154,10 @@
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -310,44 +314,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-text</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-configuration2</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-text</artifactId>
- <version>${commons.text.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-configuration2</artifactId>
- <version>${commons.configuration.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.el</artifactId>
- <version>${javax.el.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-auth</artifactId>
diff --git a/hdfs-agent/pom.xml b/hdfs-agent/pom.xml
index d7b4f85f8..8aed480b8 100644
--- a/hdfs-agent/pom.xml
+++ b/hdfs-agent/pom.xml
@@ -61,6 +61,10 @@
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/hive-agent/pom.xml b/hive-agent/pom.xml
index 0e4c94c52..14ed99cbf 100644
--- a/hive-agent/pom.xml
+++ b/hive-agent/pom.xml
@@ -53,6 +53,10 @@
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -103,6 +107,10 @@
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/kms/pom.xml b/kms/pom.xml
index 73f87937f..0786dad41 100644
--- a/kms/pom.xml
+++ b/kms/pom.xml
@@ -535,21 +535,6 @@
<artifactId>nimbus-jose-jwt</artifactId>
<version>${nimbus-jose-jwt.version}</version>
</dependency>
- <dependency>
- <groupId>com.google.cloud</groupId>
- <artifactId>google-cloud-kms</artifactId>
- <version>${google.cloud.kms}</version>
- </dependency>
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>${gcp.protobuf-java.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java-util</artifactId>
- <version>${gcp.protobuf-java.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.ranger</groupId>
<artifactId>ranger-metrics</artifactId>
diff --git a/plugin-schema-registry/pom.xml b/plugin-schema-registry/pom.xml
index ff208a3b1..d11478f20 100644
--- a/plugin-schema-registry/pom.xml
+++ b/plugin-schema-registry/pom.xml
@@ -162,6 +162,10 @@
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index a9c1368e1..e2ebdd427 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,7 +95,7 @@
<commons.cli.version>1.2</commons.cli.version>
<commons.codec.version>1.15</commons.codec.version>
<commons.collections.version>3.2.2</commons.collections.version>
- <commons.compress.version>1.21</commons.compress.version>
+ <commons.compress.version>1.26.0</commons.compress.version>
<commons.configuration1.version>1.10</commons.configuration1.version>
<commons.configuration.version>2.8.0</commons.configuration.version>
<commons.dbcp.version>1.4</commons.dbcp.version>
diff --git a/ranger-authn/pom.xml b/ranger-authn/pom.xml
index a5d900e70..b1dbce43e 100644
--- a/ranger-authn/pom.xml
+++ b/ranger-authn/pom.xml
@@ -42,6 +42,10 @@
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/ranger-common-ha/pom.xml b/ranger-common-ha/pom.xml
index 364ce7a0a..1379bfa88 100644
--- a/ranger-common-ha/pom.xml
+++ b/ranger-common-ha/pom.xml
@@ -88,6 +88,10 @@
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/ranger-examples/plugin-sampleapp/pom.xml
b/ranger-examples/plugin-sampleapp/pom.xml
index 21e178412..0204b67c9 100644
--- a/ranger-examples/plugin-sampleapp/pom.xml
+++ b/ranger-examples/plugin-sampleapp/pom.xml
@@ -66,6 +66,10 @@
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/ranger-hbase-plugin-shim/pom.xml b/ranger-hbase-plugin-shim/pom.xml
index 9d5c4fad2..f28508e06 100644
--- a/ranger-hbase-plugin-shim/pom.xml
+++ b/ranger-hbase-plugin-shim/pom.xml
@@ -60,6 +60,10 @@
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/ranger-hdfs-plugin-shim/pom.xml b/ranger-hdfs-plugin-shim/pom.xml
index 2db583caf..4e50002b4 100644
--- a/ranger-hdfs-plugin-shim/pom.xml
+++ b/ranger-hdfs-plugin-shim/pom.xml
@@ -60,6 +60,10 @@
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/ranger-hive-plugin-shim/pom.xml b/ranger-hive-plugin-shim/pom.xml
index 0a49d160c..cd023b110 100644
--- a/ranger-hive-plugin-shim/pom.xml
+++ b/ranger-hive-plugin-shim/pom.xml
@@ -48,6 +48,10 @@
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -98,6 +102,10 @@
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/ranger-metrics/pom.xml b/ranger-metrics/pom.xml
index 5929dc86b..630ef0673 100644
--- a/ranger-metrics/pom.xml
+++ b/ranger-metrics/pom.xml
@@ -51,6 +51,10 @@
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/security-admin/pom.xml b/security-admin/pom.xml
index 191176a33..d7d9ef4c0 100644
--- a/security-admin/pom.xml
+++ b/security-admin/pom.xml
@@ -765,26 +765,6 @@
<artifactId>aws-java-sdk-logs</artifactId>
<version>${aws-java-sdk.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>${log4j2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-to-slf4j</artifactId>
- <version>${log4j2.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.ranger</groupId>
<artifactId>ranger-authn</artifactId>
