This is an automated email from the ASF dual-hosted git repository.
madhan pushed a commit to branch ranger-2.5
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/ranger-2.5 by this push:
new 3b306a714 RANGER-4858: Remove usage of htrace-core4 PR #332
3b306a714 is described below
commit 3b306a7149217f916c384a7744321e7913824464
Author: Grzegorz Kokosiński <grzeg...@starburstdata.com>
AuthorDate: Mon Jul 15 09:18:12 2024 -0700
RANGER-4858: Remove usage of htrace-core4 PR #332
Signed-off-by: Madhan Neethiraj <mad...@apache.org>
(cherry picked from commit bc091c5ead4bb9901f822092d2a8524e602f2769)
---
distro/src/main/assembly/admin-web.xml | 3 ---
distro/src/main/assembly/hbase-agent.xml | 1 -
distro/src/main/assembly/hdfs-agent.xml | 1 -
distro/src/main/assembly/hive-agent.xml | 1 -
distro/src/main/assembly/kms.xml | 2 --
distro/src/main/assembly/knox-agent.xml | 2 --
distro/src/main/assembly/plugin-atlas.xml | 2 --
distro/src/main/assembly/plugin-kafka.xml | 1 -
distro/src/main/assembly/plugin-kylin.xml | 1 -
distro/src/main/assembly/plugin-ozone.xml | 2 --
distro/src/main/assembly/plugin-presto.xml | 2 --
distro/src/main/assembly/plugin-solr.xml | 1 -
distro/src/main/assembly/plugin-sqoop.xml | 1 -
distro/src/main/assembly/plugin-trino.xml | 4 ----
distro/src/main/assembly/plugin-yarn.xml | 1 -
distro/src/main/assembly/tagsync.xml | 1 -
distro/src/main/assembly/usersync.xml | 1 -
plugin-trino/pom.xml | 5 -----
18 files changed, 32 deletions(-)
diff --git a/distro/src/main/assembly/admin-web.xml
b/distro/src/main/assembly/admin-web.xml
index 974c43702..55675afad 100644
--- a/distro/src/main/assembly/admin-web.xml
+++ b/distro/src/main/assembly/admin-web.xml
@@ -105,7 +105,6 @@
<include>org.apache.hbase.thirdparty:hbase-shaded-protobuf:jar:${hbase-shaded-protobuf}</include>
<include>org.apache.hbase.thirdparty:hbase-shaded-netty:jar:${hbase-shaded-netty}</include>
<include>org.apache.hbase.thirdparty:hbase-shaded-miscellaneous:jar:${hbase-shaded-miscellaneous}</include>
-
<include>org.apache.htrace:htrace-core4:jar:${htrace-core.version}</include>
<include>io.dropwizard.metrics:metrics-core</include>
</includes>
</binaries>
@@ -249,7 +248,6 @@
<include>org.apache.zookeeper:zookeeper:jar:${zookeeper.version}</include>
<include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
<include>commons-codec:commons-codec</include>
-
<include>org.apache.htrace:htrace-core4:jar:${htrace-core.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>
@@ -304,7 +302,6 @@
<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.htrace:htrace-core4:jar:${htrace-core.version}</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 a1ecad08e..01ffea002 100644
--- a/distro/src/main/assembly/hbase-agent.xml
+++ b/distro/src/main/assembly/hbase-agent.xml
@@ -107,7 +107,6 @@
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>com.fasterxml.woodstox:woodstox-core</include>
- <include>org.apache.htrace:htrace-core4</include>
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
</includes>
</binaries>
diff --git a/distro/src/main/assembly/hdfs-agent.xml
b/distro/src/main/assembly/hdfs-agent.xml
index 3764620ad..8b133d993 100644
--- a/distro/src/main/assembly/hdfs-agent.xml
+++ b/distro/src/main/assembly/hdfs-agent.xml
@@ -61,7 +61,6 @@
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
<include>org.codehaus.woodstox:stax2-api</include>
- <include>org.apache.htrace:htrace-core4</include>
<include>com.fasterxml.woodstox:woodstox-core</include>
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
</includes>
diff --git a/distro/src/main/assembly/hive-agent.xml
b/distro/src/main/assembly/hive-agent.xml
index 29ab7b528..9b9bc5b3a 100644
--- a/distro/src/main/assembly/hive-agent.xml
+++ b/distro/src/main/assembly/hive-agent.xml
@@ -101,7 +101,6 @@
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
- <include>org.apache.htrace:htrace-core4</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>com.fasterxml.woodstox:woodstox-core</include>
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
diff --git a/distro/src/main/assembly/kms.xml b/distro/src/main/assembly/kms.xml
index 43f0ee3f0..6ee04e702 100755
--- a/distro/src/main/assembly/kms.xml
+++ b/distro/src/main/assembly/kms.xml
@@ -213,7 +213,6 @@
<include>org.apache.hadoop:hadoop-hdfs:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
-
<include>org.apache.htrace:htrace-core4:jar:${htrace-core.version}</include>
<include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
<include>org.apache.ranger:ranger-plugins-common</include>
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
@@ -391,7 +390,6 @@
<include>org.slf4j:slf4j-api</include>
<include>org.apache.hadoop:hadoop-common</include>
<include>org.apache.hadoop:hadoop-auth</include>
- <include>org.apache.htrace:htrace-core4</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>com.fasterxml.woodstox:woodstox-core</include>
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
diff --git a/distro/src/main/assembly/knox-agent.xml
b/distro/src/main/assembly/knox-agent.xml
index 8f88c9970..a7906fe4f 100644
--- a/distro/src/main/assembly/knox-agent.xml
+++ b/distro/src/main/assembly/knox-agent.xml
@@ -64,7 +64,6 @@
<include>com.google.protobuf:protobuf-java:jar:${protobuf-java.version}</include>
<include>org.apache.hadoop:hadoop-hdfs:jar:${hadoop.version}</include>
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
-
<include>org.apache.htrace:htrace-core4:jar:${htrace-core.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>
@@ -116,7 +115,6 @@
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>com.fasterxml.woodstox:woodstox-core</include>
- <include>org.apache.htrace:htrace-core4</include>
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
</includes>
diff --git a/distro/src/main/assembly/plugin-atlas.xml
b/distro/src/main/assembly/plugin-atlas.xml
index 6adc7361c..6fa539639 100644
--- a/distro/src/main/assembly/plugin-atlas.xml
+++ b/distro/src/main/assembly/plugin-atlas.xml
@@ -66,7 +66,6 @@
<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.htrace:htrace-core4:jar:${htrace-core.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>
@@ -120,7 +119,6 @@
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
<include>org.apache.ranger:ranger-plugins-cred</include>
<include>org.apache.ranger:credentialbuilder</include>
-
<include>org.apache.htrace:htrace-core4:jar:${htrace-core.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>
diff --git a/distro/src/main/assembly/plugin-kafka.xml
b/distro/src/main/assembly/plugin-kafka.xml
index 840a80810..770d05a71 100644
--- a/distro/src/main/assembly/plugin-kafka.xml
+++ b/distro/src/main/assembly/plugin-kafka.xml
@@ -86,7 +86,6 @@
<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.htrace:htrace-core4</include>
<include>org.apache.lucene:lucene-core</include>
<include>joda-time:joda-time</include>
<include>com.carrotsearch:hppc</include>
diff --git a/distro/src/main/assembly/plugin-kylin.xml
b/distro/src/main/assembly/plugin-kylin.xml
index 3b8a3de9d..b4a007616 100644
--- a/distro/src/main/assembly/plugin-kylin.xml
+++ b/distro/src/main/assembly/plugin-kylin.xml
@@ -103,7 +103,6 @@
<include>org.apache.ranger:credentialbuilder</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>com.fasterxml.woodstox:woodstox-core</include>
- <include>org.apache.htrace:htrace-core4</include>
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
</includes>
</dependencySet>
diff --git a/distro/src/main/assembly/plugin-ozone.xml
b/distro/src/main/assembly/plugin-ozone.xml
index baf9a9fab..dde9438f5 100644
--- a/distro/src/main/assembly/plugin-ozone.xml
+++ b/distro/src/main/assembly/plugin-ozone.xml
@@ -64,7 +64,6 @@
<include>com.sun.jersey:jersey-core</include>
<include>com.sun.jersey:jersey-client</include>
<include>com.sun.jersey:jersey-bundle</include>
-
<include>org.apache.htrace:htrace-core4:jar:${htrace-core.version}</include>
<include>com.kstruct:gethostname4j</include>
<include>net.java.dev.jna:jna</include>
<include>net.java.dev.jna:jna-platform</include>
@@ -108,7 +107,6 @@
<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.sun.xml.bind:jaxb-impl</include>
-
<include>org.apache.htrace:htrace-core4:jar:${htrace-core.version}</include>
<include>commons-lang:commons-lang</include>
<include>com.kstruct:gethostname4j</include>
<include>net.java.dev.jna:jna</include>
diff --git a/distro/src/main/assembly/plugin-presto.xml
b/distro/src/main/assembly/plugin-presto.xml
index 0c1fcb9cd..f57ace6a7 100644
--- a/distro/src/main/assembly/plugin-presto.xml
+++ b/distro/src/main/assembly/plugin-presto.xml
@@ -92,7 +92,6 @@
<include>org.apache.ranger:credentialbuilder</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>com.fasterxml.woodstox:woodstox-core</include>
- <include>org.apache.htrace:htrace-core4</include>
<include>com.sun.jersey:jersey-bundle</include>
<include>com.sun.jersey:jersey-json</include>
<include>com.fasterxml.jackson.core:jackson-annotations:jar:${fasterxml.jackson.version}</include>
@@ -146,7 +145,6 @@
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>com.fasterxml.woodstox:woodstox-core</include>
- <include>org.apache.htrace:htrace-core4</include>
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
</includes>
</binaries>
diff --git a/distro/src/main/assembly/plugin-solr.xml
b/distro/src/main/assembly/plugin-solr.xml
index c07c16d12..348c37ec4 100644
--- a/distro/src/main/assembly/plugin-solr.xml
+++ b/distro/src/main/assembly/plugin-solr.xml
@@ -103,7 +103,6 @@
<include>org.apache.ranger:ranger-solr-plugin</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>com.fasterxml.woodstox:woodstox-core</include>
- <include>org.apache.htrace:htrace-core4</include>
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
</includes>
</binaries>
diff --git a/distro/src/main/assembly/plugin-sqoop.xml
b/distro/src/main/assembly/plugin-sqoop.xml
index e2fe07e0d..2230d9067 100644
--- a/distro/src/main/assembly/plugin-sqoop.xml
+++ b/distro/src/main/assembly/plugin-sqoop.xml
@@ -108,7 +108,6 @@
<include>org.apache.ranger:credentialbuilder</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>com.fasterxml.woodstox:woodstox-core</include>
- <include>org.apache.htrace:htrace-core4</include>
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
</includes>
</binaries>
diff --git a/distro/src/main/assembly/plugin-trino.xml
b/distro/src/main/assembly/plugin-trino.xml
index 16ba89690..5c3a989d3 100644
--- a/distro/src/main/assembly/plugin-trino.xml
+++ b/distro/src/main/assembly/plugin-trino.xml
@@ -68,7 +68,6 @@
<include>commons-io:commons-io:jar:${commons.io.version}</include>
<include>commons-lang:commons-lang:jar:${commons.lang.version}</include>
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
-
<include>org.apache.htrace:htrace-core4:jar:${htrace-core.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>
@@ -85,7 +84,6 @@
<include>org.apache.ranger:credentialbuilder</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>com.fasterxml.woodstox:woodstox-core</include>
- <include>org.apache.htrace:htrace-core4</include>
<include>com.sun.jersey:jersey-bundle</include>
<include>com.sun.jersey:jersey-json</include>
<include>com.fasterxml.jackson.core:jackson-annotations:jar:${fasterxml.jackson.version}</include>
@@ -135,7 +133,6 @@
<include>commons-io:commons-io:jar:${commons.io.version}</include>
<include>commons-lang:commons-lang</include>
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
-
<include>org.apache.htrace:htrace-core4:jar:${htrace-core.version}</include>
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
@@ -143,7 +140,6 @@
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>com.fasterxml.woodstox:woodstox-core</include>
- <include>org.apache.htrace:htrace-core4</include>
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
</includes>
</binaries>
diff --git a/distro/src/main/assembly/plugin-yarn.xml
b/distro/src/main/assembly/plugin-yarn.xml
index 7f4e03f1b..98e2b39cb 100644
--- a/distro/src/main/assembly/plugin-yarn.xml
+++ b/distro/src/main/assembly/plugin-yarn.xml
@@ -131,7 +131,6 @@
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
- <include>org.apache.htrace:htrace-core4</include>
</includes>
</binaries>
</moduleSet>
diff --git a/distro/src/main/assembly/tagsync.xml
b/distro/src/main/assembly/tagsync.xml
index 5c40b0cb8..da30a2d82 100644
--- a/distro/src/main/assembly/tagsync.xml
+++ b/distro/src/main/assembly/tagsync.xml
@@ -80,7 +80,6 @@
<include>joda-time:joda-time:jar:${joda-time.version}</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>com.fasterxml.woodstox:woodstox-core</include>
-
<include>org.apache.htrace:htrace-core4</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>
diff --git a/distro/src/main/assembly/usersync.xml
b/distro/src/main/assembly/usersync.xml
index 8d0ecb2b5..0d7995fe9 100644
--- a/distro/src/main/assembly/usersync.xml
+++ b/distro/src/main/assembly/usersync.xml
@@ -64,7 +64,6 @@
<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>org.apache.htrace:htrace-core4</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>
diff --git a/plugin-trino/pom.xml b/plugin-trino/pom.xml
index 30694f609..daa968c71 100644
--- a/plugin-trino/pom.xml
+++ b/plugin-trino/pom.xml
@@ -97,11 +97,6 @@
<artifactId>commons-lang3</artifactId>
<version>${commons.lang3.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.htrace</groupId>
- <artifactId>htrace-core4</artifactId>
- <version>${htrace-core.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
