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 d671f9400 RANGER-4807: upgraded Hadoop to 3.3.3 d671f9400 is described below commit d671f94007c40e8db5db185c8d47a016c12ae152 Author: gavin.wang <gracejia...@163.com> AuthorDate: Wed May 29 14:32:24 2024 +0800 RANGER-4807: upgraded Hadoop to 3.3.3 Signed-off-by: Madhan Neethiraj <mad...@apache.org> (cherry picked from commit 780032ff016eb87f585285cf939a3145524b582d) --- dev-support/ranger-docker/.env | 2 +- distro/src/main/assembly/admin-web.xml | 2 ++ distro/src/main/assembly/hbase-agent.xml | 2 ++ distro/src/main/assembly/hdfs-agent.xml | 10 ++++++---- distro/src/main/assembly/hive-agent.xml | 2 ++ distro/src/main/assembly/kms.xml | 4 ++++ distro/src/main/assembly/knox-agent.xml | 2 ++ distro/src/main/assembly/plugin-atlas.xml | 2 ++ distro/src/main/assembly/plugin-elasticsearch.xml | 2 ++ distro/src/main/assembly/plugin-kafka.xml | 2 ++ distro/src/main/assembly/plugin-kms.xml | 2 ++ distro/src/main/assembly/plugin-kylin.xml | 1 + distro/src/main/assembly/plugin-ozone.xml | 1 + distro/src/main/assembly/plugin-presto.xml | 2 ++ distro/src/main/assembly/plugin-solr.xml | 1 + distro/src/main/assembly/plugin-sqoop.xml | 1 + distro/src/main/assembly/plugin-trino.xml | 2 ++ distro/src/main/assembly/plugin-yarn.xml | 2 ++ distro/src/main/assembly/ranger-tools.xml | 1 + distro/src/main/assembly/sample-client.xml | 1 + distro/src/main/assembly/storm-agent.xml | 2 ++ distro/src/main/assembly/tagsync.xml | 1 + distro/src/main/assembly/usersync.xml | 1 + knox-agent/pom.xml | 22 +++++++++++++++------- plugin-kafka/pom.xml | 11 +++++------ plugin-presto/pom.xml | 10 ++++++++++ plugin-sqoop/pom.xml | 5 +++++ pom.xml | 3 ++- ranger-knox-plugin-shim/pom.xml | 12 ++++++------ security-admin/pom.xml | 4 ++++ 30 files changed, 90 insertions(+), 25 deletions(-) diff --git a/dev-support/ranger-docker/.env b/dev-support/ranger-docker/.env index 639b92bbb..03762d1bc 100644 --- a/dev-support/ranger-docker/.env +++ b/dev-support/ranger-docker/.env @@ -31,7 +31,7 @@ ZK_VERSION=3.5.9 SOLR_VERSION=8 # service versions -HADOOP_VERSION=3.3.0 +HADOOP_VERSION=3.3.3 HBASE_VERSION=2.4.6 HIVE_VERSION=3.1.2 HIVE_HADOOP_VERSION=3.1.1 diff --git a/distro/src/main/assembly/admin-web.xml b/distro/src/main/assembly/admin-web.xml index 728fe83e7..8cc6d15cf 100644 --- a/distro/src/main/assembly/admin-web.xml +++ b/distro/src/main/assembly/admin-web.xml @@ -280,6 +280,7 @@ <include>org.slf4j:log4j-over-slf4j:jar:${slf4j.version}</include> <include>ch.qos.logback:logback-classic:jar:${logback.version}</include> <include>ch.qos.logback:logback-core:jar:${logback.version}</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </binaries> </moduleSet> @@ -312,6 +313,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.apache.commons:commons-compress:jar:${commons.compress.version}</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </binaries> </moduleSet> diff --git a/distro/src/main/assembly/hbase-agent.xml b/distro/src/main/assembly/hbase-agent.xml index ffb1de0c5..b36652091 100644 --- a/distro/src/main/assembly/hbase-agent.xml +++ b/distro/src/main/assembly/hbase-agent.xml @@ -79,6 +79,7 @@ <include>org.apache.orc:orc-core:jar:${orc.version}</include> <include>org.apache.orc:orc-shims:jar:${orc.version}</include> <include>io.airlift:aircompressor:jar:${aircompressor.version}</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </binaries> </moduleSet> @@ -109,6 +110,7 @@ <include>org.codehaus.woodstox:stax2-api</include> <include>com.fasterxml.woodstox:woodstox-core</include> <include>org.apache.htrace:htrace-core4</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </binaries> </moduleSet> diff --git a/distro/src/main/assembly/hdfs-agent.xml b/distro/src/main/assembly/hdfs-agent.xml index 349badfd2..498b2ff2b 100644 --- a/distro/src/main/assembly/hdfs-agent.xml +++ b/distro/src/main/assembly/hdfs-agent.xml @@ -64,6 +64,7 @@ <include>org.codehaus.woodstox:stax2-api</include> <include>org.apache.htrace:htrace-core4</include> <include>com.fasterxml.woodstox:woodstox-core</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </binaries> </moduleSet> @@ -105,10 +106,11 @@ <include>org.apache.lucene:lucene-core</include> <include>joda-time:joda-time</include> <include>com.carrotsearch:hppc</include> - <include>org.apache.hive:hive-storage-api:jar:${hive.storage-api.version}</include> - <include>org.apache.orc:orc-core:jar:${orc.version}</include> - <include>org.apache.orc:orc-shims:jar:${orc.version}</include> - <include>io.airlift:aircompressor:jar:${aircompressor.version}</include> + <include>org.apache.hive:hive-storage-api:jar:${hive.storage-api.version}</include> + <include>org.apache.orc:orc-core:jar:${orc.version}</include> + <include>org.apache.orc:orc-shims:jar:${orc.version}</include> + <include>io.airlift:aircompressor:jar:${aircompressor.version}</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </binaries> </moduleSet> diff --git a/distro/src/main/assembly/hive-agent.xml b/distro/src/main/assembly/hive-agent.xml index 5bae92ac5..17757f90b 100644 --- a/distro/src/main/assembly/hive-agent.xml +++ b/distro/src/main/assembly/hive-agent.xml @@ -74,6 +74,7 @@ <include>org.apache.lucene:lucene-core</include> <include>joda-time:joda-time</include> <include>com.carrotsearch:hppc</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </binaries> </moduleSet> @@ -104,6 +105,7 @@ <include>org.apache.htrace:htrace-core4</include> <include>org.codehaus.woodstox:stax2-api</include> <include>com.fasterxml.woodstox:woodstox-core</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </binaries> </moduleSet> diff --git a/distro/src/main/assembly/kms.xml b/distro/src/main/assembly/kms.xml index a0597ad80..c9b863088 100755 --- a/distro/src/main/assembly/kms.xml +++ b/distro/src/main/assembly/kms.xml @@ -39,6 +39,7 @@ <unpack>false</unpack> <includes> <include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> <include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include> <include>org.eclipse.persistence:eclipselink</include> <include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include> @@ -240,6 +241,7 @@ <include>org.codehaus.woodstox:stax2-api</include> <include>com.fasterxml.woodstox:woodstox-core</include> <include>org.apache.commons:commons-text:jar:${commons.text.version}</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </binaries> </moduleSet> @@ -352,6 +354,7 @@ <include>org.apache.ranger:credentialbuilder</include> <include>org.codehaus.woodstox:stax2-api</include> <include>com.fasterxml.woodstox:woodstox-core</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </dependencySet> </dependencySets> @@ -399,6 +402,7 @@ <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> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </binaries> </moduleSet> diff --git a/distro/src/main/assembly/knox-agent.xml b/distro/src/main/assembly/knox-agent.xml index 3fa867150..e97a9c6c8 100644 --- a/distro/src/main/assembly/knox-agent.xml +++ b/distro/src/main/assembly/knox-agent.xml @@ -87,6 +87,7 @@ <include>org.apache.orc:orc-core:jar:${orc.version}</include> <include>org.apache.orc:orc-shims:jar:${orc.version}</include> <include>io.airlift:aircompressor:jar:${aircompressor.version}</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </binaries> </moduleSet> @@ -117,6 +118,7 @@ <include>com.fasterxml.woodstox:woodstox-core</include> <include>org.apache.htrace:htrace-core4</include> <include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </binaries> </moduleSet> diff --git a/distro/src/main/assembly/plugin-atlas.xml b/distro/src/main/assembly/plugin-atlas.xml index c389282fc..ed0108475 100644 --- a/distro/src/main/assembly/plugin-atlas.xml +++ b/distro/src/main/assembly/plugin-atlas.xml @@ -93,6 +93,7 @@ <include>org.apache.orc:orc-core:jar:${orc.version}</include> <include>org.apache.orc:orc-shims:jar:${orc.version}</include> <include>io.airlift:aircompressor:jar:${aircompressor.version}</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </binaries> </moduleSet> @@ -127,6 +128,7 @@ <include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include> <include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include> <include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </binaries> </moduleSet> diff --git a/distro/src/main/assembly/plugin-elasticsearch.xml b/distro/src/main/assembly/plugin-elasticsearch.xml index 4d1489080..a627f641b 100644 --- a/distro/src/main/assembly/plugin-elasticsearch.xml +++ b/distro/src/main/assembly/plugin-elasticsearch.xml @@ -99,6 +99,7 @@ <include>org.apache.orc:orc-core:jar:${orc.version}</include> <include>org.apache.orc:orc-shims:jar:${orc.version}</include> <include>io.airlift:aircompressor:jar:${aircompressor.version}</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </binaries> </moduleSet> @@ -130,6 +131,7 @@ <include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include> <include>org.apache.ranger:ranger-plugins-cred</include> <include>org.apache.ranger:credentialbuilder</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </binaries> </moduleSet> diff --git a/distro/src/main/assembly/plugin-kafka.xml b/distro/src/main/assembly/plugin-kafka.xml index 4ffbdd611..782f0ab79 100644 --- a/distro/src/main/assembly/plugin-kafka.xml +++ b/distro/src/main/assembly/plugin-kafka.xml @@ -95,6 +95,7 @@ <include>org.apache.orc:orc-core:jar:${orc.version}</include> <include>org.apache.orc:orc-shims:jar:${orc.version}</include> <include>io.airlift:aircompressor:jar:${aircompressor.version}</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </binaries> </moduleSet> @@ -128,6 +129,7 @@ <include>org.apache.ranger:credentialbuilder</include> <include>org.codehaus.woodstox:stax2-api</include> <include>com.fasterxml.woodstox:woodstox-core</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </binaries> </moduleSet> diff --git a/distro/src/main/assembly/plugin-kms.xml b/distro/src/main/assembly/plugin-kms.xml index 7c6a16330..928db2041 100755 --- a/distro/src/main/assembly/plugin-kms.xml +++ b/distro/src/main/assembly/plugin-kms.xml @@ -73,6 +73,7 @@ <include>org.apache.orc:orc-core:jar:${orc.version}</include> <include>org.apache.orc:orc-shims:jar:${orc.version}</include> <include>io.airlift:aircompressor:jar:${aircompressor.version}</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </binaries> </moduleSet> @@ -106,6 +107,7 @@ <include>org.apache.ranger:credentialbuilder</include> <include>org.codehaus.woodstox:stax2-api</include> <include>com.fasterxml.woodstox:woodstox-core</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </binaries> </moduleSet> diff --git a/distro/src/main/assembly/plugin-kylin.xml b/distro/src/main/assembly/plugin-kylin.xml index 9aefa49d4..968197a4a 100644 --- a/distro/src/main/assembly/plugin-kylin.xml +++ b/distro/src/main/assembly/plugin-kylin.xml @@ -105,6 +105,7 @@ <include>org.codehaus.woodstox:stax2-api</include> <include>com.fasterxml.woodstox:woodstox-core</include> <include>org.apache.htrace:htrace-core4</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </dependencySet> </dependencySets> diff --git a/distro/src/main/assembly/plugin-ozone.xml b/distro/src/main/assembly/plugin-ozone.xml index 624d02bd6..acb973f15 100644 --- a/distro/src/main/assembly/plugin-ozone.xml +++ b/distro/src/main/assembly/plugin-ozone.xml @@ -69,6 +69,7 @@ <include>com.kstruct:gethostname4j</include> <include>net.java.dev.jna:jna</include> <include>net.java.dev.jna:jna-platform</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </binaries> </moduleSet> diff --git a/distro/src/main/assembly/plugin-presto.xml b/distro/src/main/assembly/plugin-presto.xml index d50edf2d9..b5fced211 100644 --- a/distro/src/main/assembly/plugin-presto.xml +++ b/distro/src/main/assembly/plugin-presto.xml @@ -121,6 +121,7 @@ <include>org.apache.orc:orc-core:jar:${orc.version}</include> <include>org.apache.orc:orc-shims:jar:${orc.version}</include> <include>io.airlift:aircompressor:jar:${aircompressor.version}</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </binaries> </moduleSet> @@ -150,6 +151,7 @@ <include>org.codehaus.woodstox:stax2-api</include> <include>com.fasterxml.woodstox:woodstox-core</include> <include>org.apache.htrace:htrace-core4</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </binaries> </moduleSet> diff --git a/distro/src/main/assembly/plugin-solr.xml b/distro/src/main/assembly/plugin-solr.xml index bcb24c0fc..fb05fa2af 100644 --- a/distro/src/main/assembly/plugin-solr.xml +++ b/distro/src/main/assembly/plugin-solr.xml @@ -106,6 +106,7 @@ <include>org.codehaus.woodstox:stax2-api</include> <include>com.fasterxml.woodstox:woodstox-core</include> <include>org.apache.htrace:htrace-core4</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </binaries> </moduleSet> diff --git a/distro/src/main/assembly/plugin-sqoop.xml b/distro/src/main/assembly/plugin-sqoop.xml index adc2a9c26..37c1a6f8f 100644 --- a/distro/src/main/assembly/plugin-sqoop.xml +++ b/distro/src/main/assembly/plugin-sqoop.xml @@ -110,6 +110,7 @@ <include>org.codehaus.woodstox:stax2-api</include> <include>com.fasterxml.woodstox:woodstox-core</include> <include>org.apache.htrace:htrace-core4</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </binaries> </moduleSet> diff --git a/distro/src/main/assembly/plugin-trino.xml b/distro/src/main/assembly/plugin-trino.xml index d519e8c64..a2f4828a4 100644 --- a/distro/src/main/assembly/plugin-trino.xml +++ b/distro/src/main/assembly/plugin-trino.xml @@ -115,6 +115,7 @@ <include>org.apache.orc:orc-core:jar:${orc.version}</include> <include>org.apache.orc:orc-shims:jar:${orc.version}</include> <include>io.airlift:aircompressor:jar:${aircompressor.version}</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </binaries> </moduleSet> @@ -147,6 +148,7 @@ <include>org.codehaus.woodstox:stax2-api</include> <include>com.fasterxml.woodstox:woodstox-core</include> <include>org.apache.htrace:htrace-core4</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </binaries> </moduleSet> diff --git a/distro/src/main/assembly/plugin-yarn.xml b/distro/src/main/assembly/plugin-yarn.xml index 5db884710..9f112dcbf 100644 --- a/distro/src/main/assembly/plugin-yarn.xml +++ b/distro/src/main/assembly/plugin-yarn.xml @@ -79,6 +79,7 @@ <include>org.apache.orc:orc-core:jar:${orc.version}</include> <include>org.apache.orc:orc-shims:jar:${orc.version}</include> <include>io.airlift:aircompressor:jar:${aircompressor.version}</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </binaries> </moduleSet> @@ -110,6 +111,7 @@ <include>org.apache.ranger:credentialbuilder</include> <include>org.codehaus.woodstox:stax2-api</include> <include>com.fasterxml.woodstox:woodstox-core</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </binaries> </moduleSet> diff --git a/distro/src/main/assembly/ranger-tools.xml b/distro/src/main/assembly/ranger-tools.xml index 794bddb51..518615c9b 100644 --- a/distro/src/main/assembly/ranger-tools.xml +++ b/distro/src/main/assembly/ranger-tools.xml @@ -72,6 +72,7 @@ <include>net.java.dev.jna:jna:jar:${jna.version}</include> <include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include> <include>org.slf4j:slf4j-api</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </dependencySet> </dependencySets> diff --git a/distro/src/main/assembly/sample-client.xml b/distro/src/main/assembly/sample-client.xml index 241eea629..2648e1e61 100644 --- a/distro/src/main/assembly/sample-client.xml +++ b/distro/src/main/assembly/sample-client.xml @@ -68,6 +68,7 @@ <include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include> <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.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </binaries> </moduleSet> diff --git a/distro/src/main/assembly/storm-agent.xml b/distro/src/main/assembly/storm-agent.xml index a334e247c..1beb06c96 100644 --- a/distro/src/main/assembly/storm-agent.xml +++ b/distro/src/main/assembly/storm-agent.xml @@ -99,6 +99,7 @@ <include>org.apache.orc:orc-core:jar:${orc.version}</include> <include>org.apache.orc:orc-shims:jar:${orc.version}</include> <include>io.airlift:aircompressor:jar:${aircompressor.version}</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </dependencySet> <dependencySet> @@ -119,6 +120,7 @@ <include>org.apache.hadoop:hadoop-auth:jar</include> <include>org.apache.ranger:ranger-plugins-cred</include> <include>org.apache.ranger:credentialbuilder</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </dependencySet> <dependencySet> diff --git a/distro/src/main/assembly/tagsync.xml b/distro/src/main/assembly/tagsync.xml index a04026059..616f577f1 100644 --- a/distro/src/main/assembly/tagsync.xml +++ b/distro/src/main/assembly/tagsync.xml @@ -102,6 +102,7 @@ <include>org.apache.curator:curator-client:jar:${curator.version}</include> <include>org.apache.zookeeper:zookeeper:jar:${zookeeper.version}</include> <include>org.apache.zookeeper:zookeeper-jute:jar:${zookeeper.version}</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </dependencySet> </dependencySets> diff --git a/distro/src/main/assembly/usersync.xml b/distro/src/main/assembly/usersync.xml index ef2ff584e..77c386d07 100644 --- a/distro/src/main/assembly/usersync.xml +++ b/distro/src/main/assembly/usersync.xml @@ -89,6 +89,7 @@ <include>ch.qos.logback:logback-classic:jar:${logback.version}</include> <include>org.slf4j:log4j-over-slf4j:jar:${${slf4j.version}}</include> <include>ch.qos.logback:logback-core:jar:${logback.version}</include> + <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include> </includes> </dependencySet> <dependencySet> diff --git a/knox-agent/pom.xml b/knox-agent/pom.xml index ec15135ad..d82096162 100644 --- a/knox-agent/pom.xml +++ b/knox-agent/pom.xml @@ -41,6 +41,10 @@ <groupId>org.apache.knox</groupId> <artifactId>gateway-util-common</artifactId> </exclusion> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + </exclusion> <exclusion> <groupId>org.slf4j</groupId> <artifactId>*</artifactId> @@ -64,16 +68,15 @@ <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> </dependency> - <!-- TO DEBUG JERSEY2 code: Comment the two jackson depedencies to debug jersey2 code. Their presence prevents jersy2 connections to work. --> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - <version>${codehaus.jackson.version}</version> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>${fasterxml.jackson.version}</version> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> - <version>${codehaus.jackson.version}</version> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + <version>${fasterxml.jackson.version}</version> </dependency> <dependency> <groupId>org.apache.ranger</groupId> @@ -262,6 +265,11 @@ <version>${project.version}</version> </dependency> <!-- The Jetty dependency is required as Knox is not using Jetty 9.3, which gets imported via Hadoop 3.0.0 --> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>${knox.jetty.version}</version> + </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> diff --git a/plugin-kafka/pom.xml b/plugin-kafka/pom.xml index 1b1738434..5fc8e6daf 100644 --- a/plugin-kafka/pom.xml +++ b/plugin-kafka/pom.xml @@ -82,6 +82,11 @@ <artifactId>commons-codec</artifactId> <version>${commons.codec.version}</version> </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>${fasterxml.jackson.version}</version> + </dependency> <!-- Test --> <dependency> @@ -130,12 +135,6 @@ <version>${bouncycastle.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - <version>2.10.4</version> - <scope>test</scope> - </dependency> </dependencies> <build> <testResources> diff --git a/plugin-presto/pom.xml b/plugin-presto/pom.xml index 348915219..9431a68b7 100644 --- a/plugin-presto/pom.xml +++ b/plugin-presto/pom.xml @@ -77,6 +77,16 @@ <artifactId>protobuf-java</artifactId> <version>${protobuf-java.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> <!-- Test --> <dependency> diff --git a/plugin-sqoop/pom.xml b/plugin-sqoop/pom.xml index 078937cfc..bf5407570 100644 --- a/plugin-sqoop/pom.xml +++ b/plugin-sqoop/pom.xml @@ -68,6 +68,11 @@ <artifactId>httpcore</artifactId> <version>${httpcomponents.httpcore.version}</version> </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>${fasterxml.jackson.version}</version> + </dependency> <!-- Test --> <dependency> diff --git a/pom.xml b/pom.xml index 0674b28b7..4e47f9649 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,8 @@ <graalvm.version>22.3.0</graalvm.version> <gson.version>2.9.0</gson.version> <guice.version>4.0</guice.version> - <hadoop.version>3.3.0</hadoop.version> + <hadoop-shaded-guava.version>1.1.1</hadoop-shaded-guava.version> + <hadoop.version>3.3.3</hadoop.version> <ozone.version>1.3.0</ozone.version> <hamcrest.version>2.2</hamcrest.version> <hbase.version>2.4.6</hbase.version> diff --git a/ranger-knox-plugin-shim/pom.xml b/ranger-knox-plugin-shim/pom.xml index ed5778ece..d31b6965e 100644 --- a/ranger-knox-plugin-shim/pom.xml +++ b/ranger-knox-plugin-shim/pom.xml @@ -60,14 +60,14 @@ <artifactId>gson</artifactId> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - <version>${codehaus.jackson.version}</version> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>${fasterxml.jackson.version}</version> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> - <version>${codehaus.jackson.version}</version> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + <version>${fasterxml.jackson.version}</version> </dependency> <dependency> <groupId>org.apache.ranger</groupId> diff --git a/security-admin/pom.xml b/security-admin/pom.xml index 2eca24ba1..7e23eab6f 100644 --- a/security-admin/pom.xml +++ b/security-admin/pom.xml @@ -306,6 +306,10 @@ <groupId>io.netty</groupId> <artifactId>netty</artifactId> </exclusion> + <exclusion> + <groupId>javax.ws.rs</groupId> + <artifactId>javax.ws.rs-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency>