Skip to content

[HUDI-4906] Fix the local tests for hudi-flink #6763

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yihua merged 1 commit into from
Sep 23, 2022
Merged

[HUDI-4906] Fix the local tests for hudi-flink #6763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions hudi-cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${scala.version}</version>
</dependency>

<dependency>
Expand Down
1 change: 1 addition & 0 deletions hudi-client/hudi-spark-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${scala.version}</version>
</dependency>

<dependency>
Expand Down
1 change: 1 addition & 0 deletions hudi-examples/hudi-examples-spark/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${scala.version}</version>
</dependency>

<dependency>
Expand Down
3 changes: 2 additions & 1 deletion hudi-flink-datasource/hudi-flink/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,8 @@
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>${avro.version}</version>
<!-- Override the version to be same with Flink avro -->
<version>1.10.0</version>
Copy link
Contributor

@nsivabalan nsivabalan Sep 23, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not required in this patch. but can we introduce a variable (flink.avro.version) and use that.

<scope>compile</scope>
</dependency>

Expand Down
1 change: 1 addition & 0 deletions hudi-spark-datasource/hudi-spark-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${scala.version}</version>
</dependency>

<dependency>
Expand Down
3 changes: 2 additions & 1 deletion packaging/hudi-flink-bundle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,8 @@
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>${avro.version}</version>
<!-- Override the version to be same with Flink avro -->
<version>1.10.0</version>
Copy link
Contributor

@nsivabalan nsivabalan Sep 23, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here.

<scope>compile</scope>
</dependency>

Expand Down
13 changes: 0 additions & 13 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,12 +628,6 @@
<dependencyManagement>
<dependencies>
<!-- Scala -->
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${scala.version}</version>
</dependency>
Copy link
Contributor Author

@danny0405 danny0405 Sep 23, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The scala-library in root pom affects the dependency of all the modules, while conflicts with hudi-flink, so remove it.


<dependency>
<groupId>org.scala-lang.modules</groupId>
<artifactId>scala-collection-compat_${scala.binary.version}</artifactId>
Expand Down Expand Up @@ -2144,13 +2138,8 @@
</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 @@ -2172,7 +2161,6 @@
<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 @@ -2196,7 +2184,6 @@
<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