This is an automated email from the ASF dual-hosted git repository.
xushiyan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hudi.git
The following commit(s) were added to refs/heads/master by this push:
new 8a1b2fe7de [HUDI-4568] Shade dropwizard metrics-core in
hudi-aws-bundle (#6327)
8a1b2fe7de is described below
commit 8a1b2fe7de9de8f3eeefc754614a180fd8ecd18c
Author: Sagar Sumit <[email protected]>
AuthorDate: Mon Aug 8 23:57:30 2022 +0530
[HUDI-4568] Shade dropwizard metrics-core in hudi-aws-bundle (#6327)
---
packaging/hudi-aws-bundle/pom.xml | 5 +++++
packaging/hudi-flink-bundle/pom.xml | 1 -
packaging/hudi-kafka-connect-bundle/pom.xml | 1 -
packaging/hudi-utilities-bundle/pom.xml | 1 -
packaging/hudi-utilities-slim-bundle/pom.xml | 1 -
5 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/packaging/hudi-aws-bundle/pom.xml
b/packaging/hudi-aws-bundle/pom.xml
index c58714e7da..9b87a721c5 100644
--- a/packaging/hudi-aws-bundle/pom.xml
+++ b/packaging/hudi-aws-bundle/pom.xml
@@ -84,6 +84,7 @@
<include>com.amazonaws:aws-java-sdk-dynamodb</include>
<include>com.amazonaws:aws-java-sdk-core</include>
<include>com.amazonaws:aws-java-sdk-glue</include>
+
<include>io.dropwizard.metrics:metrics-core</include>
<include>com.beust:jcommander</include>
<include>commons-io:commons-io</include>
<include>org.apache.hbase:hbase-common</include>
@@ -149,6 +150,10 @@
<pattern>org.apache.avro.</pattern>
<shadedPattern>org.apache.hudi.org.apache.avro.</shadedPattern>
</relocation>
+ <relocation>
+ <pattern>com.codahale.metrics.</pattern>
+
<shadedPattern>org.apache.hudi.com.codahale.metrics.</shadedPattern>
+ </relocation>
<!-- The classes below in
org.apache.hadoop.metrics2 package come from
hbase-hadoop-compat and hbase-hadoop2-compat,
which have to be shaded one by one,
instead of shading all classes under
org.apache.hadoop.metrics2 including ones
diff --git a/packaging/hudi-flink-bundle/pom.xml
b/packaging/hudi-flink-bundle/pom.xml
index 89a89422e7..87d39203ca 100644
--- a/packaging/hudi-flink-bundle/pom.xml
+++ b/packaging/hudi-flink-bundle/pom.xml
@@ -123,7 +123,6 @@
<include>io.prometheus:simpleclient_dropwizard</include>
<include>io.prometheus:simpleclient_pushgateway</include>
<include>io.prometheus:simpleclient_common</include>
- <include>com.yammer.metrics:metrics-core</include>
<!-- Used for HUDI TimelineService -->
<include>org.eclipse.jetty:*</include>
diff --git a/packaging/hudi-kafka-connect-bundle/pom.xml
b/packaging/hudi-kafka-connect-bundle/pom.xml
index e0dfc2a740..357cc4ceba 100644
--- a/packaging/hudi-kafka-connect-bundle/pom.xml
+++ b/packaging/hudi-kafka-connect-bundle/pom.xml
@@ -113,7 +113,6 @@
<include>io.prometheus:simpleclient_dropwizard</include>
<include>io.prometheus:simpleclient_pushgateway</include>
<include>io.prometheus:simpleclient_common</include>
-
<include>com.yammer.metrics:metrics-core</include>
<include>com.google.protobuf:protobuf-java</include>
<include>org.objenesis:objenesis</include>
<include>com.esotericsoftware:kryo-shaded</include>
diff --git a/packaging/hudi-utilities-bundle/pom.xml
b/packaging/hudi-utilities-bundle/pom.xml
index 3db1a27d23..75f8ecdefd 100644
--- a/packaging/hudi-utilities-bundle/pom.xml
+++ b/packaging/hudi-utilities-bundle/pom.xml
@@ -136,7 +136,6 @@
<include>io.prometheus:simpleclient_dropwizard</include>
<include>io.prometheus:simpleclient_pushgateway</include>
<include>io.prometheus:simpleclient_common</include>
- <include>com.yammer.metrics:metrics-core</include>
<include>org.apache.spark:spark-streaming-kafka-0-10_${scala.binary.version}</include>
<include>org.apache.spark:spark-token-provider-kafka-0-10_${scala.binary.version}</include>
<include>org.apache.kafka:kafka_${scala.binary.version}</include>
diff --git a/packaging/hudi-utilities-slim-bundle/pom.xml
b/packaging/hudi-utilities-slim-bundle/pom.xml
index f8e7138e9b..392d7a8f7d 100644
--- a/packaging/hudi-utilities-slim-bundle/pom.xml
+++ b/packaging/hudi-utilities-slim-bundle/pom.xml
@@ -127,7 +127,6 @@
<include>io.prometheus:simpleclient_dropwizard</include>
<include>io.prometheus:simpleclient_pushgateway</include>
<include>io.prometheus:simpleclient_common</include>
- <include>com.yammer.metrics:metrics-core</include>
<include>org.apache.spark:spark-streaming-kafka-0-10_${scala.binary.version}</include>
<include>org.apache.spark:spark-token-provider-kafka-0-10_${scala.binary.version}</include>
<include>org.apache.kafka:kafka_${scala.binary.version}</include>
