This is an automated email from the ASF dual-hosted git repository.
rmani pushed a commit to branch ranger-2.2
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/ranger-2.2 by this push:
new 7eef860 RANGER-3340:Remove htrace-core.jar from Ranger modules where
it is not required
7eef860 is described below
commit 7eef860348d8cc5d1a7d1ff2e1e915a04d571a02
Author: Ramesh Mani <[email protected]>
AuthorDate: Tue Jul 13 10:30:18 2021 -0700
RANGER-3340:Remove htrace-core.jar from Ranger modules where it is not
required
---
distro/src/main/assembly/admin-web.xml | 2 --
distro/src/main/assembly/hdfs-agent.xml | 1 -
distro/src/main/assembly/hive-agent.xml | 1 -
distro/src/main/assembly/kms.xml | 6 +-----
distro/src/main/assembly/knox-agent.xml | 2 --
distro/src/main/assembly/plugin-atlas.xml | 2 --
distro/src/main/assembly/plugin-kafka.xml | 2 --
distro/src/main/assembly/plugin-kms.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-yarn.xml | 1 -
distro/src/main/assembly/sample-client.xml | 1 -
distro/src/main/assembly/tagsync.xml | 1 -
distro/src/main/assembly/usersync.xml | 1 -
ranger-examples/distro/src/main/assembly/sample-client.xml | 1 -
18 files changed, 1 insertion(+), 28 deletions(-)
diff --git a/distro/src/main/assembly/admin-web.xml
b/distro/src/main/assembly/admin-web.xml
index 3a438d7..4cbc578 100644
--- a/distro/src/main/assembly/admin-web.xml
+++ b/distro/src/main/assembly/admin-web.xml
@@ -244,7 +244,6 @@
<include>org.apache.zookeeper:zookeeper:jar:${zookeeper.version}</include>
<include>org.apache.httpcomponents:httpmime</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>
@@ -298,7 +297,6 @@
<include>org.apache.commons:commons-lang3</include>
<include>org.apache.hadoop:hadoop-common</include>
<include>org.apache.hadoop:hadoop-auth</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/hdfs-agent.xml
b/distro/src/main/assembly/hdfs-agent.xml
index 2592d28..f738ae6 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-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>
</includes>
</binaries>
</moduleSet>
diff --git a/distro/src/main/assembly/hive-agent.xml
b/distro/src/main/assembly/hive-agent.xml
index baf6318..803c0a7 100644
--- a/distro/src/main/assembly/hive-agent.xml
+++ b/distro/src/main/assembly/hive-agent.xml
@@ -103,7 +103,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>
</includes>
</binaries>
</moduleSet>
diff --git a/distro/src/main/assembly/kms.xml b/distro/src/main/assembly/kms.xml
index 18b6a9b..cfb8c94 100755
--- a/distro/src/main/assembly/kms.xml
+++ b/distro/src/main/assembly/kms.xml
@@ -79,7 +79,6 @@
<include>org.apache.curator:curator-recipes</include>
<include>com.google.code.gson:gson</include>
<include>org.apache.hadoop:hadoop-annotations</include>
- <include>org.apache.htrace:htrace-core4</include>
<include>org.apache.httpcomponents:httpcore</include>
<include>org.codehaus.jackson:jackson-core-asl</include>
<include>org.codehaus.jackson:jackson-jaxrs</include>
@@ -102,7 +101,6 @@
<include>org.noggit:noggit:jar:${noggit.version}</include>
<include>com.google.protobuf:protobuf-java:jar:${protobuf-java.version}</include>
<include>org.apache.hadoop:hadoop-hdfs:jar:${hadoop.version}</include>
-
<include>org.apache.htrace:htrace-core4:jar:${htrace-core.version}</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>com.fasterxml.woodstox:woodstox-core</include>
<include>com.fasterxml.jackson.core:jackson-core</include>
@@ -192,8 +190,7 @@
<include>org.eclipse.jdt.core.compiler:ecj:jar:P20140317-1600</include>
<include>com.google.protobuf:protobuf-java:jar:${protobuf-java.version}</include>
<include>org.apache.hadoop:hadoop-hdfs:jar:${hadoop.version}</include>
-
<include>org.apache.htrace:htrace-core4:jar:${htrace-core.version}</include>
- <include>org.apache.solr:solr-solrj</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>
<include>net.java.dev.jna:jna:jar:${jna.version}</include>
@@ -350,7 +347,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 0532e5a..c1f16d6 100644
--- a/distro/src/main/assembly/knox-agent.xml
+++ b/distro/src/main/assembly/knox-agent.xml
@@ -63,7 +63,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>org.codehaus.jackson:jackson-core-asl:jar:${codehaus.jackson.version}</include>
<include>org.codehaus.jackson:jackson-mapper-asl:jar:${codehaus.jackson.version}</include>
<include>org.apache.solr:solr-solrj</include>
@@ -109,7 +108,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>
</includes>
</binaries>
</moduleSet>
diff --git a/distro/src/main/assembly/plugin-atlas.xml
b/distro/src/main/assembly/plugin-atlas.xml
index a8e72f1..365d62b 100644
--- a/distro/src/main/assembly/plugin-atlas.xml
+++ b/distro/src/main/assembly/plugin-atlas.xml
@@ -67,7 +67,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>
@@ -117,7 +116,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 47fcf10..91a868e 100644
--- a/distro/src/main/assembly/plugin-kafka.xml
+++ b/distro/src/main/assembly/plugin-kafka.xml
@@ -75,7 +75,6 @@
<include>commons-codec:commons-codec</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>
@@ -124,7 +123,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>
</includes>
</binaries>
</moduleSet>
diff --git a/distro/src/main/assembly/plugin-kms.xml
b/distro/src/main/assembly/plugin-kms.xml
index 7bb2aab..0b0e996 100755
--- a/distro/src/main/assembly/plugin-kms.xml
+++ b/distro/src/main/assembly/plugin-kms.xml
@@ -102,7 +102,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>
</includes>
</binaries>
</moduleSet>
diff --git a/distro/src/main/assembly/plugin-kylin.xml
b/distro/src/main/assembly/plugin-kylin.xml
index 3ae42ad..4924134 100644
--- a/distro/src/main/assembly/plugin-kylin.xml
+++ b/distro/src/main/assembly/plugin-kylin.xml
@@ -100,7 +100,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>
</includes>
</dependencySet>
</dependencySets>
diff --git a/distro/src/main/assembly/plugin-ozone.xml
b/distro/src/main/assembly/plugin-ozone.xml
index 8cca173..1fed6c4 100644
--- a/distro/src/main/assembly/plugin-ozone.xml
+++ b/distro/src/main/assembly/plugin-ozone.xml
@@ -68,7 +68,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>
@@ -111,7 +110,6 @@
<include>org.codehaus.jackson:jackson-mapper-asl:jar:${codehaus.jackson.version}</include>
<include>org.codehaus.jackson:jackson-xc</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 d7cb116..804b408 100644
--- a/distro/src/main/assembly/plugin-presto.xml
+++ b/distro/src/main/assembly/plugin-presto.xml
@@ -94,7 +94,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>org.codehaus.jackson:jackson-core-asl</include>
@@ -145,7 +144,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>
</includes>
</binaries>
</moduleSet>
diff --git a/distro/src/main/assembly/plugin-solr.xml
b/distro/src/main/assembly/plugin-solr.xml
index 382b570..3dbaa9c 100644
--- a/distro/src/main/assembly/plugin-solr.xml
+++ b/distro/src/main/assembly/plugin-solr.xml
@@ -101,7 +101,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>
</includes>
</binaries>
</moduleSet>
diff --git a/distro/src/main/assembly/plugin-sqoop.xml
b/distro/src/main/assembly/plugin-sqoop.xml
index e45e924..c8fcab5 100644
--- a/distro/src/main/assembly/plugin-sqoop.xml
+++ b/distro/src/main/assembly/plugin-sqoop.xml
@@ -105,7 +105,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>
</includes>
</binaries>
</moduleSet>
diff --git a/distro/src/main/assembly/plugin-yarn.xml
b/distro/src/main/assembly/plugin-yarn.xml
index 1f8aa0d..14444f9 100644
--- a/distro/src/main/assembly/plugin-yarn.xml
+++ b/distro/src/main/assembly/plugin-yarn.xml
@@ -105,7 +105,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>
</includes>
</binaries>
</moduleSet>
diff --git a/distro/src/main/assembly/sample-client.xml
b/distro/src/main/assembly/sample-client.xml
index c788513..241eea6 100644
--- a/distro/src/main/assembly/sample-client.xml
+++ b/distro/src/main/assembly/sample-client.xml
@@ -63,7 +63,6 @@
<include>org.codehaus.jackson:jackson-mapper-asl</include>
<include>org.codehaus.jackson:jackson-xc</include>
<include>org.apache.ranger:ranger-plugins-audit</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/tagsync.xml
b/distro/src/main/assembly/tagsync.xml
index 82d716f..6919ad5 100644
--- a/distro/src/main/assembly/tagsync.xml
+++ b/distro/src/main/assembly/tagsync.xml
@@ -85,7 +85,6 @@
<include>log4j:log4j:jar:${log4j.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 5279f65..fb4abbb 100644
--- a/distro/src/main/assembly/usersync.xml
+++ b/distro/src/main/assembly/usersync.xml
@@ -62,7 +62,6 @@
<include>org.apache.ranger:ugsync-util</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/ranger-examples/distro/src/main/assembly/sample-client.xml
b/ranger-examples/distro/src/main/assembly/sample-client.xml
index 953cc1d..49aac21 100644
--- a/ranger-examples/distro/src/main/assembly/sample-client.xml
+++ b/ranger-examples/distro/src/main/assembly/sample-client.xml
@@ -59,7 +59,6 @@
<include>org.codehaus.jackson:jackson-mapper-asl</include>
<include>org.codehaus.jackson:jackson-xc</include>
<include>org.apache.ranger:ranger-plugins-audit</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>
