From 1e6b983bdd9e5bd70766b77c869adb10f244b071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Bry=C5=84ski?= Date: Tue, 14 Nov 2023 13:55:53 +0100 Subject: [PATCH] [build] Bump Flink version to 1.18.0 (#2463) This closes #2670. --- .../quickstart/mysql-postgres-tutorial.md | 8 +++---- docs/content/quickstart/polardbx-tutorial.md | 8 +++---- .../mysql-postgres-tutorial-zh.md | 8 +++---- .../快速上手/polardbx-tutorial-zh.md | 4 ++-- .../parser/YamlPipelineDefinitionParser.java | 2 +- .../ververica/cdc/cli/CliFrontendTest.java | 2 +- .../YamlPipelineDefinitionParserTest.java | 4 ++-- .../IncrementalSourceEnumerator.java | 2 +- .../IncrementalSourceScanFetcher.java | 2 +- .../IncrementalSourceStreamFetcher.java | 2 +- .../cdc/debezium/DebeziumSourceFunction.java | 2 +- .../debezium/reader/BinlogSplitReader.java | 2 +- .../debezium/reader/SnapshotSplitReader.java | 2 +- .../assigners/MySqlSnapshotSplitAssigner.java | 2 +- .../enumerator/MySqlSourceEnumerator.java | 2 +- .../MySqlHybridSplitAssignerTest.java | 2 +- .../mysql/table/MySqlConnectorITCase.java | 2 +- .../oracle/table/OracleConnectorITCase.java | 4 ++-- .../tidb/TiKVRichParallelSourceFunction.java | 2 +- .../tidb/table/utils/TableKeyRangeUtils.java | 2 +- .../src/main/java/org/tikv/cdc/CDCClient.java | 6 ++--- .../java/org/tikv/cdc/RegionCDCClient.java | 2 +- .../connectors/vitess/VitessValidator.java | 2 +- .../flink-cdc-source-e2e-tests/pom.xml | 24 ++++++++++++++----- .../utils/FlinkContainerTestEnvironment.java | 4 ++-- pom.xml | 6 ++--- 26 files changed, 60 insertions(+), 48 deletions(-) diff --git a/docs/content/quickstart/mysql-postgres-tutorial.md b/docs/content/quickstart/mysql-postgres-tutorial.md index 0a96d0235..a4462ea9a 100644 --- a/docs/content/quickstart/mysql-postgres-tutorial.md +++ b/docs/content/quickstart/mysql-postgres-tutorial.md @@ -73,8 +73,8 @@ This command automatically starts all the containers defined in the Docker Compo We can also visit [http://localhost:5601/](http://localhost:5601/) to see if Kibana is running normally. ### Preparing Flink and JAR package required -1. Download [Flink 1.17.0](https://archive.apache.org/dist/flink/flink-1.17.0/flink-1.17.0-bin-scala_2.12.tgz) and unzip it to the directory `flink-1.17.0` -2. Download following JAR package required and put them under `flink-1.17.0/lib/`: +1. Download [Flink 1.18.0](https://archive.apache.org/dist/flink/flink-1.18.0/flink-1.18.0-bin-scala_2.12.tgz) and unzip it to the directory `flink-1.18.0` +2. Download following JAR package required and put them under `flink-1.18.0/lib/`: **Download links are available only for stable releases, SNAPSHOT dependencies need to be built based on master or release- branches by yourself.** - [flink-sql-connector-elasticsearch7-3.0.1-1.17.jar](https://repo.maven.apache.org/maven2/org/apache/flink/flink-sql-connector-elasticsearch7/3.0.1-1.17/flink-sql-connector-elasticsearch7-3.0.1-1.17.jar) @@ -151,7 +151,7 @@ We can also visit [http://localhost:5601/](http://localhost:5601/) to see if Kib 1. Use the following command to change to the Flink directory: ``` - cd flink-1.17.0 + cd flink-1.18.0 ``` 2. Use the following command to start a Flink cluster: @@ -311,7 +311,7 @@ After finishing the tutorial, run the following command to stop all containers i ```shell docker-compose down ``` -Run the following command to stop the Flink cluster in the directory of Flink `flink-1.17.0`: +Run the following command to stop the Flink cluster in the directory of Flink `flink-1.18.0`: ```shell ./bin/stop-cluster.sh ``` diff --git a/docs/content/quickstart/polardbx-tutorial.md b/docs/content/quickstart/polardbx-tutorial.md index f3c5e99e6..4c92dcab9 100644 --- a/docs/content/quickstart/polardbx-tutorial.md +++ b/docs/content/quickstart/polardbx-tutorial.md @@ -63,8 +63,8 @@ This command automatically starts all the containers defined in the Docker Compo We can also visit [http://localhost:5601/](http://localhost:5601/) to see if Kibana is running normally. ### Preparing Flink and JAR package required -1. Download [Flink 1.17.0](https://archive.apache.org/dist/flink/flink-1.17.0/flink-1.17.0-bin-scala_2.12.tgz) and unzip it to the directory `flink-1.17.0` -2. Download following JAR package required and put them under `flink-1.17.0/lib/`: +1. Download [Flink 1.18.0](https://archive.apache.org/dist/flink/flink-1.18.0/flink-1.18.0-bin-scala_2.12.tgz) and unzip it to the directory `flink-1.18.0` +2. Download following JAR package required and put them under `flink-1.18.0/lib/`: **Download links are available only for stable releases, SNAPSHOT dependencies need to be built based on master or release- branches by yourself.** - flink-sql-connector-mysql-cdc-2.5-SNAPSHOT.jar @@ -116,7 +116,7 @@ We can also visit [http://localhost:5601/](http://localhost:5601/) to see if Kib 1. Use the following command to change to the Flink directory: ``` - cd flink-1.17.0 + cd flink-1.18.0 ``` 2. Use the following command to start a Flink cluster: @@ -255,7 +255,7 @@ After finishing the tutorial, run the following command to stop all containers i ```shell docker-compose down ``` -Run the following command to stop the Flink cluster in the directory of Flink `flink-1.17.0`: +Run the following command to stop the Flink cluster in the directory of Flink `flink-1.18.0`: ```shell ./bin/stop-cluster.sh ``` diff --git a/docs/content/快速上手/mysql-postgres-tutorial-zh.md b/docs/content/快速上手/mysql-postgres-tutorial-zh.md index 1284fcaae..8fefdb3bf 100644 --- a/docs/content/快速上手/mysql-postgres-tutorial-zh.md +++ b/docs/content/快速上手/mysql-postgres-tutorial-zh.md @@ -69,8 +69,8 @@ docker-compose up -d 该命令将以 detached 模式自动启动 Docker Compose 配置中定义的所有容器。你可以通过 docker ps 来观察上述的容器是否正常启动了，也可以通过访问 [http://localhost:5601/](http://localhost:5601/) 来查看 Kibana 是否运行正常。 ### 下载 Flink 和所需要的依赖包 -1. 下载 [Flink 1.17.0](https://archive.apache.org/dist/flink/flink-1.17.0/flink-1.17.0-bin-scala_2.12.tgz) 并将其解压至目录 `flink-1.17.0` -2. 下载下面列出的依赖包，并将它们放到目录 `flink-1.17.0/lib/` 下： +1. 下载 [Flink 1.18.0](https://archive.apache.org/dist/flink/flink-1.18.0/flink-1.18.0-bin-scala_2.12.tgz) 并将其解压至目录 `flink-1.18.0` +2. 下载下面列出的依赖包，并将它们放到目录 `flink-1.18.0/lib/` 下： **下载链接只对已发布的版本有效, SNAPSHOT 版本需要本地基于 master 或 release- 分支编译** - [flink-sql-connector-elasticsearch7-3.0.1-1.17.jar](https://repo.maven.apache.org/maven2/org/apache/flink/flink-sql-connector-elasticsearch7/3.0.1-1.17/flink-sql-connector-elasticsearch7-3.0.1-1.17.jar) @@ -147,7 +147,7 @@ docker-compose up -d 1. 使用下面的命令跳转至 Flink 目录下 ``` - cd flink-1.17.0 + cd flink-1.18.0 ``` 2. 使用下面的命令启动 Flink 集群 @@ -308,7 +308,7 @@ Flink SQL> INSERT INTO enriched_orders ```shell docker-compose down ``` -在 Flink 所在目录 `flink-1.17.0` 下执行如下命令停止 Flink 集群： +在 Flink 所在目录 `flink-1.18.0` 下执行如下命令停止 Flink 集群： ```shell ./bin/stop-cluster.sh ``` diff --git a/docs/content/快速上手/polardbx-tutorial-zh.md b/docs/content/快速上手/polardbx-tutorial-zh.md index 862cb2c31..8a9ebdf7f 100644 --- a/docs/content/快速上手/polardbx-tutorial-zh.md +++ b/docs/content/快速上手/polardbx-tutorial-zh.md @@ -105,8 +105,8 @@ VALUES (default, '2020-07-30 10:08:22', 'Jark', 50.50, 102, false), ``` ### 下载 Flink 和所需要的依赖包 -1. 下载 [Flink 1.17.0](https://archive.apache.org/dist/flink/flink-1.17.0/flink-1.17.0-bin-scala_2.12.tgz) 并将其解压至目录 `flink-1.17.0` -2. 下载下面列出的依赖包，并将它们放到目录 `flink-1.17.0/lib/` 下 +1. 下载 [Flink 1.18.0](https://archive.apache.org/dist/flink/flink-1.18.0/flink-1.18.0-bin-scala_2.12.tgz) 并将其解压至目录 `flink-1.18.0` +2. 下载下面列出的依赖包，并将它们放到目录 `flink-1.18.0/lib/` 下 ```下载链接只对已发布的版本有效, SNAPSHOT 版本需要本地基于 master 或 release- 分支编译``` - 用于订阅PolarDB-X Binlog: flink-sql-connector-mysql-cdc-2.5-SNAPSHOT.jar diff --git a/flink-cdc-cli/src/main/java/com/ververica/cdc/cli/parser/YamlPipelineDefinitionParser.java b/flink-cdc-cli/src/main/java/com/ververica/cdc/cli/parser/YamlPipelineDefinitionParser.java index 52e73978b..5eb041b83 100644 --- a/flink-cdc-cli/src/main/java/com/ververica/cdc/cli/parser/YamlPipelineDefinitionParser.java +++ b/flink-cdc-cli/src/main/java/com/ververica/cdc/cli/parser/YamlPipelineDefinitionParser.java @@ -35,7 +35,7 @@ import java.util.Map; import java.util.Optional; import java.util.regex.Pattern; -import static org.apache.flink.shaded.guava30.com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.shaded.guava31.com.google.common.base.Preconditions.checkNotNull; /** Parser for converting YAML formatted pipeline definition to {@link PipelineDef}. */ public class YamlPipelineDefinitionParser implements PipelineDefinitionParser { diff --git a/flink-cdc-cli/src/test/java/com/ververica/cdc/cli/CliFrontendTest.java b/flink-cdc-cli/src/test/java/com/ververica/cdc/cli/CliFrontendTest.java index 09dc9f520..4df631894 100644 --- a/flink-cdc-cli/src/test/java/com/ververica/cdc/cli/CliFrontendTest.java +++ b/flink-cdc-cli/src/test/java/com/ververica/cdc/cli/CliFrontendTest.java @@ -16,7 +16,7 @@ package com.ververica.cdc.cli; -import org.apache.flink.shaded.guava30.com.google.common.io.Resources; +import org.apache.flink.shaded.guava31.com.google.common.io.Resources; import com.ververica.cdc.cli.utils.FlinkEnvironmentUtils; import com.ververica.cdc.composer.PipelineComposer; diff --git a/flink-cdc-cli/src/test/java/com/ververica/cdc/cli/parser/YamlPipelineDefinitionParserTest.java b/flink-cdc-cli/src/test/java/com/ververica/cdc/cli/parser/YamlPipelineDefinitionParserTest.java index 3eb219323..661ab9f5d 100644 --- a/flink-cdc-cli/src/test/java/com/ververica/cdc/cli/parser/YamlPipelineDefinitionParserTest.java +++ b/flink-cdc-cli/src/test/java/com/ververica/cdc/cli/parser/YamlPipelineDefinitionParserTest.java @@ -18,8 +18,8 @@ package com.ververica.cdc.cli.parser; import org.apache.flink.configuration.Configuration; -import org.apache.flink.shaded.guava30.com.google.common.collect.ImmutableMap; -import org.apache.flink.shaded.guava30.com.google.common.io.Resources; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableMap; +import org.apache.flink.shaded.guava31.com.google.common.io.Resources; import com.ververica.cdc.composer.definition.PipelineDef; import com.ververica.cdc.composer.definition.RouteDef; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/com/ververica/cdc/connectors/base/source/enumerator/IncrementalSourceEnumerator.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/com/ververica/cdc/connectors/base/source/enumerator/IncrementalSourceEnumerator.java index bef9b10a1..509b80faf 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/com/ververica/cdc/connectors/base/source/enumerator/IncrementalSourceEnumerator.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/com/ververica/cdc/connectors/base/source/enumerator/IncrementalSourceEnumerator.java @@ -22,7 +22,7 @@ import org.apache.flink.api.connector.source.SplitEnumerator; import org.apache.flink.api.connector.source.SplitEnumeratorContext; import org.apache.flink.util.FlinkRuntimeException; -import org.apache.flink.shaded.guava30.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import com.ververica.cdc.connectors.base.config.SourceConfig; import com.ververica.cdc.connectors.base.source.assigner.SplitAssigner; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/com/ververica/cdc/connectors/base/source/reader/external/IncrementalSourceScanFetcher.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/com/ververica/cdc/connectors/base/source/reader/external/IncrementalSourceScanFetcher.java index 2e7a0abd6..a79006c40 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/com/ververica/cdc/connectors/base/source/reader/external/IncrementalSourceScanFetcher.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/com/ververica/cdc/connectors/base/source/reader/external/IncrementalSourceScanFetcher.java @@ -19,7 +19,7 @@ package com.ververica.cdc.connectors.base.source.reader.external; import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.util.FlinkRuntimeException; -import org.apache.flink.shaded.guava30.com.google.common.util.concurrent.ThreadFactoryBuilder; +import org.apache.flink.shaded.guava31.com.google.common.util.concurrent.ThreadFactoryBuilder; import com.ververica.cdc.connectors.base.source.meta.split.SnapshotSplit; import com.ververica.cdc.connectors.base.source.meta.split.SourceRecords; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/com/ververica/cdc/connectors/base/source/reader/external/IncrementalSourceStreamFetcher.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/com/ververica/cdc/connectors/base/source/reader/external/IncrementalSourceStreamFetcher.java index ad01393e0..28755ff51 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/com/ververica/cdc/connectors/base/source/reader/external/IncrementalSourceStreamFetcher.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/com/ververica/cdc/connectors/base/source/reader/external/IncrementalSourceStreamFetcher.java @@ -18,7 +18,7 @@ package com.ververica.cdc.connectors.base.source.reader.external; import org.apache.flink.util.FlinkRuntimeException; -import org.apache.flink.shaded.guava30.com.google.common.util.concurrent.ThreadFactoryBuilder; +import org.apache.flink.shaded.guava31.com.google.common.util.concurrent.ThreadFactoryBuilder; import com.ververica.cdc.connectors.base.source.meta.offset.Offset; import com.ververica.cdc.connectors.base.source.meta.split.FinishedSnapshotSplitInfo; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/DebeziumSourceFunction.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/DebeziumSourceFunction.java index 846d1b73d..b5678fe71 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/DebeziumSourceFunction.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/DebeziumSourceFunction.java @@ -37,7 +37,7 @@ import org.apache.flink.streaming.api.functions.source.RichSourceFunction; import org.apache.flink.util.ExceptionUtils; import org.apache.flink.util.FlinkRuntimeException; -import org.apache.flink.shaded.guava30.com.google.common.util.concurrent.ThreadFactoryBuilder; +import org.apache.flink.shaded.guava31.com.google.common.util.concurrent.ThreadFactoryBuilder; import com.ververica.cdc.debezium.internal.DebeziumChangeConsumer; import com.ververica.cdc.debezium.internal.DebeziumChangeFetcher; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/reader/BinlogSplitReader.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/reader/BinlogSplitReader.java index 6494b0153..388832d41 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/reader/BinlogSplitReader.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/reader/BinlogSplitReader.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.table.types.logical.RowType; import org.apache.flink.util.FlinkRuntimeException; -import org.apache.flink.shaded.guava30.com.google.common.util.concurrent.ThreadFactoryBuilder; +import org.apache.flink.shaded.guava31.com.google.common.util.concurrent.ThreadFactoryBuilder; import com.github.shyiko.mysql.binlog.event.Event; import com.github.shyiko.mysql.binlog.event.EventType; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/reader/SnapshotSplitReader.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/reader/SnapshotSplitReader.java index f47f28b39..4e84c2eca 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/reader/SnapshotSplitReader.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/reader/SnapshotSplitReader.java @@ -19,7 +19,7 @@ package com.ververica.cdc.connectors.mysql.debezium.reader; import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.util.FlinkRuntimeException; -import org.apache.flink.shaded.guava30.com.google.common.util.concurrent.ThreadFactoryBuilder; +import org.apache.flink.shaded.guava31.com.google.common.util.concurrent.ThreadFactoryBuilder; import com.ververica.cdc.connectors.mysql.debezium.dispatcher.SignalEventDispatcher; import com.ververica.cdc.connectors.mysql.debezium.task.MySqlBinlogSplitReadTask; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlSnapshotSplitAssigner.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlSnapshotSplitAssigner.java index ff8cd2e1a..0536a2621 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlSnapshotSplitAssigner.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlSnapshotSplitAssigner.java @@ -19,7 +19,7 @@ package com.ververica.cdc.connectors.mysql.source.assigners; import org.apache.flink.util.FlinkRuntimeException; import org.apache.flink.util.Preconditions; -import org.apache.flink.shaded.guava30.com.google.common.util.concurrent.ThreadFactoryBuilder; +import org.apache.flink.shaded.guava31.com.google.common.util.concurrent.ThreadFactoryBuilder; import com.ververica.cdc.connectors.mysql.debezium.DebeziumUtils; import com.ververica.cdc.connectors.mysql.schema.MySqlSchema; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/enumerator/MySqlSourceEnumerator.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/enumerator/MySqlSourceEnumerator.java index 9eb9dac2b..8d8110bcc 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/enumerator/MySqlSourceEnumerator.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/enumerator/MySqlSourceEnumerator.java @@ -22,7 +22,7 @@ import org.apache.flink.api.connector.source.SplitEnumerator; import org.apache.flink.api.connector.source.SplitEnumeratorContext; import org.apache.flink.util.FlinkRuntimeException; -import org.apache.flink.shaded.guava30.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import com.ververica.cdc.connectors.mysql.source.assigners.MySqlBinlogSplitAssigner; import com.ververica.cdc.connectors.mysql.source.assigners.MySqlHybridSplitAssigner; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlHybridSplitAssignerTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlHybridSplitAssignerTest.java index ee3358dfe..2bd4c1ff9 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlHybridSplitAssignerTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlHybridSplitAssignerTest.java @@ -19,7 +19,7 @@ package com.ververica.cdc.connectors.mysql.source.assigners; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.logical.RowType; -import org.apache.flink.shaded.guava30.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import com.ververica.cdc.connectors.mysql.source.MySqlSourceTestBase; import com.ververica.cdc.connectors.mysql.source.assigners.state.ChunkSplitterState; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/table/MySqlConnectorITCase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/table/MySqlConnectorITCase.java index afbb23bc9..3bbbc01f9 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/table/MySqlConnectorITCase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/table/MySqlConnectorITCase.java @@ -31,7 +31,7 @@ import org.apache.flink.types.Row; import org.apache.flink.util.CloseableIterator; import org.apache.flink.util.ExceptionUtils; -import org.apache.flink.shaded.guava30.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import com.ververica.cdc.connectors.mysql.debezium.DebeziumUtils; import com.ververica.cdc.connectors.mysql.source.MySqlSourceTestBase; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/table/OracleConnectorITCase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/table/OracleConnectorITCase.java index 3760afd43..802ad1a54 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/table/OracleConnectorITCase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/table/OracleConnectorITCase.java @@ -22,8 +22,8 @@ import org.apache.flink.table.api.TableResult; import org.apache.flink.table.api.bridge.java.StreamTableEnvironment; import org.apache.flink.table.planner.factories.TestValuesTableFactory; -import org.apache.flink.shaded.guava30.com.google.common.collect.Lists; -import org.apache.flink.shaded.guava30.com.google.common.util.concurrent.RateLimiter; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.util.concurrent.RateLimiter; import org.junit.After; import org.junit.Assume; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/TiKVRichParallelSourceFunction.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/TiKVRichParallelSourceFunction.java index d63b4a20c..97292b8e8 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/TiKVRichParallelSourceFunction.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/TiKVRichParallelSourceFunction.java @@ -30,7 +30,7 @@ import org.apache.flink.streaming.api.functions.source.RichParallelSourceFunctio import org.apache.flink.util.Collector; import org.apache.flink.util.Preconditions; -import org.apache.flink.shaded.guava30.com.google.common.util.concurrent.ThreadFactoryBuilder; +import org.apache.flink.shaded.guava31.com.google.common.util.concurrent.ThreadFactoryBuilder; import com.ververica.cdc.connectors.tidb.table.StartupMode; import com.ververica.cdc.connectors.tidb.table.utils.TableKeyRangeUtils; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/utils/TableKeyRangeUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/utils/TableKeyRangeUtils.java index 86c989231..53557c3e2 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/utils/TableKeyRangeUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/utils/TableKeyRangeUtils.java @@ -18,7 +18,7 @@ package com.ververica.cdc.connectors.tidb.table.utils; import org.apache.flink.util.Preconditions; -import org.apache.flink.shaded.guava30.com.google.common.collect.ImmutableList; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableList; import org.tikv.common.key.RowKey; import org.tikv.common.util.KeyRangeUtils; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/tikv/cdc/CDCClient.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/tikv/cdc/CDCClient.java index c36353cfa..0860cb1ce 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/tikv/cdc/CDCClient.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/tikv/cdc/CDCClient.java @@ -16,9 +16,9 @@ package org.tikv.cdc; -import org.apache.flink.shaded.guava30.com.google.common.base.Preconditions; -import org.apache.flink.shaded.guava30.com.google.common.collect.Range; -import org.apache.flink.shaded.guava30.com.google.common.collect.TreeMultiset; +import org.apache.flink.shaded.guava31.com.google.common.base.Preconditions; +import org.apache.flink.shaded.guava31.com.google.common.collect.Range; +import org.apache.flink.shaded.guava31.com.google.common.collect.TreeMultiset; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/tikv/cdc/RegionCDCClient.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/tikv/cdc/RegionCDCClient.java index fad7103a1..852f3d43c 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/tikv/cdc/RegionCDCClient.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/tikv/cdc/RegionCDCClient.java @@ -18,7 +18,7 @@ package org.tikv.cdc; import org.apache.flink.util.Preconditions; -import org.apache.flink.shaded.guava30.com.google.common.collect.ImmutableSet; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/com/ververica/cdc/connectors/vitess/VitessValidator.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/com/ververica/cdc/connectors/vitess/VitessValidator.java index 296c4b90d..69f873741 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/com/ververica/cdc/connectors/vitess/VitessValidator.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/com/ververica/cdc/connectors/vitess/VitessValidator.java @@ -16,7 +16,7 @@ package com.ververica.cdc.connectors.vitess; -import org.apache.flink.shaded.guava30.com.google.common.collect.Maps; +import org.apache.flink.shaded.guava31.com.google.common.collect.Maps; import com.ververica.cdc.debezium.Validator; import io.debezium.connector.vitess.VitessConnector; diff --git a/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/pom.xml b/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/pom.xml index 24f576d25..b2dec7cb0 100644 --- a/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/pom.xml +++ b/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/pom.xml @@ -26,11 +26,13 @@ under the License. flink-cdc-source-e2e-tests - 1.14.4 - 1.15.2 - 1.16.0 - 1.17.0 - 3.1.0-1.17 + 1.14.6 + 1.15.4 + 1.16.2 + 1.17.1 + 1.18.0 + 3.1.1-1.17 + 3.1.1-1.17 8.0.27 42.5.1 @@ -273,6 +275,16 @@ under the License. + + org.apache.flink + flink-connector-jdbc + ${jdbc.version-1.18} + jdbc-connector_${flink-1.18}.jar + jar + ${project.build.directory}/dependencies + + + com.ververica flink-sql-connector-mysql-cdc @@ -358,4 +370,4 @@ under the License. - \ No newline at end of file + diff --git a/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/utils/FlinkContainerTestEnvironment.java b/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/utils/FlinkContainerTestEnvironment.java index 798fc55a7..77a794a0d 100644 --- a/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/utils/FlinkContainerTestEnvironment.java +++ b/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/utils/FlinkContainerTestEnvironment.java @@ -124,11 +124,11 @@ public abstract class FlinkContainerTestEnvironment extends TestLogger { @Parameterized.Parameters(name = "flinkVersion: {0}") public static List getFlinkVersion() { - return Arrays.asList("1.14.4", "1.15.2", "1.16.0", "1.17.0"); + return Arrays.asList("1.14.6", "1.15.4", "1.16.2", "1.17.1", "1.18.0"); } private static final List FLINK_VERSION_WITH_SCALA_212 = - Arrays.asList("1.15.2", "1.16.0", "1.17.0"); + Arrays.asList("1.15.4", "1.16.2", "1.17.1", "1.18.0"); @Before public void before() { diff --git a/pom.xml b/pom.xml index d3fa7da5b..58e3ff379 100644 --- a/pom.xml +++ b/pom.xml @@ -71,14 +71,14 @@ under the License. true - 1.17.1 + 1.18.0 1.9.7.Final 3.2.0 2.2.0 1.18.3 1.3 4.2.0 - 1.7.15 + 1.7.36 2.17.1 2.4.2 1.1.0 @@ -152,7 +152,7 @@ under the License. org.apache.flink flink-shaded-guava - 30.1.1-jre-16.1 + 31.1-jre-17.0