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 adf6d128c RANGER-4873: updated zookeeper version from 3.5.3 to 3.9.2 (pull request #359) adf6d128c is described below commit adf6d128cc7550b5a0468ce900d89657f137fdb1 Author: Krzysztof Sobolewski <krzysztof.sobolew...@starburstdata.com> AuthorDate: Fri Jul 26 23:21:03 2024 +0200 RANGER-4873: updated zookeeper version from 3.5.3 to 3.9.2 (pull request #359) Co-authored-by: Madhan Neethiraj <mad...@apache.org> (cherry picked from commit 487457caa94cd7b2f62cd2b7e5710a6d4b3d20b0) --- agents-audit/pom.xml | 4 ++++ agents-common/pom.xml | 4 ++++ agents-cred/pom.xml | 4 ++++ credentialbuilder/pom.xml | 8 +++++++ hbase-agent/pom.xml | 28 +++++++++++++++++++++++ hdfs-agent/pom.xml | 8 +++++++ hive-agent/pom.xml | 24 ++++++++++++++++++++ kms/pom.xml | 4 ++++ knox-agent/pom.xml | 20 +++++++++++++++++ plugin-kafka/pom.xml | 38 ++++++++++++++++++++++++++++++++ plugin-kylin/pom.xml | 12 ++++++++++ plugin-presto/pom.xml | 4 ++++ plugin-solr/pom.xml | 8 +++++++ plugin-trino/pom.xml | 4 ++++ pom.xml | 2 +- ranger-common-ha/pom.xml | 10 +++++++++ ranger-examples/plugin-sampleapp/pom.xml | 4 ++++ ranger-hbase-plugin-shim/pom.xml | 4 ++++ ranger-hive-plugin-shim/pom.xml | 4 ++++ ranger-knox-plugin-shim/pom.xml | 4 ++++ ranger-presto-plugin-shim/pom.xml | 4 ++++ ranger-solr-plugin-shim/pom.xml | 8 +++++++ security-admin/pom.xml | 12 ++++++++++ storm-agent/pom.xml | 4 ++++ tagsync/pom.xml | 4 ++++ unixauthclient/pom.xml | 4 ++++ unixauthservice/pom.xml | 4 ++++ 27 files changed, 237 insertions(+), 1 deletion(-) diff --git a/agents-audit/pom.xml b/agents-audit/pom.xml index edfafedbb..e8f5c20b8 100644 --- a/agents-audit/pom.xml +++ b/agents-audit/pom.xml @@ -83,6 +83,10 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/agents-common/pom.xml b/agents-common/pom.xml index 7729ac81b..8c412c888 100644 --- a/agents-common/pom.xml +++ b/agents-common/pom.xml @@ -105,6 +105,10 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/agents-cred/pom.xml b/agents-cred/pom.xml index eeb3fc786..b8950319a 100644 --- a/agents-cred/pom.xml +++ b/agents-cred/pom.xml @@ -83,6 +83,10 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/credentialbuilder/pom.xml b/credentialbuilder/pom.xml index 14a79da7a..5317df429 100644 --- a/credentialbuilder/pom.xml +++ b/credentialbuilder/pom.xml @@ -100,6 +100,10 @@ <groupId>org.slf4j</groupId> <artifactId>*</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -120,6 +124,10 @@ <groupId>org.slf4j</groupId> <artifactId>*</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/hbase-agent/pom.xml b/hbase-agent/pom.xml index 1b9e0b84d..80da314cf 100644 --- a/hbase-agent/pom.xml +++ b/hbase-agent/pom.xml @@ -31,6 +31,22 @@ <version>2.5.0-SNAPSHOT</version> <relativePath>..</relativePath> </parent> + <dependencyManagement> + <dependencies> + <dependency> + <!-- for hbase-zookeeper --> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + <version>${zookeeper.version}</version> + <exclusions> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + </dependencyManagement> <dependencies> <dependency> <groupId>org.apache.hbase</groupId> @@ -61,6 +77,10 @@ <groupId>org.glassfish</groupId> <artifactId>javax.el</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -158,6 +178,10 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -239,6 +263,10 @@ <groupId>org.glassfish</groupId> <artifactId>javax.el</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/hdfs-agent/pom.xml b/hdfs-agent/pom.xml index 8aed480b8..af1a12188 100644 --- a/hdfs-agent/pom.xml +++ b/hdfs-agent/pom.xml @@ -65,6 +65,10 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -153,6 +157,10 @@ <groupId>org.slf4j</groupId> <artifactId>*</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/hive-agent/pom.xml b/hive-agent/pom.xml index aeed33739..6380f1fc0 100644 --- a/hive-agent/pom.xml +++ b/hive-agent/pom.xml @@ -57,6 +57,10 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -84,6 +88,10 @@ <groupId>org.glassfish</groupId> <artifactId>javax.el</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -111,6 +119,10 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -130,6 +142,14 @@ <groupId>io.netty</groupId> <artifactId>netty-common</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>*</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -141,6 +161,10 @@ <groupId>org.glassfish</groupId> <artifactId>javax.el</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/kms/pom.xml b/kms/pom.xml index 0786dad41..32220f4ec 100644 --- a/kms/pom.xml +++ b/kms/pom.xml @@ -481,6 +481,10 @@ <groupId>io.netty</groupId> <artifactId>netty</artifactId> </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>*</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/knox-agent/pom.xml b/knox-agent/pom.xml index 0bbd2ce9a..b3ae482e8 100644 --- a/knox-agent/pom.xml +++ b/knox-agent/pom.xml @@ -57,6 +57,10 @@ <groupId>net.minidev</groupId> <artifactId>json-smart</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -202,6 +206,14 @@ <groupId>org.slf4j</groupId> <artifactId>*</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper-jute</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -260,6 +272,14 @@ <groupId>log4j</groupId> <artifactId>*</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper-jute</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/plugin-kafka/pom.xml b/plugin-kafka/pom.xml index 6bd897d01..0214f6515 100644 --- a/plugin-kafka/pom.xml +++ b/plugin-kafka/pom.xml @@ -114,7 +114,39 @@ <groupId>io.netty</groupId> <artifactId>netty-transport-native-epoll</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + <version>${zookeeper.version}</version> + <exclusions> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty</artifactId> + </exclusion> + <exclusion> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs-annotations</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>*</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>*</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>*</artifactId> + </exclusion> </exclusions> + <scope>test</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -127,6 +159,12 @@ <artifactId>curator-test</artifactId> <version>${curator.test.version}</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.kerby</groupId> diff --git a/plugin-kylin/pom.xml b/plugin-kylin/pom.xml index d0cbb886d..1288f9b9f 100644 --- a/plugin-kylin/pom.xml +++ b/plugin-kylin/pom.xml @@ -117,6 +117,18 @@ <groupId>io.netty</groupId> <artifactId>netty-common</artifactId> </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>*</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper-jute</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/plugin-presto/pom.xml b/plugin-presto/pom.xml index 9431a68b7..da113e9a1 100644 --- a/plugin-presto/pom.xml +++ b/plugin-presto/pom.xml @@ -60,6 +60,10 @@ <groupId>org.slf4j</groupId> <artifactId>*</artifactId> </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>*</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/plugin-solr/pom.xml b/plugin-solr/pom.xml index 1f47225ec..1905b9600 100644 --- a/plugin-solr/pom.xml +++ b/plugin-solr/pom.xml @@ -99,6 +99,14 @@ <groupId>org.slf4j</groupId> <artifactId>*</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper-jute</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/plugin-trino/pom.xml b/plugin-trino/pom.xml index daa968c71..c00909021 100644 --- a/plugin-trino/pom.xml +++ b/plugin-trino/pom.xml @@ -245,6 +245,10 @@ <groupId>org.slf4j</groupId> <artifactId>*</artifactId> </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>*</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/pom.xml b/pom.xml index 61b85d9cb..8e4889a83 100644 --- a/pom.xml +++ b/pom.xml @@ -211,7 +211,7 @@ <tomcat.embed.version>8.5.94</tomcat.embed.version> <testng.version>7.5.1</testng.version> <velocity.version>2.3</velocity.version> - <zookeeper.version>3.5.5</zookeeper.version> + <zookeeper.version>3.9.2</zookeeper.version> <codehaus.woodstox.stax2api.version>4.2.1</codehaus.woodstox.stax2api.version> <fasterxml.woodstox.version>5.4.0</fasterxml.woodstox.version> <fasterxml.jackson.version>2.17.0</fasterxml.jackson.version> diff --git a/ranger-common-ha/pom.xml b/ranger-common-ha/pom.xml index 1379bfa88..4482c7f61 100644 --- a/ranger-common-ha/pom.xml +++ b/ranger-common-ha/pom.xml @@ -60,12 +60,22 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>*</artifactId> + </exclusion> </exclusions> </dependency> <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper-jute</artifactId> <version>${zookeeper.version}</version> + <exclusions> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> diff --git a/ranger-examples/plugin-sampleapp/pom.xml b/ranger-examples/plugin-sampleapp/pom.xml index 0204b67c9..8fb00fa36 100644 --- a/ranger-examples/plugin-sampleapp/pom.xml +++ b/ranger-examples/plugin-sampleapp/pom.xml @@ -70,6 +70,10 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/ranger-hbase-plugin-shim/pom.xml b/ranger-hbase-plugin-shim/pom.xml index f28508e06..efc59424c 100644 --- a/ranger-hbase-plugin-shim/pom.xml +++ b/ranger-hbase-plugin-shim/pom.xml @@ -64,6 +64,10 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/ranger-hive-plugin-shim/pom.xml b/ranger-hive-plugin-shim/pom.xml index d6c632b0a..e22c6b671 100644 --- a/ranger-hive-plugin-shim/pom.xml +++ b/ranger-hive-plugin-shim/pom.xml @@ -64,6 +64,10 @@ <groupId>org.apache.thrift</groupId> <artifactId>*</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/ranger-knox-plugin-shim/pom.xml b/ranger-knox-plugin-shim/pom.xml index 647942136..100574490 100644 --- a/ranger-knox-plugin-shim/pom.xml +++ b/ranger-knox-plugin-shim/pom.xml @@ -48,6 +48,10 @@ <groupId>net.minidev</groupId> <artifactId>json-smart</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/ranger-presto-plugin-shim/pom.xml b/ranger-presto-plugin-shim/pom.xml index 23dd49ea5..bf93fe463 100644 --- a/ranger-presto-plugin-shim/pom.xml +++ b/ranger-presto-plugin-shim/pom.xml @@ -130,6 +130,10 @@ <groupId>io.netty</groupId> <artifactId>netty</artifactId> </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>*</artifactId> + </exclusion> </exclusions> </dependency> diff --git a/ranger-solr-plugin-shim/pom.xml b/ranger-solr-plugin-shim/pom.xml index 4b9f4ca25..295a7d97b 100644 --- a/ranger-solr-plugin-shim/pom.xml +++ b/ranger-solr-plugin-shim/pom.xml @@ -99,6 +99,14 @@ <groupId>org.slf4j</groupId> <artifactId>*</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper-jute</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/security-admin/pom.xml b/security-admin/pom.xml index c4fa7b766..80a42abb8 100644 --- a/security-admin/pom.xml +++ b/security-admin/pom.xml @@ -389,6 +389,14 @@ <groupId>io.netty</groupId> <artifactId>netty-common</artifactId> </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>*</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper-jute</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -703,6 +711,10 @@ <groupId>com.github.spotbugs</groupId> <artifactId>spotbugs-annotations</artifactId> </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>*</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/storm-agent/pom.xml b/storm-agent/pom.xml index 100d68eac..fab962ff0 100644 --- a/storm-agent/pom.xml +++ b/storm-agent/pom.xml @@ -152,6 +152,10 @@ <groupId>org.slf4j</groupId> <artifactId>*</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/tagsync/pom.xml b/tagsync/pom.xml index a92f16432..ba0735451 100644 --- a/tagsync/pom.xml +++ b/tagsync/pom.xml @@ -242,6 +242,10 @@ <groupId>io.netty</groupId> <artifactId>netty</artifactId> </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>*</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/unixauthclient/pom.xml b/unixauthclient/pom.xml index ee1bcdc95..f9d5f82ea 100644 --- a/unixauthclient/pom.xml +++ b/unixauthclient/pom.xml @@ -85,6 +85,10 @@ <groupId>net.minidev</groupId> <artifactId>json-smart</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/unixauthservice/pom.xml b/unixauthservice/pom.xml index e3529d367..8e8f9cee3 100644 --- a/unixauthservice/pom.xml +++ b/unixauthservice/pom.xml @@ -79,6 +79,10 @@ <groupId>net.minidev</groupId> <artifactId>json-smart</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> </exclusions> </dependency> <dependency>