[HUDI-1289] Remove relocation of pattern for hbase dependencies and add shading of guava in hadoop, spark, and presto bundles (#2147)
- Update hudi-spark-bundle pom to not relocate hbase and htrace pattern - Remove codec relocation as this is not included in bundle which was causing error
This commit is contained in:
@@ -63,7 +63,6 @@
|
||||
</transformers>
|
||||
<artifactSet>
|
||||
<includes>
|
||||
<include>com.yammer.metrics:metrics-core</include>
|
||||
<include>org.apache.hudi:hudi-common</include>
|
||||
<include>org.apache.hudi:hudi-client-common</include>
|
||||
<include>org.apache.hudi:hudi-spark-client</include>
|
||||
@@ -96,6 +95,7 @@
|
||||
<include>io.prometheus:simpleclient_pushgateway</include>
|
||||
<include>io.prometheus:simpleclient_common</include>
|
||||
<include>com.yammer.metrics:metrics-core</include>
|
||||
<include>com.google.guava:guava</include>
|
||||
|
||||
<include>org.apache.spark:spark-avro_${scala.binary.version}</include>
|
||||
<include>org.apache.hive:hive-common</include>
|
||||
@@ -156,21 +156,13 @@
|
||||
<pattern>com.codahale.metrics.</pattern>
|
||||
<shadedPattern>org.apache.hudi.com.codahale.metrics.</shadedPattern>
|
||||
</relocation>
|
||||
<relocation>
|
||||
<pattern>org.apache.commons.codec.</pattern>
|
||||
<shadedPattern>org.apache.hudi.org.apache.commons.codec.</shadedPattern>
|
||||
</relocation>
|
||||
<relocation>
|
||||
<pattern>org.eclipse.jetty.</pattern>
|
||||
<shadedPattern>org.apache.hudi.org.apache.jetty.</shadedPattern>
|
||||
</relocation>
|
||||
<relocation>
|
||||
<pattern>org.apache.hadoop.hbase.</pattern>
|
||||
<shadedPattern>org.apache.hudi.org.apache.hadoop.hbase.</shadedPattern>
|
||||
</relocation>
|
||||
<relocation>
|
||||
<pattern>org.apache.htrace.</pattern>
|
||||
<shadedPattern>org.apache.hudi.org.apache.htrace.</shadedPattern>
|
||||
<pattern>com.google.common.</pattern>
|
||||
<shadedPattern>${spark.bundle.spark.shade.prefix}com.google.common.</shadedPattern>
|
||||
</relocation>
|
||||
<!-- TODO: Revisit GH ISSUE #533 & PR#633-->
|
||||
</relocations>
|
||||
|
||||
Reference in New Issue
Block a user