Skip to content

Commit 8c76659

Browse files
committed
[HUDI-4644] Change default flink profile to 1.15.x
also fix master compilure error
1 parent 39b16c5 commit 8c76659

3 files changed

Lines changed: 11 additions & 38 deletions

File tree

hudi-examples/hudi-examples-flink/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -333,13 +333,6 @@
333333
<scope>test</scope>
334334
<type>test-jar</type>
335335
</dependency>
336-
<dependency>
337-
<groupId>org.apache.flink</groupId>
338-
<artifactId>flink-json</artifactId>
339-
<version>${flink.version}</version>
340-
<scope>test</scope>
341-
<type>test-jar</type>
342-
</dependency>
343336
<dependency>
344337
<groupId>org.apache.flink</groupId>
345338
<artifactId>flink-csv</artifactId>

hudi-flink-datasource/hudi-flink/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -239,11 +239,6 @@
239239
<artifactId>jcommander</artifactId>
240240
<scope>compile</scope>
241241
</dependency>
242-
<dependency>
243-
<groupId>com.twitter</groupId>
244-
<artifactId>bijection-avro_${scala.binary.version}</artifactId>
245-
<version>0.9.7</version>
246-
</dependency>
247242
<dependency>
248243
<groupId>joda-time</groupId>
249244
<artifactId>joda-time</artifactId>

pom.xml

Lines changed: 11 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -131,20 +131,20 @@
131131
<flink1.15.version>1.15.1</flink1.15.version>
132132
<flink1.14.version>1.14.5</flink1.14.version>
133133
<flink1.13.version>1.13.6</flink1.13.version>
134-
<flink.version>${flink1.13.version}</flink.version>
135-
<hudi.flink.module>hudi-flink1.13.x</hudi.flink.module>
136-
<flink.bundle.version>1.13</flink.bundle.version>
134+
<flink.version>${flink1.15.version}</flink.version>
135+
<hudi.flink.module>hudi-flink1.15.x</hudi.flink.module>
136+
<flink.bundle.version>1.15</flink.bundle.version>
137137
<flink.format.parquet.version>1.12.2</flink.format.parquet.version>
138138
<flink.runtime.artifactId>flink-runtime</flink.runtime.artifactId>
139-
<flink.table.runtime.artifactId>flink-table-runtime_${scala.binary.version}</flink.table.runtime.artifactId>
140-
<flink.table.planner.artifactId>flink-table-planner_${scala.binary.version}</flink.table.planner.artifactId>
139+
<flink.table.runtime.artifactId>flink-table-runtime</flink.table.runtime.artifactId>
140+
<flink.table.planner.artifactId>flink-table-planner_2.12</flink.table.planner.artifactId>
141141
<flink.parquet.artifactId>flink-parquet</flink.parquet.artifactId>
142142
<flink.statebackend.rocksdb.artifactId>flink-statebackend-rocksdb</flink.statebackend.rocksdb.artifactId>
143143
<flink.test.utils.artifactId>flink-test-utils</flink.test.utils.artifactId>
144144
<flink.streaming.java.artifactId>flink-streaming-java</flink.streaming.java.artifactId>
145145
<flink.clients.artifactId>flink-clients</flink.clients.artifactId>
146146
<flink.connector.kafka.artifactId>flink-connector-kafka</flink.connector.kafka.artifactId>
147-
<flink.hadoop.compatibility.artifactId>flink-hadoop-compatibility_${scala.binary.version}</flink.hadoop.compatibility.artifactId>
147+
<flink.hadoop.compatibility.artifactId>flink-hadoop-compatibility_2.12</flink.hadoop.compatibility.artifactId>
148148
<spark31.version>3.1.3</spark31.version>
149149
<spark32.version>3.2.1</spark32.version>
150150
<spark33.version>3.3.0</spark33.version>
@@ -1828,20 +1828,6 @@
18281828

