You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by pr...@apache.org on 2026/03/11 17:32:02 UTC
(ranger) 04/07: RANGER-5489: Remove unused libraries from distro
This is an automated email from the ASF dual-hosted git repository.
pradeep pushed a commit to branch RANGER-4076_master
in repository https://gitbox.apache.org/repos/asf/ranger.git
commit 5ce2ca7c141dab6e88d1bd37e7405442c899a3f7
Author: Pradeep AgrawaL <pr...@apache.org>
AuthorDate: Wed Feb 11 00:54:26 2026 +0530
RANGER-5489: Remove unused libraries from distro
---
distro/src/main/assembly/admin-web.xml | 21 +---
distro/src/main/assembly/hbase-agent.xml | 31 ++----
distro/src/main/assembly/hdfs-agent.xml | 38 +++----
distro/src/main/assembly/hive-agent.xml | 32 ++----
distro/src/main/assembly/kms.xml | 35 -------
distro/src/main/assembly/knox-agent.xml | 48 ++++-----
distro/src/main/assembly/plugin-atlas.xml | 45 +++-----
distro/src/main/assembly/plugin-elasticsearch.xml | 58 +++++------
distro/src/main/assembly/plugin-kafka.xml | 69 +++++--------
distro/src/main/assembly/plugin-kms.xml | 46 ++++-----
distro/src/main/assembly/plugin-kylin.xml | 55 ++++------
distro/src/main/assembly/plugin-ozone.xml | 21 +---
distro/src/main/assembly/plugin-presto.xml | 70 +++++--------
.../src/main/assembly/plugin-schema-registry.xml | 4 +-
distro/src/main/assembly/plugin-solr.xml | 55 ++++------
distro/src/main/assembly/plugin-sqoop.xml | 60 ++++-------
distro/src/main/assembly/plugin-trino.xml | 113 ++++++++-------------
distro/src/main/assembly/plugin-yarn.xml | 40 +++-----
distro/src/main/assembly/ranger-tools.xml | 57 +++--------
distro/src/main/assembly/sample-client.xml | 53 +++-------
distro/src/main/assembly/storm-agent.xml | 82 ++++++---------
distro/src/main/assembly/tagsync.xml | 20 +---
distro/src/main/assembly/usersync.xml | 91 ++++++++---------
23 files changed, 388 insertions(+), 756 deletions(-)
diff --git a/distro/src/main/assembly/admin-web.xml b/distro/src/main/assembly/admin-web.xml
index 99fb538f3..d02a68f65 100644
--- a/distro/src/main/assembly/admin-web.xml
+++ b/distro/src/main/assembly/admin-web.xml
@@ -78,7 +78,6 @@
<include>org.apache.hive:hive-exec:jar:${hive.version}</include>
<include>org.apache.hive:hive-jdbc:jar:${hive.version}</include>
<include>org.apache.hive:hive-metastore:jar:${hive.version}</include>
- <include>org.apache.thrift:libfb303:jar:${libfb303.version}</include>
<include>org.apache.thrift:libthrift:jar:${libthrift.version}</include>
</includes>
</binaries>
@@ -144,7 +143,7 @@
<directoryMode>755</directoryMode>
<fileMode>644</fileMode>
<includes>
- <include>org.apache.storm:storm-core:jar:0.9.2-incubating</include>
+ <include>org.apache.storm:storm-core</include>
</includes>
</binaries>
</moduleSet>
@@ -186,17 +185,8 @@
<include>org.apache.ozone:hdds-config:jar:${ozone.version}</include>
<include>org.apache.ozone:hdds-interface-client:jar:${ozone.version}</include>
<include>org.apache.ozone:ozone-interface-client:jar:${ozone.version}</include>
- <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:${commons.compress.version}</include>
<include>org.bouncycastle:bcpkix-jdk18on:jar:${org.bouncycastle.bcpkix-jdk18on}</include>
- <include>commons-net:commons-net:jar:${commons.net.version}</include>
- <include>io.jaegertracing:jaeger-core:jar:1.6.0</include>
- <include>io.opentracing:opentracing-api:jar:0.33.0</include>
- <include>io.opentracing:opentracing-noop:jar:0.33.0</include>
- <include>io.opentracing:opentracing-util:jar:0.33.0</include>
- <include>io.opentracing.contrib:opentracing-tracerresolver:jar:0.1.8</include>
<include>com.google.protobuf:protobuf-java:jar:${protobuf-java.version}</include>
</includes>
</binaries>
@@ -234,22 +224,17 @@
<include>org.apache.tomcat.embed:tomcat-embed*</include>
<include>org.apache.tomcat:tomcat-annotations-api*</include>
<include>org.apache.tomcat:tomcat-jasper-el</include>
- <include>org.eclipse.jdt.core.compiler:ecj:jar:${ecj.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
<include>org.apache.ranger:ranger-authz-api</include>
<include>org.apache.ranger:ranger-plugins-common</include>
- <include>org.apache.ranger:ugsync-util</include>
<include>org.slf4j:slf4j-api:jar:${slf4j.version}</include>
- <include>org.apache.hadoop:hadoop-common</include>
<include>commons-logging:commons-logging</include>
<include>commons-collections:commons-collections</include>
<include>commons-io:commons-io</include>
<include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
<include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
<include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
- <include>org.apache.zookeeper:zookeeper:jar:${zookeeper.version}</include>
<include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
- <include>commons-codec:commons-codec:jar:${commons.codec.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.commons:commons-configuration2:jar:${commons.configuration.version}</include>
@@ -271,8 +256,6 @@
<include>org.apache.lucene:lucene-core</include>
<include>com.carrotsearch:hppc</include>
<include>joda-time:joda-time</include>
- <include>org.apache.ranger:ranger-plugins-cred</include>
- <include>org.apache.ranger:ugsyn-util</include>
<include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
<include>ch.qos.logback:logback-classic:jar:${logback.version}</include>
@@ -296,12 +279,10 @@
<includes>
<include>commons-cli:commons-cli</include>
<include>commons-collections:commons-collections</include>
- <include>commons-configuration:commons-configuration</include>
<include>commons-io:commons-io:jar:${commons.io.version}</include>
<include>commons-logging:commons-logging</include>
<include>org.slf4j:slf4j-api:jar:${slf4j.version}</include>
<include>org.apache.commons:commons-lang3</include>
- <include>org.apache.hadoop:hadoop-common</include>
<include>org.apache.hadoop:hadoop-auth</include>
<include>com.fasterxml.woodstox:woodstox-core:jar:${fasterxml.woodstox.version}</include>
<include>org.codehaus.woodstox:stax2-api:jar:${codehaus.woodstox.stax2api.version}</include>
diff --git a/distro/src/main/assembly/hbase-agent.xml b/distro/src/main/assembly/hbase-agent.xml
index a1a6526dd..053d12a6c 100644
--- a/distro/src/main/assembly/hbase-agent.xml
+++ b/distro/src/main/assembly/hbase-agent.xml
@@ -57,34 +57,22 @@
<directoryMode>755</directoryMode>
<fileMode>644</fileMode>
<includes>
+ <include>com.carrotsearch:hppc</include>
<include>com.fasterxml.jackson.core:jackson-annotations:jar:${fasterxml.jackson.version}</include>
<include>com.fasterxml.jackson.core:jackson-core:jar:${fasterxml.jackson.version}</include>
<include>com.fasterxml.jackson.core:jackson-databind:jar:${fasterxml.jackson.version}</include>
<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:${fasterxml.jackson.version}</include>
<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:${fasterxml.jackson.version}</include>
- <include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
- <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
- <include>org.noggit:noggit:jar:${noggit.version}</include>
- <include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
- <include>net.java.dev.jna:jna:jar:${jna.version}</include>
- <include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
- <include>org.elasticsearch:elasticsearch</include>
- <include>org.elasticsearch:elasticsearch-core</include>
- <include>org.elasticsearch:elasticsearch-x-content</include>
- <include>org.elasticsearch.client:elasticsearch-rest-client</include>
- <include>org.elasticsearch.client:elasticsearch-rest-high-level-client</include>
- <include>org.elasticsearch.plugin:rank-eval-client</include>
- <include>org.elasticsearch.plugin:lang-mustache-client</include>
- <include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
- <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>joda-time:joda-time</include>
+ <include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
+ <include>net.java.dev.jna:jna:jar:${jna.version}</include>
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
+ <include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
+ <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
+ <include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
+ <include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
</includes>
</binaries>
</moduleSet>
@@ -104,15 +92,14 @@
<include>commons-cli:commons-cli</include>
<include>commons-collections:commons-collections</include>
<include>commons-io:commons-io:jar:${commons.io.version}</include>
- <include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
<include>org.apache.commons:commons-collections4:jar:${commons.collections4.version}</include>
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
<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.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
- <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
</includes>
diff --git a/distro/src/main/assembly/hdfs-agent.xml b/distro/src/main/assembly/hdfs-agent.xml
index 0c26814b9..1f1101119 100644
--- a/distro/src/main/assembly/hdfs-agent.xml
+++ b/distro/src/main/assembly/hdfs-agent.xml
@@ -53,15 +53,14 @@
<include>commons-cli:commons-cli</include>
<include>commons-collections:commons-collections</include>
<include>commons-io:commons-io:jar:${commons.io.version}</include>
- <include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
<include>org.apache.commons:commons-collections4:jar:${commons.collections4.version}</include>
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
<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.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
- <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
</includes>
@@ -87,33 +86,20 @@
<directoryMode>755</directoryMode>
<fileMode>644</fileMode>
<includes>
- <include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
- <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
- <include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
- <include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
- <include>org.noggit:noggit:jar:${noggit.version}</include>
- <include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
- <include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
- <include>net.java.dev.jna:jna:jar:${jna.version}</include>
- <include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
- <include>org.elasticsearch:elasticsearch</include>
- <include>org.elasticsearch:elasticsearch-core</include>
- <include>org.elasticsearch:elasticsearch-x-content</include>
- <include>org.elasticsearch.client:elasticsearch-rest-client</include>
- <include>org.elasticsearch.client:elasticsearch-rest-high-level-client</include>
- <include>org.elasticsearch.plugin:rank-eval-client</include>
- <include>org.elasticsearch.plugin:lang-mustache-client</include>
- <include>org.apache.httpcomponents:httpcore-nio:jar:${httpcomponents.httpcore.version}</include>
- <include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
- <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>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
<include>io.airlift:aircompressor:jar:${aircompressor.version}</include>
+ <include>joda-time:joda-time</include>
+ <include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
+ <include>net.java.dev.jna:jna:jar:${jna.version}</include>
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
- <include>org.glassfish.jersey.media:jersey-media-json-jackson</include>
+ <include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
+ <include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
+ <include>org.apache.httpcomponents:httpcore-nio:jar:${httpcomponents.httpcore.version}</include>
+ <include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
+ <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
+ <include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
+ <include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
<include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
</includes>
</binaries>
diff --git a/distro/src/main/assembly/hive-agent.xml b/distro/src/main/assembly/hive-agent.xml
index 7a72129c5..d78cc5010 100644
--- a/distro/src/main/assembly/hive-agent.xml
+++ b/distro/src/main/assembly/hive-agent.xml
@@ -57,29 +57,20 @@
<directoryMode>755</directoryMode>
<fileMode>644</fileMode>
<includes>
+ <include>com.carrotsearch:hppc</include>
+ <include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
<include>commons-collections:commons-collections</include>
- <include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
- <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
+ <include>joda-time:joda-time</include>
+ <include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
+ <include>net.java.dev.jna:jna:jar:${jna.version}</include>
+ <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
+ <include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
<include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
+ <include>org.apache.httpcomponents:httpcore-nio:jar:${httpcomponents.httpcore.version}</include>
<include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
- <include>org.noggit:noggit:jar:${noggit.version}</include>
+ <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
<include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
- <include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
- <include>net.java.dev.jna:jna:jar:${jna.version}</include>
- <include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
- <include>org.elasticsearch:elasticsearch</include>
- <include>org.elasticsearch:elasticsearch-core</include>
- <include>org.elasticsearch:elasticsearch-x-content</include>
- <include>org.elasticsearch.client:elasticsearch-rest-client</include>
- <include>org.elasticsearch.client:elasticsearch-rest-high-level-client</include>
- <include>org.elasticsearch.plugin:rank-eval-client</include>
- <include>org.elasticsearch.plugin:lang-mustache-client</include>
- <include>org.apache.httpcomponents:httpcore-nio:jar:${httpcomponents.httpcore.version}</include>
- <include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
- <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>
+ <include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
</includes>
</binaries>
</moduleSet>
@@ -99,15 +90,14 @@
<include>commons-cli:commons-cli</include>
<include>commons-collections:commons-collections</include>
<include>commons-io:commons-io:jar:${commons.io.version}</include>
- <include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
<include>org.apache.commons:commons-collections4:jar:${commons.collections4.version}</include>
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
<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.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
- <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
</includes>
diff --git a/distro/src/main/assembly/kms.xml b/distro/src/main/assembly/kms.xml
index 675e2c605..1bb134fcd 100755
--- a/distro/src/main/assembly/kms.xml
+++ b/distro/src/main/assembly/kms.xml
@@ -46,25 +46,16 @@
<include>com.googlecode.log4jdbc:log4jdbc</include>
<include>com.codahale.metrics:metrics-core</include>
<include>org.slf4j:jul-to-slf4j</include>
- <include>javax.servlet:servlet-api</include>
- <include>org.mortbay.jetty:jetty</include>
- <include>org.mortbay.jetty:jetty-util</include>
<include>org.apache.zookeeper:zookeeper:jar:${zookeeper.version}</include>
<include>org.apache.curator:curator-framework</include>
<include>org.apache.curator:curator-client</include>
- <include>org.apache.curator:curator-test</include>
<include>asm:asm-all</include>
<include>org.apache.httpcomponents:httpclient</include>
<include>javax.activation:activation</include>
- <include>org.apache.directory.server:apacheds-i18n</include>
- <include>org.apache.directory.server:apacheds-kerberos-codec</include>
- <include>org.apache.directory.api:api-asn1-api</include>
<include>org.apache.directory.api:api-i18n</include>
- <include>org.apache.directory.api:api-util</include>
<include>commons-beanutils:commons-beanutils</include>
<include>commons-cli:commons-cli</include>
<include>commons-codec:commons-codec:jar:${commons.codec.version}</include>
- <include>commons-digester:commons-digester</include>
<include>commons-io:commons-io</include>
<include>org.apache.commons:commons-math3</include>
<include>commons-net:commons-net:jar:${commons.net.version}</include>
@@ -78,13 +69,8 @@
<include>com.jcraft:jsch</include>
<include>com.google.code.findbugs:jsr305</include>
<include>io.netty:netty-all</include>
- <include>com.thoughtworks.paranamer:paranamer</include>
<include>org.xerial.snappy:snappy-java</include>
- <include>xmlenc:xmlenc</include>
- <include>org.tukaani:xz</include>
<include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
- <include>org.apache.httpcomponents:httpclient:jar:${kms.httpcomponents.httpclient.version}</include>
- <include>org.noggit:noggit:jar:${noggit.version}</include>
<include>org.apache.hadoop:hadoop-hdfs:jar:${hadoop.version}</include>
<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:${fasterxml.jackson.version}</include>
<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:${fasterxml.jackson.version}</include>
@@ -105,12 +91,10 @@
<include>com.squareup.retrofit2:adapter-rxjava</include>
<include>com.squareup.okhttp3:okhttp-urlconnection</include>
<include>com.fasterxml.jackson.datatype:jackson-datatype-joda:jar:${fasterxml.jackson.version}</include>
- <include>joda-time:okhttp-urlconnection</include>
<include>joda-time:joda-time</include>
<include>com.nimbusds:oauth2-oidc-sdk</include>
<include>net.minidev:json-smart</include>
<include>net.minidev:asm:jar:${net.minidev.asm.version}</include>
- <include>javax.mail:javax.mail-api</include>
<include>com.sun.mail:javax.mail</include>
<include>com.nimbusds:nimbus-jose-jwt</include>
<include>com.microsoft.azure:azure-keyvault-webkey</include>
@@ -235,14 +219,12 @@
<include>org.apache.tomcat:tomcat-annotations-api*</include>
<include>org.eclipse.jdt.core.compiler:ecj:jar:P20140317-1600</include>
<include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
- <include>com.google.protobuf:protobuf-java:jar:${gcp.protobuf-java.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
<include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
<include>org.apache.ranger:ranger-authz-api</include>
<include>org.apache.ranger:ranger-plugins-common</include>
- <include>org.apache.ranger:ugsync-util</include>
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
<include>net.java.dev.jna:jna:jar:${jna.version}</include>
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
@@ -256,7 +238,6 @@
<include>org.slf4j:slf4j-api</include>
<include>ch.qos.logback:logback-classic:jar:${logback.version}</include>
<include>ch.qos.logback:logback-core:jar:${logback.version}</include>
- <include>com.google.code.gson:gson</include>
<include>com.fasterxml.jackson.core:jackson-annotations:jar:${fasterxml.jackson.version}</include>
<include>com.fasterxml.jackson.core:jackson-core:jar:${fasterxml.jackson.version}</include>
<include>com.fasterxml.jackson.core:jackson-databind:jar:${fasterxml.jackson.version}</include>
@@ -264,8 +245,6 @@
<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>
- <include>org.javassist:javassist</include>
- <include>org.glassfish.hk2.external:aopalliance-repackaged:jar:${glassfish.hk2.version}</include>
</includes>
</binaries>
</moduleSet>
@@ -331,31 +310,18 @@
<include>org.eclipse.persistence:eclipselink</include>
<include>org.eclipse.persistence:javax.persistence</include>
<include>commons-collections:commons-collections</include>
- <include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
<include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
<include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
<include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
- <include>org.noggit:noggit:jar:${noggit.version}</include>
<include>org.apache.zookeeper:zookeeper:jar:${zookeeper.version}</include>
<include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
<include>net.java.dev.jna:jna:jar:${jna.version}</include>
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
- <include>org.elasticsearch:elasticsearch</include>
- <include>org.elasticsearch:elasticsearch-core</include>
- <include>org.elasticsearch:elasticsearch-x-content</include>
- <include>org.elasticsearch.client:elasticsearch-rest-client</include>
- <include>org.elasticsearch.client:elasticsearch-rest-high-level-client</include>
- <include>org.elasticsearch.plugin:rank-eval-client</include>
- <include>org.elasticsearch.plugin:lang-mustache-client</include>
<include>org.apache.httpcomponents:httpcore-nio:jar:${httpcomponents.httpcore.version}</include>
<include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
- <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>
</includes>
</dependencySet>
@@ -369,7 +335,6 @@
<include>commons-cli:commons-cli</include>
<include>commons-collections:commons-collections</include>
<include>commons-io:commons-io:jar:${commons.io.version}</include>
- <include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
<include>org.apache.commons:commons-collections4:jar:${commons.collections4.version}</include>
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
diff --git a/distro/src/main/assembly/knox-agent.xml b/distro/src/main/assembly/knox-agent.xml
index 23f36d2f9..256d95cb4 100644
--- a/distro/src/main/assembly/knox-agent.xml
+++ b/distro/src/main/assembly/knox-agent.xml
@@ -58,41 +58,28 @@
<directoryMode>755</directoryMode>
<fileMode>644</fileMode>
<includes>
- <include>commons-collections:commons-collections</include>
- <include>org.apache.commons:commons-configuration2</include>
- <include>com.google.code.gson:gson*</include>
- <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
- <include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
- <include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
- <include>org.noggit:noggit:jar:${noggit.version}</include>
- <include>com.google.protobuf:protobuf-java:jar:${protobuf-java.version}</include>
- <include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
- <include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
- <include>org.apache.hadoop:hadoop-hdfs-client:jar:${hadoop.version}</include>
+ <include>com.carrotsearch:hppc</include>
<include>com.fasterxml.jackson.core:jackson-annotations:jar:${fasterxml.jackson.version}</include>
<include>com.fasterxml.jackson.core:jackson-core:jar:${fasterxml.jackson.version}</include>
<include>com.fasterxml.jackson.core:jackson-databind:jar:${fasterxml.jackson.version}</include>
- <include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
+ <include>com.google.code.gson:gson*</include>
+ <include>com.google.protobuf:protobuf-java:jar:${protobuf-java.version}</include>
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
- <include>net.java.dev.jna:jna:jar:${jna.version}</include>
- <include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
- <include>org.elasticsearch:elasticsearch</include>
- <include>org.elasticsearch:elasticsearch-core</include>
- <include>org.elasticsearch:elasticsearch-x-content</include>
- <include>org.elasticsearch.client:elasticsearch-rest-client</include>
- <include>org.elasticsearch.client:elasticsearch-rest-high-level-client</include>
- <include>org.elasticsearch.plugin:rank-eval-client</include>
- <include>org.elasticsearch.plugin:lang-mustache-client</include>
- <include>org.apache.httpcomponents:httpcore-nio:jar:${httpcomponents.httpcore.version}</include>
- <include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
- <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>commons-collections:commons-collections</include>
<include>io.airlift:aircompressor:jar:${aircompressor.version}</include>
+ <include>joda-time:joda-time</include>
+ <include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
+ <include>net.java.dev.jna:jna:jar:${jna.version}</include>
+ <include>org.apache.commons:commons-configuration2</include>
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
+ <include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
+ <include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
+ <include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
+ <include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
+ <include>org.apache.httpcomponents:httpcore-nio:jar:${httpcomponents.httpcore.version}</include>
+ <include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
+ <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
+ <include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
</includes>
</binaries>
</moduleSet>
@@ -112,15 +99,14 @@
<include>commons-cli:commons-cli</include>
<include>commons-collections:commons-collections</include>
<include>commons-io:commons-io:jar:${commons.io.version}</include>
- <include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
<include>org.apache.commons:commons-collections4:jar:${commons.collections4.version}</include>
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
<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.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
- <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
</includes>
diff --git a/distro/src/main/assembly/plugin-atlas.xml b/distro/src/main/assembly/plugin-atlas.xml
index 6fbd8ee96..bbba45bd3 100644
--- a/distro/src/main/assembly/plugin-atlas.xml
+++ b/distro/src/main/assembly/plugin-atlas.xml
@@ -58,44 +58,26 @@
<directoryMode>755</directoryMode>
<fileMode>644</fileMode>
<includes>
- <include>commons-collections:commons-collections</include>
+ <include>com.carrotsearch:hppc</include>
<include>com.fasterxml.jackson.core:jackson-annotations:jar:${fasterxml.jackson.version}</include>
<include>com.fasterxml.jackson.core:jackson-core:jar:${fasterxml.jackson.version}</include>
<include>com.fasterxml.jackson.core:jackson-databind:jar:${fasterxml.jackson.version}</include>
- <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:${fasterxml.jackson.version}</include>
<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:${fasterxml.jackson.version}</include>
- <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
- <include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
- <include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
- <include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
- <include>net.java.dev.jna:jna:jar:${jna.version}</include>
+ <include>commons-collections:commons-collections</include>
+ <include>io.airlift:aircompressor:jar:${aircompressor.version}</include>
+ <include>joda-time:joda-time</include>
<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>net.java.dev.jna:jna:jar:${jna.version}</include>
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
- <include>org.apache.hadoop:hadoop-azure:jar:${hadoop.version}</include>
- <include>org.apache.hadoop:hadoop-azure-datalake:jar:${hadoop.version}</include>
- <include>org.apache.knox:gateway-cloud-bindings</include>
- <include>org.apache.knox:gateway-shell</include>
- <include>org.apache.knox:gateway-i18n</include>
- <include>org.elasticsearch:elasticsearch</include>
- <include>org.elasticsearch:elasticsearch-core</include>
- <include>org.elasticsearch:elasticsearch-x-content</include>
- <include>org.elasticsearch.client:elasticsearch-rest-client</include>
- <include>org.elasticsearch.client:elasticsearch-rest-high-level-client</include>
- <include>org.elasticsearch.plugin:rank-eval-client</include>
- <include>org.elasticsearch.plugin:lang-mustache-client</include>
- <include>org.apache.httpcomponents:httpcore-nio:jar:${httpcomponents.httpcore.version}</include>
- <include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
- <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.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
+ <include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
+ <include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
+ <include>org.apache.httpcomponents:httpcore-nio:jar:${httpcomponents.httpcore.version}</include>
+ <include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
+ <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
+ <include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
+ <include>org.codehaus.woodstox:stax2-api:jar:${codehaus.woodstox.stax2api.version}</include>
</includes>
</binaries>
</moduleSet>
@@ -122,11 +104,10 @@
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
<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.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
- <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
- <include>org.apache.ranger:ranger-plugins-cred</include>
<include>org.codehaus.woodstox:stax2-api:jar:${codehaus.woodstox.stax2api.version}</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
</includes>
diff --git a/distro/src/main/assembly/plugin-elasticsearch.xml b/distro/src/main/assembly/plugin-elasticsearch.xml
index 7f24c1851..66013d792 100644
--- a/distro/src/main/assembly/plugin-elasticsearch.xml
+++ b/distro/src/main/assembly/plugin-elasticsearch.xml
@@ -62,47 +62,47 @@
<directoryMode>755</directoryMode>
<fileMode>644</fileMode>
<includes>
+ <include>com.carrotsearch:hppc</include>
+ <include>com.fasterxml.jackson.core:jackson-annotations:jar:${fasterxml.jackson.version}</include>
+ <include>com.fasterxml.jackson.core:jackson-core:jar:${fasterxml.jackson.version}</include>
+ <include>com.fasterxml.jackson.core:jackson-databind:${fasterxml.jackson.version}</include>
+ <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:${fasterxml.jackson.version}</include>
+ <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:${fasterxml.jackson.version}</include>
+ <include>com.google.code.gson:gson</include>
+ <include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
+ <include>commons-codec:commons-codec</include>
<include>commons-collections:commons-collections</include>
<include>commons-configuration:commons-configuration:jar:${commons.configuration.version}</include>
+ <include>commons-io:commons-io</include>
+ <include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
+ <include>io.airlift:aircompressor:jar:${aircompressor.version}</include>
+ <include>joda-time:joda-time</include>
+ <include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
+ <include>net.java.dev.jna:jna:jar:${jna.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.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
- <include>com.google.code.gson:gson</include>
- <include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
- <include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
- <include>commons-io:commons-io</include>
+ <include>org.apache.hive:hive-storage-api:jar:${hive.storage-api.version}</include>
+ <include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
<include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
+ <include>org.apache.httpcomponents:httpcore-nio:jar:${httpcomponents.httpcore.version}</include>
<include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
<include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
- <include>org.noggit:noggit:jar:${noggit.version}</include>
- <include>com.fasterxml.jackson.core:jackson-annotations:jar:${fasterxml.jackson.version}</include>
- <include>com.fasterxml.jackson.core:jackson-core:jar:${fasterxml.jackson.version}</include>
- <include>com.fasterxml.jackson.core:jackson-databind:${fasterxml.jackson.version}</include>
- <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:${fasterxml.jackson.version}</include>
- <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:${fasterxml.jackson.version}</include>
+ <include>org.apache.lucene:lucene-core</include>
+ <include>org.apache.orc:orc-core:jar:${orc.version}</include>
+ <include>org.apache.orc:orc-shims:jar:${orc.version}</include>
<include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
- <include>commons-codec:commons-codec</include>
- <include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
- <include>net.java.dev.jna:jna:jar:${jna.version}</include>
- <include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
- <include>org.elasticsearch:elasticsearch</include>
- <include>org.elasticsearch:elasticsearch-core</include>
- <include>org.elasticsearch:elasticsearch-x-content</include>
+ <include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
<include>org.elasticsearch.client:elasticsearch-rest-client</include>
<include>org.elasticsearch.client:elasticsearch-rest-high-level-client</include>
- <include>org.elasticsearch.plugin:rank-eval-client</include>
<include>org.elasticsearch.plugin:lang-mustache-client</include>
- <include>org.apache.httpcomponents:httpcore-nio:jar:${httpcomponents.httpcore.version}</include>
- <include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
- <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.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
+ <include>org.elasticsearch.plugin:rank-eval-client</include>
+ <include>org.elasticsearch:elasticsearch-core</include>
+ <include>org.elasticsearch:elasticsearch-x-content</include>
+ <include>org.elasticsearch:elasticsearch</include>
+ <include>org.noggit:noggit:jar:${noggit.version}</include>
</includes>
</binaries>
</moduleSet>
@@ -130,11 +130,11 @@
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
<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.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
<include>org.apache.ranger:ranger-plugins-cred</include>
- <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
</includes>
</binaries>
diff --git a/distro/src/main/assembly/plugin-kafka.xml b/distro/src/main/assembly/plugin-kafka.xml
index 29a243b50..507cba15c 100644
--- a/distro/src/main/assembly/plugin-kafka.xml
+++ b/distro/src/main/assembly/plugin-kafka.xml
@@ -37,10 +37,10 @@
<moduleSet>
<useAllReactorProjects>true</useAllReactorProjects>
<includes>
- <include>org.apache.ranger:ranger-audit-core</include>
- <include>org.apache.ranger:ranger-audit-dest-hdfs</include>
- <include>org.apache.ranger:ranger-audit-dest-solr</include>
- <include>org.apache.ranger:ranger-authz-api</include>
+ <include>org.apache.ranger:ranger-audit-core</include>
+ <include>org.apache.ranger:ranger-audit-dest-hdfs</include>
+ <include>org.apache.ranger:ranger-audit-dest-solr</include>
+ <include>org.apache.ranger:ranger-authz-api</include>
<include>org.apache.ranger:ranger-kafka-plugin</include>
<include>org.apache.ranger:ranger-plugins-cred</include>
<include>org.apache.ranger:ranger-plugins-common</include>
@@ -53,54 +53,40 @@
<directoryMode>755</directoryMode>
<fileMode>644</fileMode>
<includes>
+ <include>com.carrotsearch:hppc</include>
+ <include>com.fasterxml.jackson.core:jackson-annotations:jar:${fasterxml.jackson.version}</include>
+ <include>com.fasterxml.jackson.core:jackson-core:jar:${fasterxml.jackson.version}</include>
+ <include>com.fasterxml.jackson.core:jackson-databind:jar:${fasterxml.jackson.version}</include>
+ <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:${fasterxml.jackson.version}</include>
+ <include>com.fasterxml.woodstox:woodstox-core</include>
+ <include>com.google.code.gson:gson</include>
+ <include>com.google.protobuf:protobuf-java:jar:${protobuf-java.version}</include>
+ <include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
+ <include>commons-codec:commons-codec</include>
+ <include>commons-collections:commons-collections</include>
+ <include>commons-io:commons-io</include>
+ <include>commons-logging:commons-logging</include>
+ <include>io.airlift:aircompressor:jar:${aircompressor.version}</include>
+ <include>joda-time:joda-time</include>
+ <include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
+ <include>net.java.dev.jna:jna:jar:${jna.version}</include>
<include>org.apache.commons:commons-collections4:jar:${commons.collections4.version}</include>
- <include>org.glassfish.jersey.media:jersey-media-json-jackson:jar:${jersey-client.version}</include>
- <include>org.glassfish.jersey.ext:jersey-entity-filtering:jar:${jersey-client.version}</include>
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.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.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
- <include>org.apache.hadoop:hadoop-hdfs-client:jar:${hadoop.version}</include>
- <include>com.google.code.gson:gson</include>
- <include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
- <include>commons-collections:commons-collections</include>
- <include>commons-logging:commons-logging</include>
- <include>commons-io:commons-io</include>
+ <include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
<include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
+ <include>org.apache.httpcomponents:httpcore-nio:jar:${httpcomponents.httpcore.version}</include>
<include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
<include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
- <include>com.google.protobuf:protobuf-java:jar:${protobuf-java.version}</include>
- <include>org.noggit:noggit:jar:${noggit.version}</include>
- <include>com.fasterxml.jackson.core:jackson-annotations:jar:${fasterxml.jackson.version}</include>
- <include>com.fasterxml.jackson.core:jackson-core:jar:${fasterxml.jackson.version}</include>
- <include>com.fasterxml.jackson.core:jackson-databind:jar:${fasterxml.jackson.version}</include>
- <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:${fasterxml.jackson.version}</include>
- <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:${fasterxml.jackson.version}</include>
<include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
- <include>commons-codec:commons-codec</include>
<include>org.codehaus.woodstox:stax2-api</include>
- <include>com.fasterxml.woodstox:woodstox-core</include>
- <include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
- <include>net.java.dev.jna:jna:jar:${jna.version}</include>
- <include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
- <include>org.elasticsearch:elasticsearch</include>
- <include>org.elasticsearch:elasticsearch-core</include>
- <include>org.elasticsearch:elasticsearch-x-content</include>
- <include>org.elasticsearch.client:elasticsearch-rest-client</include>
- <include>org.elasticsearch.client:elasticsearch-rest-high-level-client</include>
- <include>org.elasticsearch.plugin:rank-eval-client</include>
- <include>org.elasticsearch.plugin:lang-mustache-client</include>
- <include>org.apache.httpcomponents:httpcore-nio:jar:${httpcomponents.httpcore.version}</include>
- <include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
- <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.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
+ <include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
+ <include>org.glassfish.jersey.ext:jersey-entity-filtering:jar:${jersey-client.version}</include>
+ <include>org.glassfish.jersey.media:jersey-media-json-jackson:jar:${jersey-client.version}</include>
</includes>
</binaries>
</moduleSet>
@@ -131,7 +117,6 @@
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
- <include>org.apache.ranger:ranger-plugins-cred</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
</includes>
diff --git a/distro/src/main/assembly/plugin-kms.xml b/distro/src/main/assembly/plugin-kms.xml
index 419c239f0..c8071feb2 100755
--- a/distro/src/main/assembly/plugin-kms.xml
+++ b/distro/src/main/assembly/plugin-kms.xml
@@ -57,41 +57,41 @@
<directoryMode>755</directoryMode>
<fileMode>644</fileMode>
<includes>
- <include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
- <include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
<include>com.google.code.gson:gson</include>
- <include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
+ <include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
<include>commons-collections:commons-collections</include>
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
+ <include>io.airlift:aircompressor:jar:${aircompressor.version}</include>
+ <include>jakarta.ws.rs:jakarta.ws.rs-api</include>
+ <include>javax.inject:javax.inject</include>
+ <include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
+ <include>net.java.dev.jna:jna:jar:${jna.version}</include>
+ <include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
+ <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
+ <include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
+ <include>org.apache.hive:hive-storage-api:jar:${hive.storage-api.version}</include>
<include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
<include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
<include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
- <include>org.noggit:noggit:jar:${noggit.version}</include>
- <include>org.apache.zookeeper:zookeeper:jar:${zookeeper.version}</include>
- <include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
- <include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
- <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.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>
- <include>jakarta.ws.rs:jakarta.ws.rs-api</include>
- <include>org.glassfish.jersey.core:jersey-client</include>
- <include>org.glassfish.jersey.core:jersey-common</include>
- <include>org.glassfish.jersey.media:jersey-media-json-jackson</include>
- <include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
- <include>org.glassfish.jersey.inject:jersey-hk2</include>
+ <include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
+ <include>org.apache.zookeeper:zookeeper:jar:${zookeeper.version}</include>
+ <include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
<include>org.glassfish.hk2.external:jakarta.inject</include>
- <include>org.glassfish.hk2:hk2</include>
- <include>org.glassfish.hk2:hk2-utils</include>
+ <include>org.glassfish.hk2:class-model</include>
<include>org.glassfish.hk2:hk2-api</include>
<include>org.glassfish.hk2:hk2-core</include>
<include>org.glassfish.hk2:hk2-locator</include>
<include>org.glassfish.hk2:hk2-runlevel</include>
- <include>org.glassfish.hk2:class-model</include>
- <include>javax.inject:javax.inject</include>
+ <include>org.glassfish.hk2:hk2-utils</include>
+ <include>org.glassfish.hk2:hk2</include>
+ <include>org.glassfish.jersey.core:jersey-client</include>
+ <include>org.glassfish.jersey.core:jersey-common</include>
+ <include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
+ <include>org.glassfish.jersey.inject:jersey-hk2</include>
+ <include>org.glassfish.jersey.media:jersey-media-json-jackson</include>
+ <include>org.noggit:noggit:jar:${noggit.version}</include>
</includes>
</binaries>
</moduleSet>
@@ -119,9 +119,9 @@
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
<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.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
<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.ranger:ranger-plugins-cred</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
diff --git a/distro/src/main/assembly/plugin-kylin.xml b/distro/src/main/assembly/plugin-kylin.xml
index 13ecad3a7..f37fdca0e 100644
--- a/distro/src/main/assembly/plugin-kylin.xml
+++ b/distro/src/main/assembly/plugin-kylin.xml
@@ -61,48 +61,34 @@
<outputDirectory>lib/ranger-kylin-plugin-impl</outputDirectory>
<unpack>false</unpack>
<includes>
+ <include>com.carrotsearch:hppc</include>
+ <include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
<include>commons-collections:commons-collections</include>
- <include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
- <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
+ <include>io.airlift:aircompressor:jar:${aircompressor.version}</include>
+ <include>jakarta.ws.rs:jakarta.ws.rs-api</include>
+ <include>javax.inject:javax.inject</include>
+ <include>joda-time:joda-time</include>
+ <include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
+ <include>net.java.dev.jna:jna:jar:${jna.version}</include>
+ <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
+ <include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
<include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
+ <include>org.apache.httpcomponents:httpcore-nio:jar:${httpcomponents.httpcore.version}</include>
<include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
- <include>org.noggit:noggit:jar:${noggit.version}</include>
+ <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
<include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
- <include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
- <include>net.java.dev.jna:jna:jar:${jna.version}</include>
- <include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
- <include>org.elasticsearch:elasticsearch</include>
- <include>org.elasticsearch:elasticsearch-core</include>
- <include>org.elasticsearch:elasticsearch-x-content</include>
- <include>org.elasticsearch.client:elasticsearch-rest-client</include>
- <include>org.elasticsearch.client:elasticsearch-rest-high-level-client</include>
- <include>org.elasticsearch.plugin:rank-eval-client</include>
- <include>org.elasticsearch.plugin:lang-mustache-client</include>
- <include>org.apache.httpcomponents:httpcore-nio:jar:${httpcomponents.httpcore.version}</include>
- <include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
- <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.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
- <include>jakarta.ws.rs:jakarta.ws.rs-api</include>
- <include>org.glassfish.jersey.core:jersey-client</include>
- <include>org.glassfish.jersey.core:jersey-common</include>
- <include>org.glassfish.jersey.media:jersey-media-json-jackson</include>
- <include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
- <include>org.glassfish.jersey.inject:jersey-hk2</include>
+ <include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
<include>org.glassfish.hk2.external:jakarta.inject</include>
- <include>org.glassfish.hk2:hk2</include>
- <include>org.glassfish.hk2:hk2-utils</include>
+ <include>org.glassfish.hk2:class-model</include>
<include>org.glassfish.hk2:hk2-api</include>
<include>org.glassfish.hk2:hk2-core</include>
<include>org.glassfish.hk2:hk2-locator</include>
<include>org.glassfish.hk2:hk2-runlevel</include>
- <include>org.glassfish.hk2:class-model</include>
- <include>javax.inject:javax.inject</include>
+ <include>org.glassfish.hk2:hk2-utils</include>
+ <include>org.glassfish.hk2:hk2</include>
+ <include>org.glassfish.jersey.core:jersey-common</include>
+ <include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
+ <include>org.glassfish.jersey.inject:jersey-hk2</include>
</includes>
</dependencySet>
<dependencySet>
@@ -115,15 +101,14 @@
<include>commons-cli:commons-cli</include>
<include>commons-collections:commons-collections</include>
<include>commons-io:commons-io:jar:${commons.io.version}</include>
- <include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
<include>org.apache.commons:commons-collections4:jar:${commons.collections4.version}</include>
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
<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.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
- <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.apache.ranger:credentialbuilder</include>
<include>org.apache.ranger:ranger-plugins-cred</include>
<include>org.codehaus.woodstox:stax2-api</include>
diff --git a/distro/src/main/assembly/plugin-ozone.xml b/distro/src/main/assembly/plugin-ozone.xml
index a21ff691c..ce34fc70e 100644
--- a/distro/src/main/assembly/plugin-ozone.xml
+++ b/distro/src/main/assembly/plugin-ozone.xml
@@ -50,14 +50,9 @@
<unpack>false</unpack>
<includes>
<include>com.fasterxml.woodstox:woodstox-core:jar:${fasterxml.woodstox.version}</include>
- <include>com.kstruct:gethostname4j</include>
<include>commons-cli:commons-cli</include>
<include>commons-collections:commons-collections</include>
- <include>commons-configuration:commons-configuration:jar:${commons.configuration1.version}</include>
<include>commons-io:commons-io:jar:${commons.io.version}</include>
- <include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
- <include>net.java.dev.jna:jna</include>
- <include>net.java.dev.jna:jna-platform</include>
<include>org.apache.commons:commons-collections4:jar:${commons.collections4.version}</include>
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
@@ -93,14 +88,12 @@
<includes>
<include>commons-collections:commons-collections</include>
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
- <include>commons-configuration:commons-configuration:jar:${commons.configuration1.version}</include>
<include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
<include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
<include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
<include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
<include>org.apache.zookeeper:zookeeper:jar:${zookeeper.version}</include>
<include>org.apache.zookeeper:zookeeper-jute:jar:${zookeeper.version}</include>
- <include>org.noggit:noggit:jar:${noggit.version}</include>
<include>org.apache.solr:solr-solrj:jar:${solr.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>
@@ -113,24 +106,12 @@
<include>com.kstruct:gethostname4j</include>
<include>net.java.dev.jna:jna</include>
<include>net.java.dev.jna:jna-platform</include>
- <include>org.elasticsearch:elasticsearch</include>
- <include>org.elasticsearch:elasticsearch-core</include>
- <include>org.elasticsearch:elasticsearch-x-content</include>
- <include>org.elasticsearch.client:elasticsearch-rest-client</include>
- <include>org.elasticsearch.client:elasticsearch-rest-high-level-client</include>
- <include>org.elasticsearch.plugin:rank-eval-client</include>
- <include>org.elasticsearch.plugin:lang-mustache-client</include>
<include>org.apache.httpcomponents:httpcore-nio:jar:${httpcomponents.httpcore.version}</include>
<include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
- <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.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
- <include>org.glassfish.jersey.media:jersey-media-json-jackson</include>
<include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
<include>com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:${fasterxml.jackson.version}</include>
</includes>
@@ -140,7 +121,7 @@
<fileSets>
<fileSet>
- <outputDirectory> install/conf.templates/enable</outputDirectory>
+ <outputDirectory>install/conf.templates/enable</outputDirectory>
<directory>../plugin-ozone/conf</directory>
<excludes>
<exclude>*.sh</exclude>
diff --git a/distro/src/main/assembly/plugin-presto.xml b/distro/src/main/assembly/plugin-presto.xml
index 6e21f2d34..2653ee4b8 100644
--- a/distro/src/main/assembly/plugin-presto.xml
+++ b/distro/src/main/assembly/plugin-presto.xml
@@ -38,14 +38,13 @@
<includes>
<include>com.google.inject:guice:jar:${presto.guice.version}</include>
<include>io.airlift:bootstrap:jar:${presto.airlift.version}</include>
- <include>io.airlift:log:jar:${presto.airlift.version}</include>
- <include>io.airlift:log-manager:jar:${presto.airlift.version}</include>
<include>io.airlift:configuration:jar:${presto.airlift.version}</include>
+ <include>io.airlift:log-manager:jar:${presto.airlift.version}</include>
+ <include>io.airlift:log:jar:${presto.airlift.version}</include>
+ <include>javax.annotation:javax.annotation-api:jar:${javax.annotation-api.version}</include>
<include>javax.validation:validation-api:jar:${presto.validation-api.version}</include>
- <include>javax.inject:javax.inject:jar:${javax-inject.version}</include>
<include>org.apache.bval:bval-jsr:jar:${presto.bval-jsr.version}</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
- <include>javax.annotation:javax.annotation-api:jar:${javax.annotation-api.version}</include>
</includes>
</binaries>
</moduleSet>
@@ -69,55 +68,37 @@
<directoryMode>755</directoryMode>
<fileMode>644</fileMode>
<includes>
+ <include>com.carrotsearch:hppc</include>
+ <include>com.fasterxml.jackson.core:jackson-annotations:jar:${fasterxml.jackson.version}</include>
+ <include>com.fasterxml.jackson.core:jackson-core:jar:${fasterxml.jackson.version}</include>
+ <include>com.fasterxml.jackson.core:jackson-databind:jar:${fasterxml.jackson.version}</include>
+ <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:${fasterxml.jackson.version}</include>
+ <include>com.fasterxml.woodstox:woodstox-core</include>
<include>com.google.code.gson:gson*</include>
- <include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
- <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
- <include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
- <include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
- <include>org.noggit:noggit:jar:${noggit.version}</include>
- <include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
- <include>commons-cli:commons-cli</include>
- <include>commons-collections:commons-collections</include>
- <include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
+ <include>com.google.protobuf:protobuf-java:jar:${protobuf-java.version}</include>
+ <include>com.kstruct:gethostname4j</include>
<include>commons-codec:commons-codec</include>
+ <include>commons-collections:commons-collections</include>
<include>commons-io:commons-io:jar:${commons.io.version}</include>
- <include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
- <include>com.google.protobuf:protobuf-java:jar:${protobuf-java.version}</include>
- <include>com.google.re2j:re2j:jar:${presto.re2j.version}</include>
+ <include>io.airlift:aircompressor:jar:${aircompressor.version}</include>
+ <include>joda-time:joda-time</include>
+ <include>net.java.dev.jna:jna-platform</include>
+ <include>net.java.dev.jna:jna</include>
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
+ <include>org.apache.commons:commons-configuration2:jar:${commons.configuration.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.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
+ <include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
+ <include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
+ <include>org.apache.httpcomponents:httpcore-nio:jar:${httpcomponents.httpcore.version}</include>
+ <include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
+ <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
<include>org.apache.ranger:ranger-plugins-cred</include>
- <include>org.apache.ranger:credentialbuilder</include>
- <include>org.codehaus.woodstox:stax2-api</include>
- <include>com.fasterxml.woodstox:woodstox-core</include>
- <include>com.fasterxml.jackson.core:jackson-annotations:jar:${fasterxml.jackson.version}</include>
- <include>com.fasterxml.jackson.core:jackson-core:jar:${fasterxml.jackson.version}</include>
- <include>com.fasterxml.jackson.core:jackson-databind:jar:${fasterxml.jackson.version}</include>
- <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:${fasterxml.jackson.version}</include>
- <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:${fasterxml.jackson.version}</include>
+ <include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
<include>org.apache.zookeeper:zookeeper:jar:${zookeeper.version}</include>
- <include>net.java.dev.jna:jna</include>
- <include>net.java.dev.jna:jna-platform</include>
- <include>com.kstruct:gethostname4j</include>
- <include>org.elasticsearch:elasticsearch</include>
- <include>org.elasticsearch:elasticsearch-core</include>
- <include>org.elasticsearch:elasticsearch-x-content</include>
- <include>org.elasticsearch.client:elasticsearch-rest-client</include>
- <include>org.elasticsearch.client:elasticsearch-rest-high-level-client</include>
- <include>org.elasticsearch.plugin:rank-eval-client</include>
- <include>org.elasticsearch.plugin:lang-mustache-client</include>
- <include>org.apache.httpcomponents:httpcore-nio:jar:${httpcomponents.httpcore.version}</include>
- <include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
- <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.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
+ <include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
</includes>
</binaries>
</moduleSet>
@@ -137,7 +118,6 @@
<include>commons-cli:commons-cli</include>
<include>commons-collections:commons-collections</include>
<include>commons-io:commons-io:jar:${commons.io.version}</include>
- <include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
<include>org.apache.commons:commons-collections4:jar:${commons.collections4.version}</include>
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
diff --git a/distro/src/main/assembly/plugin-schema-registry.xml b/distro/src/main/assembly/plugin-schema-registry.xml
index 03f01aec7..7134125c8 100644
--- a/distro/src/main/assembly/plugin-schema-registry.xml
+++ b/distro/src/main/assembly/plugin-schema-registry.xml
@@ -30,9 +30,7 @@
<scope>runtime</scope>
<unpack>true</unpack>
<excludes>
- <exclude>
- org.slf4j:*
- </exclude>
+ <exclude>org.slf4j:*</exclude>
</excludes>
</dependencySet>
</dependencySets>
diff --git a/distro/src/main/assembly/plugin-solr.xml b/distro/src/main/assembly/plugin-solr.xml
index f89f18ec2..79847cc0e 100644
--- a/distro/src/main/assembly/plugin-solr.xml
+++ b/distro/src/main/assembly/plugin-solr.xml
@@ -52,52 +52,39 @@
<directoryMode>755</directoryMode>
<fileMode>644</fileMode>
<includes>
- <include>commons-collections:commons-collections</include>
- <include>com.google.code.gson:gson</include>
- <include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
- <include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
+ <include>com.carrotsearch:hppc</include>
<include>com.fasterxml.jackson.core:jackson-annotations:jar:${fasterxml.jackson.version}</include>
<include>com.fasterxml.jackson.core:jackson-core:jar:${fasterxml.jackson.version}</include>
<include>com.fasterxml.jackson.core:jackson-databind:jar:${fasterxml.jackson.version}</include>
<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:${fasterxml.jackson.version}</include>
<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:${fasterxml.jackson.version}</include>
+ <include>com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:${fasterxml.jackson.version}</include>
+ <include>com.google.code.gson:gson</include>
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
- <include>net.java.dev.jna:jna:jar:${jna.version}</include>
+ <include>commons-collections:commons-collections</include>
+ <include>io.airlift:aircompressor:jar:${aircompressor.version}</include>
+ <include>jakarta.ws.rs:jakarta.ws.rs-api</include>
+ <include>javax.inject:javax.inject</include>
+ <include>joda-time:joda-time</include>
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
- <include>org.elasticsearch:elasticsearch</include>
- <include>org.elasticsearch:elasticsearch-core</include>
- <include>org.elasticsearch:elasticsearch-x-content</include>
- <include>org.elasticsearch.client:elasticsearch-rest-client</include>
- <include>org.elasticsearch.client:elasticsearch-rest-high-level-client</include>
- <include>org.elasticsearch.plugin:rank-eval-client</include>
- <include>org.elasticsearch.plugin:lang-mustache-client</include>
- <include>org.apache.httpcomponents:httpcore-nio:jar:${httpcomponents.httpcore.version}</include>
+ <include>net.java.dev.jna:jna:jar:${jna.version}</include>
+ <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
+ <include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
+ <include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
<include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
+ <include>org.apache.httpcomponents:httpcore-nio:jar:${httpcomponents.httpcore.version}</include>
<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.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
- <include>jakarta.ws.rs:jakarta.ws.rs-api</include>
- <include>org.glassfish.jersey.core:jersey-client</include>
- <include>org.glassfish.jersey.core:jersey-common</include>
- <include>org.glassfish.jersey.media:jersey-media-json-jackson</include>
- <include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
- <include>org.glassfish.jersey.inject:jersey-hk2</include>
<include>org.glassfish.hk2.external:jakarta.inject</include>
- <include>org.glassfish.hk2:hk2</include>
- <include>org.glassfish.hk2:hk2-utils</include>
+ <include>org.glassfish.hk2:class-model</include>
<include>org.glassfish.hk2:hk2-api</include>
<include>org.glassfish.hk2:hk2-core</include>
<include>org.glassfish.hk2:hk2-locator</include>
<include>org.glassfish.hk2:hk2-runlevel</include>
- <include>org.glassfish.hk2:class-model</include>
- <include>javax.inject:javax.inject</include>
- <include>com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:${fasterxml.jackson.version}</include>
- <include>javax.annotation:javax.annotation-api:jar:${javax.annotation-api.version}</include>
+ <include>org.glassfish.hk2:hk2-utils</include>
+ <include>org.glassfish.hk2:hk2</include>
+ <include>org.glassfish.jersey.core:jersey-common</include>
+ <include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
+ <include>org.glassfish.jersey.inject:jersey-hk2</include>
</includes>
</binaries>
</moduleSet>
@@ -124,12 +111,10 @@
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
<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.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
- <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
- <include>org.apache.ranger:ranger-plugins-cred</include>
- <include>org.apache.ranger:ranger-solr-plugin</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
</includes>
diff --git a/distro/src/main/assembly/plugin-sqoop.xml b/distro/src/main/assembly/plugin-sqoop.xml
index b45b14302..b0fef4a7f 100644
--- a/distro/src/main/assembly/plugin-sqoop.xml
+++ b/distro/src/main/assembly/plugin-sqoop.xml
@@ -57,48 +57,34 @@
<directoryMode>755</directoryMode>
<fileMode>644</fileMode>
<includes>
+ <include>com.carrotsearch:hppc</include>
+ <include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
<include>commons-collections:commons-collections</include>
+ <include>io.airlift:aircompressor:jar:${aircompressor.version}</include>
<include>jakarta.ws.rs:jakarta.ws.rs-api</include>
- <include>org.glassfish.jersey.core:jersey-client</include>
- <include>org.glassfish.jersey.core:jersey-common</include>
- <include>org.glassfish.jersey.media:jersey-media-json-jackson</include>
- <include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
- <include>org.glassfish.jersey.inject:jersey-hk2</include>
+ <include>javax.inject:javax.inject</include>
+ <include>joda-time:joda-time</include>
+ <include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
+ <include>net.java.dev.jna:jna:jar:${jna.version}</include>
+ <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
+ <include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
+ <include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
+ <include>org.apache.httpcomponents:httpcore-nio:jar:${httpcomponents.httpcore.version}</include>
+ <include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
+ <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
+ <include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
+ <include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
<include>org.glassfish.hk2.external:jakarta.inject</include>
- <include>org.glassfish.hk2:hk2</include>
- <include>org.glassfish.hk2:hk2-utils</include>
+ <include>org.glassfish.hk2:class-model</include>
<include>org.glassfish.hk2:hk2-api</include>
<include>org.glassfish.hk2:hk2-core</include>
<include>org.glassfish.hk2:hk2-locator</include>
<include>org.glassfish.hk2:hk2-runlevel</include>
- <include>org.glassfish.hk2:class-model</include>
- <include>javax.inject:javax.inject</include>
- <include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
- <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
- <include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
- <include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
- <include>org.noggit:noggit:jar:${noggit.version}</include>
- <include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
- <include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
- <include>net.java.dev.jna:jna:jar:${jna.version}</include>
- <include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
- <include>org.elasticsearch:elasticsearch</include>
- <include>org.elasticsearch:elasticsearch-core</include>
- <include>org.elasticsearch:elasticsearch-x-content</include>
- <include>org.elasticsearch.client:elasticsearch-rest-client</include>
- <include>org.elasticsearch.client:elasticsearch-rest-high-level-client</include>
- <include>org.elasticsearch.plugin:rank-eval-client</include>
- <include>org.elasticsearch.plugin:lang-mustache-client</include>
- <include>org.apache.httpcomponents:httpcore-nio:jar:${httpcomponents.httpcore.version}</include>
- <include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
- <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.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
+ <include>org.glassfish.hk2:hk2-utils</include>
+ <include>org.glassfish.hk2:hk2</include>
+ <include>org.glassfish.jersey.core:jersey-common</include>
+ <include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
+ <include>org.glassfish.jersey.inject:jersey-hk2</include>
</includes>
</binaries>
</moduleSet>
@@ -120,16 +106,14 @@
<include>commons-cli:commons-cli</include>
<include>commons-collections:commons-collections</include>
<include>commons-io:commons-io:jar:${commons.io.version}</include>
- <include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
<include>org.apache.commons:commons-collections4:jar:${commons.collections4.version}</include>
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
<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.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
- <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
- <include>org.apache.ranger:ranger-plugins-cred</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
</includes>
diff --git a/distro/src/main/assembly/plugin-trino.xml b/distro/src/main/assembly/plugin-trino.xml
index 9d6523f15..a38cb2407 100644
--- a/distro/src/main/assembly/plugin-trino.xml
+++ b/distro/src/main/assembly/plugin-trino.xml
@@ -42,90 +42,65 @@
<directoryMode>755</directoryMode>
<fileMode>644</fileMode>
<includes>
- <include>com.google.inject:guice:jar:${trino.guice.version}</include>
- <include>io.airlift:bootstrap:jar:${trino.airlift.version}</include>
- <include>io.airlift:log:jar:${trino.airlift.version}</include>
- <include>io.airlift:log-manager:jar:${trino.airlift.version}</include>
- <include>io.airlift:configuration:jar:${trino.airlift.version}</include>
- <include>javax.validation:validation-api:jar:${trino.validation-api.version}</include>
- <include>javax.inject:javax.inject:jar:${javax-inject.version}</include>
- <include>org.apache.bval:bval-jsr:jar:${trino.bval-jsr.version}</include>
- <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
- <include>org.slf4j:slf4j-simple:jar:${slf4j.version}</include>
- <include>javax.annotation:javax.annotation-api:jar:${javax.annotation-api.version}</include>
+ <include>ch.qos.logback:logback-classic:jar:${logback.version}</include>
+ <include>ch.qos.logback:logback-core:jar:${logback.version}</include>
+ <include>com.carrotsearch:hppc</include>
+ <include>com.fasterxml.jackson.core:jackson-annotations:jar:${fasterxml.jackson.version}</include>
<include>com.fasterxml.jackson.core:jackson-core</include>
<include>com.fasterxml.jackson.core:jackson-databind</include>
+ <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:${fasterxml.jackson.version}</include>
+ <include>com.fasterxml.woodstox:woodstox-core</include>
<include>com.google.code.gson:gson*</include>
- <include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
- <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
- <include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
- <include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
- <include>org.noggit:noggit:jar:${noggit.version}</include>
- <include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
- <include>commons-cli:commons-cli</include>
- <include>commons-collections:commons-collections</include>
- <include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
+ <include>com.google.inject:guice:jar:${trino.guice.version}</include>
+ <include>com.kstruct:gethostname4j</include>
<include>commons-codec:commons-codec</include>
+ <include>commons-collections:commons-collections</include>
<include>commons-io:commons-io:jar:${commons.io.version}</include>
- <include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
+ <include>dnsjava:dnsjava:jar:${dnsjava.version}</include>
+ <include>io.airlift:aircompressor:jar:${aircompressor.version}</include>
+ <include>io.airlift:bootstrap:jar:${trino.airlift.version}</include>
+ <include>io.airlift:configuration:jar:${trino.airlift.version}</include>
+ <include>io.airlift:log-manager:jar:${trino.airlift.version}</include>
+ <include>io.airlift:log:jar:${trino.airlift.version}</include>
+ <include>jakarta.ws.rs:jakarta.ws.rs-api</include>
+ <include>javax.annotation:javax.annotation-api:jar:${javax.annotation-api.version}</include>
+ <include>javax.inject:javax.inject</include>
+ <include>javax.validation:validation-api:jar:${trino.validation-api.version}</include>
+ <include>joda-time:joda-time</include>
+ <include>net.java.dev.jna:jna-platform</include>
+ <include>net.java.dev.jna:jna</include>
+ <include>org.apache.bval:bval-jsr:jar:${trino.bval-jsr.version}</include>
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
- <include>org.slf4j:jcl-over-slf4j:jar:${slf4j.version}</include>
- <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
- <include>ch.qos.logback:logback-classic:jar:${logback.version}</include>
- <include>ch.qos.logback:logback-core:jar:${logback.version}</include>
- <include>com.google.protobuf:protobuf-java:jar:${protobuf-java.version}</include>
- <include>com.google.re2j:re2j:jar:${trino.re2j.version}</include>
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
+ <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.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
+ <include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
+ <include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
+ <include>org.apache.httpcomponents:httpcore-nio:jar:${httpcomponents.httpcore.version}</include>
+ <include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
+ <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
<include>org.apache.ranger:ranger-plugins-cred</include>
- <include>org.apache.ranger:credentialbuilder</include>
- <include>org.codehaus.woodstox:stax2-api:jar:${codehaus.woodstox.stax2api.version}</include>
- <include>com.fasterxml.woodstox:woodstox-core</include>
- <include>com.fasterxml.jackson.core:jackson-annotations:jar:${fasterxml.jackson.version}</include>
- <include>com.fasterxml.jackson.core:jackson-core:jar:${fasterxml.jackson.version}</include>
- <include>com.fasterxml.jackson.core:jackson-databind:jar:${fasterxml.jackson.version}</include>
- <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:${fasterxml.jackson.version}</include>
- <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:${fasterxml.jackson.version}</include>
+ <include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
<include>org.apache.zookeeper:zookeeper:jar:${zookeeper.version}</include>
- <include>net.java.dev.jna:jna</include>
- <include>net.java.dev.jna:jna-platform</include>
- <include>com.kstruct:gethostname4j</include>
- <include>org.elasticsearch:elasticsearch</include>
- <include>org.elasticsearch:elasticsearch-core</include>
- <include>org.elasticsearch:elasticsearch-x-content</include>
- <include>org.elasticsearch.client:elasticsearch-rest-client</include>
- <include>org.elasticsearch.client:elasticsearch-rest-high-level-client</include>
- <include>org.elasticsearch.plugin:rank-eval-client</include>
- <include>org.elasticsearch.plugin:lang-mustache-client</include>
- <include>org.apache.httpcomponents:httpcore-nio:jar:${httpcomponents.httpcore.version}</include>
- <include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
- <include>org.apache.lucene:lucene-core</include>
- <include>joda-time:joda-time</include>
- <include>com.carrotsearch:hppc</include>
- <include>dnsjava:dnsjava:jar:${dnsjava.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>
- <include>org.apache.hive:hive-storage-api:jar:${storage-api.version}</include>
- <include>jakarta.ws.rs:jakarta.ws.rs-api</include>
- <include>org.glassfish.jersey.core:jersey-client</include>
- <include>org.glassfish.jersey.core:jersey-common</include>
- <include>org.glassfish.jersey.media:jersey-media-json-jackson</include>
- <include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
- <include>org.glassfish.jersey.inject:jersey-hk2</include>
+ <include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
<include>org.glassfish.hk2.external:jakarta.inject</include>
- <include>org.glassfish.hk2:hk2</include>
- <include>org.glassfish.hk2:hk2-utils</include>
+ <include>org.glassfish.hk2:class-model</include>
<include>org.glassfish.hk2:hk2-api</include>
<include>org.glassfish.hk2:hk2-core</include>
<include>org.glassfish.hk2:hk2-locator</include>
<include>org.glassfish.hk2:hk2-runlevel</include>
- <include>org.glassfish.hk2:class-model</include>
- <include>javax.inject:javax.inject</include>
+ <include>org.glassfish.hk2:hk2-utils</include>
+ <include>org.glassfish.hk2:hk2</include>
+ <include>org.glassfish.jersey.core:jersey-common</include>
+ <include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
+ <include>org.glassfish.jersey.inject:jersey-hk2</include>
+ <include>org.slf4j:jcl-over-slf4j:jar:${slf4j.version}</include>
+ <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
+ <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
</includes>
</binaries>
</moduleSet>
@@ -145,16 +120,14 @@
<include>commons-cli:commons-cli</include>
<include>commons-collections:commons-collections</include>
<include>commons-io:commons-io:jar:${commons.io.version}</include>
- <include>commons-lang:commons-lang</include>
- <include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
<include>org.apache.commons:commons-collections4:jar:${commons.collections4.version}</include>
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
<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.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
- <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
</includes>
diff --git a/distro/src/main/assembly/plugin-yarn.xml b/distro/src/main/assembly/plugin-yarn.xml
index 51292e592..5360a09f6 100644
--- a/distro/src/main/assembly/plugin-yarn.xml
+++ b/distro/src/main/assembly/plugin-yarn.xml
@@ -57,34 +57,21 @@
<directoryMode>755</directoryMode>
<fileMode>644</fileMode>
<includes>
+ <include>com.carrotsearch:hppc</include>
+ <include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
<include>commons-collections:commons-collections</include>
- <include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
- <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
+ <include>io.airlift:aircompressor:jar:${aircompressor.version}</include>
+ <include>joda-time:joda-time</include>
+ <include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
+ <include>net.java.dev.jna:jna:jar:${jna.version}</include>
+ <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
+ <include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
<include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
+ <include>org.apache.httpcomponents:httpcore-nio:jar:${httpcomponents.httpcore.version}</include>
<include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
- <include>org.noggit:noggit:jar:${noggit.version}</include>
+ <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
<include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
- <include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
- <include>net.java.dev.jna:jna:jar:${jna.version}</include>
- <include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
- <include>org.elasticsearch:elasticsearch</include>
- <include>org.elasticsearch:elasticsearch-core</include>
- <include>org.elasticsearch:elasticsearch-x-content</include>
- <include>org.elasticsearch.client:elasticsearch-rest-client</include>
- <include>org.elasticsearch.client:elasticsearch-rest-high-level-client</include>
- <include>org.elasticsearch.plugin:rank-eval-client</include>
- <include>org.elasticsearch.plugin:lang-mustache-client</include>
- <include>org.apache.httpcomponents:httpcore-nio:jar:${httpcomponents.httpcore.version}</include>
- <include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
- <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.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
- <include>org.glassfish.jersey.media:jersey-media-json-jackson</include>
+ <include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
<include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
</includes>
</binaries>
@@ -107,17 +94,14 @@
<include>commons-cli:commons-cli</include>
<include>commons-collections:commons-collections</include>
<include>commons-io:commons-io:jar:${commons.io.version}</include>
- <include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
<include>org.apache.commons:commons-collections4:jar:${commons.collections4.version}</include>
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
<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.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
- <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
- <include>org.apache.ranger:credentialbuilder</include>
- <include>org.apache.ranger:ranger-plugins-cred</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
</includes>
diff --git a/distro/src/main/assembly/ranger-tools.xml b/distro/src/main/assembly/ranger-tools.xml
index 341044ff5..208de0091 100644
--- a/distro/src/main/assembly/ranger-tools.xml
+++ b/distro/src/main/assembly/ranger-tools.xml
@@ -39,60 +39,27 @@
<outputDirectory>lib</outputDirectory>
<unpack>false</unpack>
<includes>
- <include>commons-cli:commons-cli</include>
- <include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
- <include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
- <include>log4j:log4j</include>
- <include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
- <include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
- <include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
- <include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
- <include>org.eclipse.persistence:eclipselink</include>
- <include>org.eclipse.persistence:javax.persistence</include>
- <include>commons-collections:commons-collections</include>
- <include>commons-io:commons-io</include>
- <include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
- <include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
- <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
- <include>org.noggit:noggit:jar:${noggit.version}</include>
+ <include>ch.qos.logback:logback-classic:jar:${logback.version}</include>
+ <include>ch.qos.logback:logback-core:jar:${logback.version}</include>
<include>com.fasterxml.jackson.core:jackson-annotations:jar:${fasterxml.jackson.version}</include>
<include>com.fasterxml.jackson.core:jackson-core:jar:${fasterxml.jackson.version}</include>
<include>com.fasterxml.jackson.core:jackson-databind:jar:${fasterxml.jackson.version}</include>
<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:${fasterxml.jackson.version}</include>
<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:${fasterxml.jackson.version}</include>
- <include>org.codehaus.woodstox:stax2-api:jar:${codehaus.woodstox.stax2api.version}</include>
- <include>com.fasterxml.woodstox:woodstox-core:jar:${fasterxml.woodstox.version}</include>
+ <include>com.google.code.gson:gson:jar:${gson.version}</include>
+ <include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
+ <include>commons-cli:commons-cli</include>
+ <include>commons-collections:commons-collections</include>
+ <include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
+ <include>net.java.dev.jna:jna:jar:${jna.version}</include>
+ <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.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
+ <include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
<include>org.apache.ranger:ranger-audit-core</include>
- <include>org.apache.ranger:ranger-audit-dest-hdfs</include>
- <include>org.apache.ranger:ranger-audit-dest-solr</include>
<include>org.apache.ranger:ranger-authz-api</include>
<include>org.apache.ranger:ranger-plugins-common</include>
- <include>org.apache.ranger:ugsync-util</include>
- <include>org.apache.ranger:ranger-plugins-audit</include>
- <include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
- <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>
- <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>com.google.code.gson:gson:jar:${gson.version}</include>
- <include>jakarta.ws.rs:jakarta.ws.rs-api</include>
- <include>org.glassfish.jersey.core:jersey-client</include>
- <include>org.glassfish.jersey.core:jersey-common</include>
- <include>org.glassfish.jersey.media:jersey-media-json-jackson</include>
- <include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
- <include>org.glassfish.jersey.inject:jersey-hk2</include>
- <include>org.glassfish.hk2.external:jakarta.inject</include>
- <include>org.glassfish.hk2:hk2</include>
- <include>org.glassfish.hk2:hk2-utils</include>
- <include>org.glassfish.hk2:hk2-api</include>
- <include>org.glassfish.hk2:hk2-core</include>
- <include>org.glassfish.hk2:hk2-locator</include>
- <include>org.glassfish.hk2:hk2-runlevel</include>
- <include>org.glassfish.hk2:class-model</include>
- <include>javax.inject:javax.inject</include>
</includes>
</dependencySet>
</dependencySets>
diff --git a/distro/src/main/assembly/sample-client.xml b/distro/src/main/assembly/sample-client.xml
index 7d2b0897e..b66e80a09 100644
--- a/distro/src/main/assembly/sample-client.xml
+++ b/distro/src/main/assembly/sample-client.xml
@@ -40,54 +40,25 @@
<directoryMode>755</directoryMode>
<fileMode>644</fileMode>
<includes>
+ <include>com.fasterxml.jackson.core:jackson-annotations:jar:${fasterxml.jackson.version}</include>
+ <include>com.fasterxml.jackson.core:jackson-core:jar:${fasterxml.jackson.version}</include>
+ <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:${fasterxml.jackson.version}</include>
+ <include>com.google.code.gson:gson</include>
+ <include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
<include>commons-cli:commons-cli</include>
- <include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
- <include>org.apache.commons:commons-lang3</include>
+ <include>commons-collections:commons-collections</include>
+ <include>commons-io:commons-io</include>
+ <include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
+ <include>net.java.dev.jna:jna:jar:${jna.version}</include>
<include>org.apache.commons:commons-compress</include>
- <include>com.google.code.gson:gson</include>
- <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
- <include>org.slf4j:slf4j-log4j12</include>
- <include>log4j:log4j</include>
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
+ <include>org.apache.commons:commons-lang3</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.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
- <include>org.eclipse.persistence:eclipselink</include>
- <include>org.eclipse.persistence:javax.persistence</include>
- <include>commons-collections:commons-collections</include>
- <include>commons-io:commons-io</include>
- <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
- <include>org.noggit:noggit:jar:${noggit.version}</include>
- <include>com.fasterxml.jackson.core:jackson-annotations:jar:${fasterxml.jackson.version}</include>
- <include>com.fasterxml.jackson.core:jackson-core:jar:${fasterxml.jackson.version}</include>
- <include>com.fasterxml.jackson.core:jackson-databind:jar:${fasterxml.jackson.version}</include>
- <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:${fasterxml.jackson.version}</include>
- <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:${fasterxml.jackson.version}</include>
<include>org.apache.ranger:ranger-audit-core</include>
- <include>org.apache.ranger:ranger-audit-dest-hdfs</include>
- <include>org.apache.ranger:ranger-audit-dest-solr</include>
- <include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
- <include>net.java.dev.jna:jna:jar:${jna.version}</include>
- <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>
- <include>org.apache.hadoop.thirdparty:*</include>
- <include>jakarta.ws.rs:jakarta.ws.rs-api</include>
- <include>org.glassfish.jersey.core:jersey-client</include>
- <include>org.glassfish.jersey.core:jersey-common</include>
- <include>org.glassfish.jersey.media:jersey-media-json-jackson</include>
- <include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
- <include>org.glassfish.jersey.inject:jersey-hk2</include>
- <include>org.glassfish.hk2.external:jakarta.inject</include>
- <include>org.glassfish.hk2:hk2</include>
- <include>org.glassfish.hk2:hk2-utils</include>
- <include>org.glassfish.hk2:hk2-api</include>
- <include>org.glassfish.hk2:hk2-core</include>
- <include>org.glassfish.hk2:hk2-locator</include>
- <include>org.glassfish.hk2:hk2-runlevel</include>
- <include>org.glassfish.hk2:class-model</include>
- <include>javax.inject:javax.inject</include>
+ <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
</includes>
</binaries>
</moduleSet>
diff --git a/distro/src/main/assembly/storm-agent.xml b/distro/src/main/assembly/storm-agent.xml
index 32aa3b476..63b2e849a 100644
--- a/distro/src/main/assembly/storm-agent.xml
+++ b/distro/src/main/assembly/storm-agent.xml
@@ -61,68 +61,49 @@
<outputDirectory>lib/ranger-storm-plugin-impl</outputDirectory>
<unpack>false</unpack>
<includes>
- <include>commons-configuration:commons-configuration</include>
- <include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
- <include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
- <include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
- <include>com.google.code.gson:gson</include>
- <include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
- <include>commons-collections:commons-collections</include>
- <include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
- <include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
- <include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
- <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
- <include>org.noggit:noggit:jar:${noggit.version}</include>
- <include>com.google.protobuf:protobuf-java:jar:${protobuf-java.version}</include>
- <include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
- <include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
- <include>org.apache.htrace:htrace-core:jar:${htrace-core.version}</include>
- <include>commons-cli:commons-cli:jar:${commons.cli.version}</include>
- <include>commons-io:commons-io:jar:${commons.io.version}</include>
+ <include>com.carrotsearch:hppc</include>
<include>com.fasterxml.jackson.core:jackson-annotations:jar:${fasterxml.jackson.version}</include>
<include>com.fasterxml.jackson.core:jackson-core:jar:${fasterxml.jackson.version}</include>
<include>com.fasterxml.jackson.core:jackson-databind:jar:${fasterxml.jackson.version}</include>
<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:${fasterxml.jackson.version}</include>
<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider</include>
- <include>com.fasterxml.jackson.core:jackson-databind</include>
- <include>com.fasterxml.jackson.core:jackson-core:jar:${fasterxml.jackson.version}</include>
- <include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
- <include>commons-codec:commons-codec</include>
+ <include>com.google.code.gson:gson</include>
+ <include>com.google.protobuf:protobuf-java:jar:${protobuf-java.version}</include>
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
- <include>net.java.dev.jna:jna:jar:${jna.version}</include>
- <include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
- <include>org.elasticsearch:elasticsearch</include>
- <include>org.elasticsearch:elasticsearch-core</include>
- <include>org.elasticsearch:elasticsearch-x-content</include>
- <include>org.elasticsearch.client:elasticsearch-rest-client</include>
- <include>org.elasticsearch.client:elasticsearch-rest-high-level-client</include>
- <include>org.elasticsearch.plugin:rank-eval-client</include>
- <include>org.elasticsearch.plugin:lang-mustache-client</include>
- <include>org.apache.httpcomponents:httpcore-nio:jar:${httpcomponents.httpcore.version}</include>
- <include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
- <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>commons-cli:commons-cli:jar:${commons.cli.version}</include>
+ <include>commons-codec:commons-codec</include>
+ <include>commons-collections:commons-collections</include>
+ <include>commons-io:commons-io:jar:${commons.io.version}</include>
<include>io.airlift:aircompressor:jar:${aircompressor.version}</include>
- <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>jakarta.ws.rs:jakarta.ws.rs-api</include>
- <include>org.glassfish.jersey.core:jersey-client</include>
- <include>org.glassfish.jersey.core:jersey-common</include>
- <include>org.glassfish.jersey.media:jersey-media-json-jackson</include>
- <include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
- <include>org.glassfish.jersey.inject:jersey-hk2</include>
+ <include>javax.inject:javax.inject</include>
+ <include>joda-time:joda-time</include>
+ <include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
+ <include>net.java.dev.jna:jna:jar:${jna.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.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
+ <include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
+ <include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
+ <include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
+ <include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
+ <include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
+ <include>org.apache.httpcomponents:httpcore-nio:jar:${httpcomponents.httpcore.version}</include>
+ <include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
+ <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
+ <include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
+ <include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
<include>org.glassfish.hk2.external:jakarta.inject</include>
- <include>org.glassfish.hk2:hk2</include>
- <include>org.glassfish.hk2:hk2-utils</include>
+ <include>org.glassfish.hk2:class-model</include>
<include>org.glassfish.hk2:hk2-api</include>
<include>org.glassfish.hk2:hk2-core</include>
<include>org.glassfish.hk2:hk2-locator</include>
<include>org.glassfish.hk2:hk2-runlevel</include>
- <include>org.glassfish.hk2:class-model</include>
- <include>javax.inject:javax.inject</include>
+ <include>org.glassfish.hk2:hk2-utils</include>
+ <include>org.glassfish.hk2:hk2</include>
+ <include>org.glassfish.jersey.core:jersey-common</include>
+ <include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
+ <include>org.glassfish.jersey.inject:jersey-hk2</include>
</includes>
</dependencySet>
<dependencySet>
@@ -136,15 +117,14 @@
<include>commons-collections:commons-collections</include>
<include>commons-configuration:commons-configuration</include>
<include>commons-io:commons-io:jar:${commons.io.version}</include>
- <include>commons-logging:commons-logging</include>
<include>org.apache.commons:commons-collections4:jar:${commons.collections4.version}</include>
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
<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.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
- <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.apache.ranger:credentialbuilder</include>
<include>org.apache.ranger:ranger-plugins-cred</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
diff --git a/distro/src/main/assembly/tagsync.xml b/distro/src/main/assembly/tagsync.xml
index 51b5b6cd5..7f7573b87 100644
--- a/distro/src/main/assembly/tagsync.xml
+++ b/distro/src/main/assembly/tagsync.xml
@@ -40,10 +40,8 @@
<outputDirectory>lib</outputDirectory>
<unpack>false</unpack>
<includes>
- <include>aopalliance:aopalliance:jar:${aopalliance.version}</include>
<include>ch.qos.logback:logback-classic:jar:${logback.version}</include>
<include>ch.qos.logback:logback-core:jar:${logback.version}</include>
- <include>com.101tec:zkclient</include>
<include>com.fasterxml.jackson.core:jackson-annotations</include>
<include>com.fasterxml.jackson.core:jackson-core</include>
<include>com.fasterxml.jackson.core:jackson-databind</include>
@@ -53,6 +51,7 @@
<include>com.fasterxml.woodstox:woodstox-core</include>
<include>com.google.code.gson:gson:jar:${gson.version}</include>
<include>com.google.guava:guava</include>
+ <include>com.google.guava:guava</include>
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
<include>com.sun.xml.bind:jaxb-core</include>
<include>com.sun.xml.bind:jaxb-impl</include>
@@ -62,8 +61,6 @@
<include>commons-configuration:commons-configuration:jar:${commons.configuration1.version}</include>
<include>commons-io:commons-io:jar:${commons.io.version}</include>
<include>commons-lang:commons-lang</include>
- <include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
- <include>javax.inject:javax.inject:jar:${javax-inject.version}</include>
<include>commons-logging:commons-logging</include>
<include>jakarta.activation:jakarta.activation-api</include>
<include>jakarta.ws.rs:jakarta.ws.rs-api</include>
@@ -72,11 +69,8 @@
<include>javax.annotation:javax.annotation-api</include>
<include>javax.inject:javax.inject</include>
<include>javax.xml.bind:jaxb-api</include>
- <include>joda-time:joda-time:jar:${joda-time.version}</include>
+ <include>joda-time:joda-time</include>
<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.commons:commons-collections4:jar:${commons.collections4.version}</include>
<include>net.java.dev.jna:jna:jar:${jna.version}</include>
<include>org.apache.atlas:atlas-client-common:jar:${atlas.version}</include>
<include>org.apache.atlas:atlas-client-v1:jar:${atlas.version}</include>
@@ -84,14 +78,15 @@
<include>org.apache.atlas:atlas-common:jar:${atlas.version}</include>
<include>org.apache.atlas:atlas-intg:jar:${atlas.version}</include>
<include>org.apache.atlas:atlas-notification:jar:${atlas.version}</include>
+ <include>org.apache.commons:commons-collections4:jar:${commons.collections4.version}</include>
<include>org.apache.commons:commons-compress</include>
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
<include>org.apache.commons:commons-lang3</include>
- <include>org.apache.commons:commons-lang</include>
<include>org.apache.curator:curator-client:jar:${curator.version}</include>
<include>org.apache.curator:curator-framework:jar:${curator.version}</include>
<include>org.apache.curator:curator-recipes:jar:${curator.version}</include>
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
+ <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.apache.hadoop:hadoop-auth</include>
<include>org.apache.hadoop:hadoop-common</include>
<include>org.apache.kafka:kafka-clients:jar:${kafka.version}</include>
@@ -99,15 +94,10 @@
<include>org.apache.ranger:ranger-authz-api</include>
<include>org.apache.ranger:ranger-common-ha:jar:${project.version}</include>
<include>org.apache.ranger:ranger-plugins-common</include>
- <include>org.apache.ranger:ranger-plugins-cred</include>
<include>org.apache.ranger:ranger-util</include>
<include>org.apache.zookeeper:zookeeper-jute:jar:${zookeeper.version}</include>
- <include>com.google.guava:guava</include>
- <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
<include>org.apache.zookeeper:zookeeper:jar:${zookeeper.version}</include>
- <include>org.cloudera.logredactor:logredactor</include>
- <include>org.codehaus.jettison:jettison:jar:${jettison.version}</include>
- <include>org.codehaus.woodstox:stax2-api</include>
+ <include>org.codehaus.woodstox:stax2-api:jar:${codehaus.woodstox.stax2api.version}</include>
<include>org.glassfish.hk2.external:jakarta.inject</include>
<include>org.glassfish.hk2:class-model</include>
<include>org.glassfish.hk2:hk2-api</include>
diff --git a/distro/src/main/assembly/usersync.xml b/distro/src/main/assembly/usersync.xml
index 74490a36b..d409c4c36 100644
--- a/distro/src/main/assembly/usersync.xml
+++ b/distro/src/main/assembly/usersync.xml
@@ -40,73 +40,66 @@
<outputDirectory>lib</outputDirectory>
<unpack>false</unpack>
<includes>
+ <include>ch.qos.logback:logback-classic:jar:${logback.version}</include>
+ <include>ch.qos.logback:logback-core:jar:${logback.version}</include>
+ <include>com.fasterxml.jackson.core:jackson-annotations:jar:${fasterxml.jackson.version}</include>
+ <include>com.fasterxml.jackson.core:jackson-core:jar:${fasterxml.jackson.version}</include>
+ <include>com.fasterxml.jackson.core:jackson-databind:jar:${fasterxml.jackson.databind.version}</include>
+ <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:${fasterxml.jackson.version}</include>
+ <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:${fasterxml.jackson.version}</include>
+ <include>com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:${fasterxml.jackson.version}</include>
+ <include>com.fasterxml.woodstox:woodstox-core:jar:${fasterxml.woodstox.version}</include>
<include>com.google.code.gson:gson</include>
+ <include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
+ <include>com.sun.istack:istack-commons-runtime</include>
<include>commons-cli:commons-cli</include>
+ <include>commons-codec:commons-codec</include>
<include>commons-collections:commons-collections</include>
+ <include>commons-io:commons-io:jar:${commons.io.version}</include>
<include>commons-logging:commons-logging</include>
+ <include>jakarta.activation:jakarta.activation-api</include>
+ <include>jakarta.ws.rs:jakarta.ws.rs-api</include>
+ <include>javax.annotation:javax.annotation-api</include>
+ <include>javax.inject:javax.inject</include>
+ <include>javax.xml.bind:jaxb-api</include>
+ <include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
+ <include>net.java.dev.jna:jna:jar:${jna.version}</include>
+ <include>org.apache.commons:commons-collections4:jar:${commons.collections4.version}</include>
+ <include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
+ <include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
+ <include>org.apache.commons:commons-csv</include>
+ <include>org.apache.commons:commons-lang3</include>
+ <include>org.apache.curator:curator-client:jar:${curator.version}</include>
+ <include>org.apache.curator:curator-framework:jar:${curator.version}</include>
+ <include>org.apache.curator:curator-recipes:jar:${curator.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.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
- <include>org.slf4j:slf4j-api:jar:${slf4j.version}</include>
- <include>org.apache.commons:commons-csv</include>
- <include>org.apache.ranger:credentialbuilder</include>
- <include>org.apache.ranger:ranger-util</include>
- <include>commons-io:commons-io:jar:${commons.io.version}</include>
<include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
- <include>commons-codec:commons-codec</include>
+ <include>org.apache.ranger:credentialbuilder</include>
<include>org.apache.ranger:ranger-authz-api</include>
+ <include>org.apache.ranger:ranger-common-ha:jar:${project.version}</include>
<include>org.apache.ranger:ranger-plugins-common</include>
+ <include>org.apache.ranger:ranger-util</include>
<include>org.apache.ranger:ugsync-util</include>
- <include>org.apache.ranger:ranger-common-ha:jar:${project.version}</include>
- <include>org.apache.curator:curator-framework:jar:${curator.version}</include>
- <include>org.apache.curator:curator-recipes:jar:${curator.version}</include>
- <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.ranger:ugsync-util</include>
- <include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
- <include>net.java.dev.jna:jna:jar:${jna.version}</include>
- <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.commons:commons-collections4:jar:${commons.collections4.version}</include>
- <include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
- <include>org.cloudera.logredactor:logredactor</include>
- <include>com.fasterxml.jackson.core:jackson-annotations:jar:${fasterxml.jackson.version}</include>
- <include>com.fasterxml.jackson.core:jackson-core:jar:${fasterxml.jackson.version}</include>
- <include>com.fasterxml.jackson.core:jackson-databind:jar:${fasterxml.jackson.databind.version}</include>
- <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:${fasterxml.jackson.version}</include>
- <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:${fasterxml.jackson.version}</include>
- <include>com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:${fasterxml.jackson.version}</include>
+ <include>org.apache.zookeeper:zookeeper-jute:jar:${zookeeper.version}</include>
+ <include>org.apache.zookeeper:zookeeper:jar:${zookeeper.version}</include>
<include>org.codehaus.jettison:jettison:jar:${jettison.version}</include>
- <include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
- <include>org.apache.commons:commons-lang3</include>
- <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>
- <include>jakarta.ws.rs:jakarta.ws.rs-api</include>
- <include>org.glassfish.jersey.core:jersey-client</include>
- <include>org.glassfish.jersey.core:jersey-common</include>
- <include>org.glassfish.jersey.media:jersey-media-json-jackson</include>
- <include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
- <include>org.glassfish.jersey.inject:jersey-hk2</include>
+ <include>org.codehaus.woodstox:stax2-api:jar:${codehaus.woodstox.stax2api.version}</include>
<include>org.glassfish.hk2.external:jakarta.inject</include>
- <include>org.glassfish.hk2:hk2</include>
- <include>org.glassfish.hk2:hk2-utils</include>
<include>org.glassfish.hk2:hk2-api</include>
- <include>org.glassfish.hk2:hk2-core</include>
<include>org.glassfish.hk2:hk2-locator</include>
- <include>org.glassfish.hk2:hk2-runlevel</include>
- <include>org.glassfish.hk2:class-model</include>
- <include>javax.inject:javax.inject</include>
- <include>javax.annotation:javax.annotation-api</include>
- <include>javax.xml.bind:jaxb-api</include>
- <include>jakarta.activation:jakarta.activation-api</include>
+ <include>org.glassfish.hk2:hk2-utils</include>
<include>org.glassfish.jaxb:jaxb-runtime</include>
- <include>org.glassfish.jaxb:jaxb-core</include>
<include>org.glassfish.jaxb:txw2</include>
- <include>com.sun.istack:istack-commons-runtime</include>
+ <include>org.glassfish.jersey.core:jersey-client</include>
+ <include>org.glassfish.jersey.core:jersey-common</include>
+ <include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
+ <include>org.glassfish.jersey.inject:jersey-hk2</include>
+ <include>org.glassfish.jersey.media:jersey-media-json-jackson</include>
+ <include>org.slf4j:slf4j-api:jar:${slf4j.version}</include>
</includes>
</dependencySet>
<dependencySet>