From 5c41e30ac5c29629ab1f993aa20b692ae3565d92 Mon Sep 17 00:00:00 2001
From: RexXiong <lvshuang.tb@gmail.com>
Date: Mon, 11 Apr 2022 20:44:46 +0800
Subject: [PATCH] [HUDI-3817] shade parquet dependency for
 hudi-hadoop-mr-bundle (#5250)

Co-authored-by: lvshuang.xjs <lvshuang.xjs@alibaba-inc.com>
---
 packaging/hudi-hadoop-mr-bundle/pom.xml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/packaging/hudi-hadoop-mr-bundle/pom.xml b/packaging/hudi-hadoop-mr-bundle/pom.xml
index 612a1b7f3..48fe3c7d6 100644
--- a/packaging/hudi-hadoop-mr-bundle/pom.xml
+++ b/packaging/hudi-hadoop-mr-bundle/pom.xml
@@ -67,8 +67,9 @@
                 <includes>
                   <include>org.apache.hudi:hudi-common</include>
                   <include>org.apache.hudi:hudi-hadoop-mr</include>
-
+                  <!-- Parquet -->
                   <include>org.apache.parquet:parquet-avro</include>
+                  <include>org.apache.parquet:parquet-hadoop-bundle</include>
                   <include>org.apache.avro:avro</include>
                   <include>com.esotericsoftware:kryo-shaded</include>
                   <include>org.objenesis:objenesis</include>
@@ -131,8 +132,12 @@
                   <shadedPattern>org.apache.hudi.org.apache.htrace.</shadedPattern>
                 </relocation>
                 <relocation>
-                  <pattern>org.apache.parquet.avro.</pattern>
-                  <shadedPattern>org.apache.hudi.org.apache.parquet.avro.</shadedPattern>
+                  <pattern>org.apache.parquet.</pattern>
+                  <shadedPattern>org.apache.hudi.org.apache.parquet.</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>shaded.parquet.</pattern>
+                  <shadedPattern>org.apache.hudi.shaded.parquet.</shadedPattern>
                 </relocation>
                 <relocation>
                   <pattern>com.google.common.</pattern>
@@ -258,6 +263,13 @@
       <scope>compile</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.parquet</groupId>
+      <artifactId>parquet-hadoop-bundle</artifactId>
+      <version>${parquet.version}</version>
+      <scope>compile</scope>
+    </dependency>
+
     <!-- Avro -->
     <dependency>
       <groupId>org.apache.avro</groupId>