18291829
<profile>
18301830
<id>flink1.15</id>
1831-
<properties>
1832-
<flink.version>${flink1.15.version}</flink.version>
1833-
<flink.table.runtime.artifactId>flink-table-runtime</flink.table.runtime.artifactId>
1834-
<flink.parquet.artifactId>flink-parquet</flink.parquet.artifactId>
1835-
<flink.statebackend.rocksdb.artifactId>flink-statebackend-rocksdb</flink.statebackend.rocksdb.artifactId>
1836-
<flink.test.utils.artifactId>flink-test-utils</flink.test.utils.artifactId>
1837-
<flink.streaming.java.artifactId>flink-streaming-java</flink.streaming.java.artifactId>
1838-
<flink.clients.artifactId>flink-clients</flink.clients.artifactId>
1839-
<flink.connector.kafka.artifactId>flink-connector-kafka</flink.connector.kafka.artifactId>
1840-
<!-- 1.15 only supports scala2.12 -->
1841-
<flink.hadoop.compatibility.artifactId>flink-hadoop-compatibility_2.12</flink.hadoop.compatibility.artifactId>
1842-
<hudi.flink.module>hudi-flink1.15.x</hudi.flink.module>
1843-
<flink.bundle.version>1.15</flink.bundle.version>
1844-
</properties>
18451831
<activation>
18461832
<property>
18471833
<name>flink1.15</name>
@@ -1852,19 +1838,19 @@
18521838
<id>flink1.14</id>
18531839
<properties>
18541840
<flink.version>${flink1.14.version}</flink.version>
1841+
<hudi.flink.module>hudi-flink1.14.x</hudi.flink.module>
1842+
<flink.bundle.version>1.14</flink.bundle.version>
18551843
<flink.table.runtime.artifactId>flink-table-runtime_${scala.binary.version}</flink.table.runtime.artifactId>
1844+
<flink.table.planner.artifactId>flink-table-planner_${scala.binary.version}</flink.table.planner.artifactId>
18561845
<flink.parquet.artifactId>flink-parquet_${scala.binary.version}</flink.parquet.artifactId>
18571846
<flink.statebackend.rocksdb.artifactId>flink-statebackend-rocksdb_${scala.binary.version}</flink.statebackend.rocksdb.artifactId>
18581847
<flink.test.utils.artifactId>flink-test-utils_${scala.binary.version}</flink.test.utils.artifactId>
18591848
<flink.streaming.java.artifactId>flink-streaming-java_${scala.binary.version}</flink.streaming.java.artifactId>
18601849
<flink.clients.artifactId>flink-clients_${scala.binary.version}</flink.clients.artifactId>
18611850
<flink.connector.kafka.artifactId>flink-connector-kafka_${scala.binary.version}</flink.connector.kafka.artifactId>
18621851
<flink.hadoop.compatibility.artifactId>flink-hadoop-compatibility_${scala.binary.version}</flink.hadoop.compatibility.artifactId>
1863-
<hudi.flink.module>hudi-flink1.14.x</hudi.flink.module>
1864-
<flink.bundle.version>1.14</flink.bundle.version>
18651852
</properties>
18661853
<activation>
1867-
<activeByDefault>true</activeByDefault>
18681854
<property>
18691855
<name>flink1.14</name>
18701856
</property>
@@ -1873,8 +1859,9 @@
18731859
<profile>
18741860
<id>flink1.13</id>
18751861
<properties>
1876-
<flink.scala.bnary.version>2.11</flink.scala.bnary.version>
18771862
<flink.version>${flink1.13.version}</flink.version>
1863+
<hudi.flink.module>hudi-flink1.13.x</hudi.flink.module>
1864+
<flink.bundle.version>1.13</flink.bundle.version>
18781865
<flink.runtime.artifactId>flink-runtime_${scala.binary.version}</flink.runtime.artifactId>
18791866
<flink.table.runtime.artifactId>flink-table-runtime-blink_${scala.binary.version}</flink.table.runtime.artifactId>
18801867
<flink.table.planner.artifactId>flink-table-planner-blink_${scala.binary.version}</flink.table.planner.artifactId>
@@ -1885,8 +1872,6 @@
18851872
<flink.clients.artifactId>flink-clients_${scala.binary.version}</flink.clients.artifactId>
18861873
<flink.connector.kafka.artifactId>flink-connector-kafka_${scala.binary.version}</flink.connector.kafka.artifactId>
18871874
<flink.hadoop.compatibility.artifactId>flink-hadoop-compatibility_${scala.binary.version}</flink.hadoop.compatibility.artifactId>
1888-
<hudi.flink.module>hudi-flink1.13.x</hudi.flink.module>
1889-
<flink.bundle.version>1.13</flink.bundle.version>
18901875
<skipITs>true</skipITs>
18911876
</properties>
18921877
<activation>

0 commit comments

Comments
 (0)