From cd867fcdb8d6e8eff214002b4a341125521ab977 Mon Sep 17 00:00:00 2001
From: Raymond Xu <2701446+xushiyan@users.noreply.github.com>
Date: Wed, 12 Oct 2022 20:48:04 +0800
Subject: [PATCH] [HUDI-4716] Avoid parquet-hadoop-bundle in hudi-hadoop-mr

---
 packaging/hudi-hadoop-mr-bundle/pom.xml | 21 ++++-----------------
 pom.xml                                 |  2 ++
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/packaging/hudi-hadoop-mr-bundle/pom.xml b/packaging/hudi-hadoop-mr-bundle/pom.xml
index 340152d19099a..54681011bebcf 100644
--- a/packaging/hudi-hadoop-mr-bundle/pom.xml
+++ b/packaging/hudi-hadoop-mr-bundle/pom.xml
@@ -68,9 +68,7 @@
                 <includes combine.children="append">
                   <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>org.apache.hbase:hbase-common</include>
                   <include>org.apache.hbase:hbase-client</include>
@@ -119,12 +117,8 @@
                   <shadedPattern>org.apache.hudi.org.apache.htrace.</shadedPattern>
                 </relocation>
                 <relocation>
-                  <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>
+                  <pattern>org.apache.parquet.avro.</pattern>
+                  <shadedPattern>org.apache.hudi.org.apache.parquet.avro.</shadedPattern>
                 </relocation>
                 <relocation>
                   <pattern>com.google.common.</pattern>
@@ -250,14 +244,7 @@
     <dependency>
       <groupId>org.apache.parquet</groupId>
       <artifactId>parquet-avro</artifactId>
-      <version>${parquet.version}</version>
-      <scope>compile</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.parquet</groupId>
-      <artifactId>parquet-hadoop-bundle</artifactId>
-      <version>${parquet.version}</version>
+      <version>${hive.parquet.version}</version>
       <scope>compile</scope>
     </dependency>
 
@@ -265,7 +252,7 @@
     <dependency>
       <groupId>org.apache.avro</groupId>
       <artifactId>avro</artifactId>
-      <version>${avro.version}</version>
+      <version>${hive.avro.version}</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/pom.xml b/pom.xml
index 6efb8bf936d43..27bec25b72365 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,6 +116,8 @@
     <hadoop.version>2.10.1</hadoop.version>
     <hive.groupid>org.apache.hive</hive.groupid>
     <hive.version>2.3.1</hive.version>
+    <hive.parquet.version>1.10.1</hive.parquet.version>
+    <hive.avro.version>1.8.2</hive.avro.version>
     <presto.version>0.273</presto.version>
     <trino.version>390</trino.version>
     <hive.exec.classifier>core</hive.exec.classifier>