Skip to content

Commit

Permalink
[HUDI-4901] Add avro.version to Flink profiles (#6757)
Browse files Browse the repository at this point in the history
* Add avro.version to Flink profiles

Co-authored-by: Shawn Chang <[email protected]>
  • Loading branch information
CTTY and CTTY authored Sep 23, 2022
1 parent 4c0c1c7 commit 1380075
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
3 changes: 1 addition & 2 deletions hudi-flink-datasource/hudi-flink/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
7 changes: 7 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down

0 comments on commit 1380075

Please sign in to comment.