You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hudi.apache.org by xu...@apache.org on 2022/10/28 14:37:31 UTC
[hudi] branch master updated: [HUDI-4716] Avoid parquet-hadoop-bundle in hudi-hadoop-mr (#6930)
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 adf53806e8 [HUDI-4716] Avoid parquet-hadoop-bundle in hudi-hadoop-mr (#6930)
adf53806e8 is described below
commit adf53806e881fbe8a9d58de9c318d6d9d7e7c0cb
Author: Shiyan Xu <27...@users.noreply.github.com>
AuthorDate: Fri Oct 28 22:37:19 2022 +0800
[HUDI-4716] Avoid parquet-hadoop-bundle in hudi-hadoop-mr (#6930)
---
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 92859002d7..4a501e72b8 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>
@@ -120,12 +118,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>
@@ -251,14 +245,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>
@@ -266,7 +253,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 6efb8bf936..27bec25b72 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>