From af78d6317d6955dbd9dc859c23539c72de60052f Mon Sep 17 00:00:00 2001
From: yuxiqian <34335406+yuxiqian@users.noreply.github.com>
Date: Thu, 25 Jul 2024 19:23:51 +0800
Subject: [PATCH] [FLINK-35868][cdc-connector][mongodb] Bump dependency version
to support MongoDB 7.0
This closes #3489.
---
.../docs/connectors/flink-sources/overview.md | 2 +-
.../docs/connectors/flink-sources/overview.md | 2 +-
.../flink-connector-mongodb-cdc/pom.xml | 4 +--
.../source/MongoDBFullChangelogITCase.java | 34 +++++++++++-------
.../MongoDBParallelSourceExampleTest.java | 24 +++++++++++--
.../source/MongoDBParallelSourceITCase.java | 21 ++++++++---
.../mongodb/source/MongoDBSourceTestBase.java | 30 +++++++++-------
.../mongodb/source/NewlyAddedTableITCase.java | 19 ++++++++--
.../MongoDBSnapshotSplitReaderTest.java | 17 +++++++--
.../reader/MongoDBStreamSplitReaderTest.java | 17 +++++++--
.../mongodb/table/MongoDBConnectorITCase.java | 28 +++++++++------
.../table/MongoDBRegexFilterITCase.java | 36 +++++++++++--------
.../mongodb/table/MongoDBTimeZoneITCase.java | 32 +++++++++--------
.../cdc/connectors/tests/MongoE2eITCase.java | 20 +++++++----
14 files changed, 197 insertions(+), 89 deletions(-)
diff --git a/docs/content.zh/docs/connectors/flink-sources/overview.md b/docs/content.zh/docs/connectors/flink-sources/overview.md
index ee816903522..27b826317b5 100644
--- a/docs/content.zh/docs/connectors/flink-sources/overview.md
+++ b/docs/content.zh/docs/connectors/flink-sources/overview.md
@@ -37,7 +37,7 @@ You can also read [tutorials]({{< ref "docs/connectors/flink-sources/tutorials/b
| Connector | Database | Driver |
|----------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------|
-| [mongodb-cdc]({{< ref "docs/connectors/flink-sources/mongodb-cdc" >}}) |
[MongoDB](https://www.mongodb.com): 3.6, 4.x, 5.0 | MongoDB Driver: 4.3.4 |
+| [mongodb-cdc]({{< ref "docs/connectors/flink-sources/mongodb-cdc" >}}) | [MongoDB](https://www.mongodb.com): 3.6, 4.x, 5.0, 6.0, 6.1, 7.0 | MongoDB Driver: 4.11.2 |
| [mysql-cdc]({{< ref "docs/connectors/flink-sources/mysql-cdc" >}}) | [MySQL](https://dev.mysql.com/doc): 5.6, 5.7, 8.0.x [RDS MySQL](https://www.aliyun.com/product/rds/mysql): 5.6, 5.7, 8.0.x [PolarDB MySQL](https://www.aliyun.com/product/polardb): 5.6, 5.7, 8.0.x [Aurora MySQL](https://aws.amazon.com/cn/rds/aurora): 5.6, 5.7, 8.0.x [MariaDB](https://mariadb.org): 10.x [PolarDB X](https://github.com/ApsaraDB/galaxysql): 2.0.1 | JDBC Driver: 8.0.28 |
| [oceanbase-cdc]({{< ref "docs/connectors/flink-sources/oceanbase-cdc" >}}) | [OceanBase CE](https://open.oceanbase.com): 3.1.x, 4.x [OceanBase EE](https://www.oceanbase.com/product/oceanbase): 2.x, 3.x, 4.x | OceanBase Driver: 2.4.x |
| [oracle-cdc]({{< ref "docs/connectors/flink-sources/oracle-cdc" >}}) | [Oracle](https://www.oracle.com/index.html): 11, 12, 19, 21 | Oracle Driver: 19.3.0.0 |
diff --git a/docs/content/docs/connectors/flink-sources/overview.md b/docs/content/docs/connectors/flink-sources/overview.md
index 56ddd62616b..962d02c1c53 100644
--- a/docs/content/docs/connectors/flink-sources/overview.md
+++ b/docs/content/docs/connectors/flink-sources/overview.md
@@ -37,7 +37,7 @@ You can also read [tutorials]({{< ref "docs/connectors/flink-sources/tutorials/b
| Connector | Database | Driver |
|----------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------|
-| [mongodb-cdc]({{< ref "docs/connectors/flink-sources/mongodb-cdc" >}}) | [MongoDB](https://www.mongodb.com): 3.6, 4.x, 5.0 | MongoDB Driver: 4.3.4 |
+| [mongodb-cdc]({{< ref "docs/connectors/flink-sources/mongodb-cdc" >}}) | [MongoDB](https://www.mongodb.com): 3.6, 4.x, 5.0, 6.0, 6.1, 7.0 | MongoDB Driver: 4.11.2 |
| [mysql-cdc]({{< ref "docs/connectors/flink-sources/mysql-cdc" >}}) | [MySQL](https://dev.mysql.com/doc): 5.6, 5.7, 8.0.x [RDS MySQL](https://www.aliyun.com/product/rds/mysql): 5.6, 5.7, 8.0.x [PolarDB MySQL](https://www.aliyun.com/product/polardb): 5.6, 5.7, 8.0.x [Aurora MySQL](https://aws.amazon.com/cn/rds/aurora): 5.6, 5.7, 8.0.x [MariaDB](https://mariadb.org): 10.x [PolarDB X](https://github.com/ApsaraDB/galaxysql): 2.0.1 | JDBC Driver: 8.0.28 |
| [oceanbase-cdc]({{< ref "docs/connectors/flink-sources/oceanbase-cdc" >}}) | [OceanBase CE](https://open.oceanbase.com): 3.1.x, 4.x [OceanBase EE](https://www.oceanbase.com/product/oceanbase): 2.x, 3.x, 4.x | OceanBase Driver: 2.4.x |
| [oracle-cdc]({{< ref "docs/connectors/flink-sources/oracle-cdc" >}}) | [Oracle](https://www.oracle.com/index.html): 11, 12, 19, 21 | Oracle Driver: 19.3.0.0 |
diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/pom.xml b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/pom.xml
index 3c8efc046a3..2b58e677872 100644
--- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/pom.xml
+++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/pom.xml
@@ -53,7 +53,7 @@ limitations under the License.
org.mongodb.kafka
mongo-kafka-connect
- 1.10.1
+ 1.13.0
mongodb-driver-sync
@@ -69,7 +69,7 @@ limitations under the License.
org.mongodb
mongodb-driver-sync
- 4.9.1
+ 4.11.2
diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/source/MongoDBFullChangelogITCase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/source/MongoDBFullChangelogITCase.java
index 02d6a82d166..8d8047fa72c 100644
--- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/source/MongoDBFullChangelogITCase.java
+++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/source/MongoDBFullChangelogITCase.java
@@ -78,28 +78,36 @@ public class MongoDBFullChangelogITCase extends MongoDBSourceTestBase {
@Rule public final Timeout timeoutPerTest = Timeout.seconds(300);
+ private final String mongoVersion;
private final boolean parallelismSnapshot;
- public MongoDBFullChangelogITCase(boolean parallelismSnapshot) {
+ public MongoDBFullChangelogITCase(String mongoVersion, boolean parallelismSnapshot) {
+ super(mongoVersion);
+ this.mongoVersion = mongoVersion;
this.parallelismSnapshot = parallelismSnapshot;
}
- @Parameterized.Parameters(name = "parallelismSnapshot: {0}")
+ @Parameterized.Parameters(name = "mongoVersion: {0} parallelismSnapshot: {1}")
public static Object[] parameters() {
- return new Object[][] {new Object[] {false}, new Object[] {true}};
+ List