You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hudi.apache.org by da...@apache.org on 2022/09/23 06:22:26 UTC
[hudi] branch master updated: [HUDI-4901] Add avro.version to Flink profiles (#6757)
This is an automated email from the ASF dual-hosted git repository.
danny0405 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 1380075a2d [HUDI-4901] Add avro.version to Flink profiles (#6757)
1380075a2d is described below
commit 1380075a2d4d3f9696fdce4de69dda2445b7d181
Author: Shawn Chang <42...@users.noreply.github.com>
AuthorDate: Thu Sep 22 23:22:19 2022 -0700
[HUDI-4901] Add avro.version to Flink profiles (#6757)
* Add avro.version to Flink profiles
Co-authored-by: Shawn Chang <yx...@amazon.com>
---
hudi-flink-datasource/hudi-flink/pom.xml | 3 +--
pom.xml | 7 +++++++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/hudi-flink-datasource/hudi-flink/pom.xml b/hudi-flink-datasource/hudi-flink/pom.xml
index a3ab958bf7..2d2b6966b9 100644
--- a/hudi-flink-datasource/hudi-flink/pom.xml
+++ b/hudi-flink-datasource/hudi-flink/pom.xml
@@ -230,8 +230,7 @@
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
- <!-- Override the version to be same with Flink avro -->
- <version>1.10.0</version>
+ <version>${avro.version}</version>
<scope>compile</scope>
</dependency>
diff --git a/pom.xml b/pom.xml
index 5daef106da..f3fbd467cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2144,8 +2144,13 @@
</activation>
</profile>
+ <!-- Flink profiles -->
+ <!-- NOTE: Building with both Spark and Flink profiles is not recommended due to avro version conflict-->
<profile>
<id>flink1.15</id>
+ <properties>
+ <avro.version>1.10.0</avro.version>
+ </properties>
<activation>
<property>
<name>flink1.15</name>
@@ -2167,6 +2172,7 @@
<flink.clients.artifactId>flink-clients_${scala.binary.version}</flink.clients.artifactId>
<flink.connector.kafka.artifactId>flink-connector-kafka_${scala.binary.version}</flink.connector.kafka.artifactId>
<flink.hadoop.compatibility.artifactId>flink-hadoop-compatibility_${scala.binary.version}</flink.hadoop.compatibility.artifactId>
+ <avro.version>1.10.0</avro.version>
</properties>
<activation>
<property>
@@ -2190,6 +2196,7 @@
<flink.clients.artifactId>flink-clients_${scala.binary.version}</flink.clients.artifactId>
<flink.connector.kafka.artifactId>flink-connector-kafka_${scala.binary.version}</flink.connector.kafka.artifactId>
<flink.hadoop.compatibility.artifactId>flink-hadoop-compatibility_${scala.binary.version}</flink.hadoop.compatibility.artifactId>
+ <avro.version>1.10.0</avro.version>
<skipITs>true</skipITs>
</properties>
<activation>