[FLINK-37152][build] Update Flink version to 1.20

This closes  #3868.
pull/3927/head
Ferenc Csaky 5 days ago committed by GitHub
parent 83ae36a854
commit 0211a136cf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -20,7 +20,7 @@ package org.apache.flink.cdc.cli;
import org.apache.flink.cdc.composer.PipelineComposer; import org.apache.flink.cdc.composer.PipelineComposer;
import org.apache.flink.cdc.composer.PipelineExecution; import org.apache.flink.cdc.composer.PipelineExecution;
import org.apache.flink.cdc.composer.definition.PipelineDef; import org.apache.flink.cdc.composer.definition.PipelineDef;
import org.apache.flink.runtime.jobgraph.RestoreMode; import org.apache.flink.core.execution.RestoreMode;
import org.apache.flink.shaded.guava31.com.google.common.io.Resources; import org.apache.flink.shaded.guava31.com.google.common.io.Resources;

@ -28,7 +28,8 @@ limitations under the License.
<artifactId>flink-cdc-pipeline-connector-starrocks</artifactId> <artifactId>flink-cdc-pipeline-connector-starrocks</artifactId>
<properties> <properties>
<starrocks.connector.version>1.2.10_flink-${flink.major.version}</starrocks.connector.version> <!-- TODO: Update this, when StarRocks releases a 1.20 compatible connector. -->
<starrocks.connector.version>1.2.10_flink-1.19</starrocks.connector.version>
</properties> </properties>
<dependencies> <dependencies>

@ -17,7 +17,7 @@
package org.apache.flink.cdc.connectors.mongodb; package org.apache.flink.cdc.connectors.mongodb;
import org.apache.flink.test.util.AbstractTestBase; import org.apache.flink.test.util.AbstractTestBaseJUnit4;
import com.mongodb.ConnectionString; import com.mongodb.ConnectionString;
import com.mongodb.MongoClientSettings; import com.mongodb.MongoClientSettings;
@ -41,7 +41,7 @@ import static org.apache.flink.cdc.connectors.mongodb.LegacyMongoDBContainer.MON
* Basic class for testing MongoDB source, this contains a MongoDB container which enables change * Basic class for testing MongoDB source, this contains a MongoDB container which enables change
* streams. * streams.
*/ */
public class LegacyMongoDBTestBase extends AbstractTestBase { public class LegacyMongoDBTestBase extends AbstractTestBaseJUnit4 {
private static final Logger LOG = LoggerFactory.getLogger(LegacyMongoDBTestBase.class); private static final Logger LOG = LoggerFactory.getLogger(LegacyMongoDBTestBase.class);

@ -18,7 +18,7 @@
package org.apache.flink.cdc.connectors.mysql; package org.apache.flink.cdc.connectors.mysql;
import org.apache.flink.cdc.connectors.mysql.testutils.MySqlContainer; import org.apache.flink.cdc.connectors.mysql.testutils.MySqlContainer;
import org.apache.flink.test.util.AbstractTestBase; import org.apache.flink.test.util.AbstractTestBaseJUnit4;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.BeforeClass; import org.junit.BeforeClass;
@ -33,7 +33,7 @@ import java.util.stream.Stream;
* Basic class for testing MySQL binlog source, this contains a MySQL container which enables * Basic class for testing MySQL binlog source, this contains a MySQL container which enables
* binlog. * binlog.
*/ */
public abstract class LegacyMySqlTestBase extends AbstractTestBase { public abstract class LegacyMySqlTestBase extends AbstractTestBaseJUnit4 {
private static final Logger LOG = LoggerFactory.getLogger(LegacyMySqlTestBase.class); private static final Logger LOG = LoggerFactory.getLogger(LegacyMySqlTestBase.class);

@ -19,7 +19,7 @@ package org.apache.flink.cdc.connectors.polardbx;
import org.apache.flink.cdc.common.utils.TestCaseUtils; import org.apache.flink.cdc.common.utils.TestCaseUtils;
import org.apache.flink.table.planner.factories.TestValuesTableFactory; import org.apache.flink.table.planner.factories.TestValuesTableFactory;
import org.apache.flink.test.util.AbstractTestBase; import org.apache.flink.test.util.AbstractTestBaseJUnit4;
import org.apache.flink.types.Row; import org.apache.flink.types.Row;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -59,7 +59,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
/** Basic class for testing Database Polardbx which supported the mysql protocol. */ /** Basic class for testing Database Polardbx which supported the mysql protocol. */
public abstract class PolardbxSourceTestBase extends AbstractTestBase { public abstract class PolardbxSourceTestBase extends AbstractTestBaseJUnit4 {
private static final Logger LOG = LoggerFactory.getLogger(PolardbxSourceTestBase.class); private static final Logger LOG = LoggerFactory.getLogger(PolardbxSourceTestBase.class);
private static final Pattern COMMENT_PATTERN = Pattern.compile("^(.*)--.*$"); private static final Pattern COMMENT_PATTERN = Pattern.compile("^(.*)--.*$");

@ -20,7 +20,7 @@ package org.apache.flink.cdc.connectors.oceanbase;
import org.apache.flink.cdc.connectors.oceanbase.testutils.OceanBaseCdcMetadata; import org.apache.flink.cdc.connectors.oceanbase.testutils.OceanBaseCdcMetadata;
import org.apache.flink.table.planner.factories.TestValuesTableFactory; import org.apache.flink.table.planner.factories.TestValuesTableFactory;
import org.apache.flink.table.utils.LegacyRowResource; import org.apache.flink.table.utils.LegacyRowResource;
import org.apache.flink.test.util.AbstractTestBase; import org.apache.flink.test.util.AbstractTestBaseJUnit4;
import org.junit.ClassRule; import org.junit.ClassRule;
@ -43,7 +43,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
/** Basic class for testing OceanBase source. */ /** Basic class for testing OceanBase source. */
public abstract class OceanBaseTestBase extends AbstractTestBase { public abstract class OceanBaseTestBase extends AbstractTestBaseJUnit4 {
private static final Pattern COMMENT_PATTERN = Pattern.compile("^(.*)--.*$"); private static final Pattern COMMENT_PATTERN = Pattern.compile("^(.*)--.*$");

@ -21,7 +21,7 @@ import org.apache.flink.cdc.connectors.postgres.source.PostgresConnectionPoolFac
import org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceConfigFactory; import org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceConfigFactory;
import org.apache.flink.cdc.connectors.postgres.testutils.UniqueDatabase; import org.apache.flink.cdc.connectors.postgres.testutils.UniqueDatabase;
import org.apache.flink.table.planner.factories.TestValuesTableFactory; import org.apache.flink.table.planner.factories.TestValuesTableFactory;
import org.apache.flink.test.util.AbstractTestBase; import org.apache.flink.test.util.AbstractTestBaseJUnit4;
import org.apache.flink.types.Row; import org.apache.flink.types.Row;
import io.debezium.config.Configuration; import io.debezium.config.Configuration;
@ -63,7 +63,7 @@ import static org.junit.Assert.assertTrue;
* Basic class for testing PostgreSQL source, this contains a PostgreSQL container which enables wal * Basic class for testing PostgreSQL source, this contains a PostgreSQL container which enables wal
* log. * log.
*/ */
public abstract class PostgresTestBase extends AbstractTestBase { public abstract class PostgresTestBase extends AbstractTestBaseJUnit4 {
private static final Logger LOG = LoggerFactory.getLogger(PostgresTestBase.class); private static final Logger LOG = LoggerFactory.getLogger(PostgresTestBase.class);
public static final Pattern COMMENT_PATTERN = Pattern.compile("^(.*)--.*$"); public static final Pattern COMMENT_PATTERN = Pattern.compile("^(.*)--.*$");
public static final String DEFAULT_DB = "postgres"; public static final String DEFAULT_DB = "postgres";

@ -18,7 +18,7 @@
package org.apache.flink.cdc.connectors.sqlserver; package org.apache.flink.cdc.connectors.sqlserver;
import org.apache.flink.table.planner.factories.TestValuesTableFactory; import org.apache.flink.table.planner.factories.TestValuesTableFactory;
import org.apache.flink.test.util.AbstractTestBase; import org.apache.flink.test.util.AbstractTestBaseJUnit4;
import org.awaitility.Awaitility; import org.awaitility.Awaitility;
import org.awaitility.core.ConditionTimeoutException; import org.awaitility.core.ConditionTimeoutException;
@ -49,7 +49,7 @@ import java.util.stream.Stream;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
/** Utility class for sqlserver tests. */ /** Utility class for sqlserver tests. */
public class SqlServerTestBase extends AbstractTestBase { public class SqlServerTestBase extends AbstractTestBaseJUnit4 {
private static final Logger LOG = LoggerFactory.getLogger(SqlServerTestBase.class); private static final Logger LOG = LoggerFactory.getLogger(SqlServerTestBase.class);
private static final Pattern COMMENT_PATTERN = Pattern.compile("^(.*)--.*$"); private static final Pattern COMMENT_PATTERN = Pattern.compile("^(.*)--.*$");

@ -17,7 +17,7 @@
package org.apache.flink.cdc.connectors.tidb; package org.apache.flink.cdc.connectors.tidb;
import org.apache.flink.test.util.AbstractTestBase; import org.apache.flink.test.util.AbstractTestBaseJUnit4;
import com.alibaba.dcm.DnsCacheManipulator; import com.alibaba.dcm.DnsCacheManipulator;
import org.apache.commons.lang3.RandomUtils; import org.apache.commons.lang3.RandomUtils;
@ -53,7 +53,7 @@ import java.util.stream.Stream;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
/** Utility class for tidb tests. */ /** Utility class for tidb tests. */
public class TiDBTestBase extends AbstractTestBase { public class TiDBTestBase extends AbstractTestBaseJUnit4 {
private static final Logger LOG = LoggerFactory.getLogger(TiDBTestBase.class); private static final Logger LOG = LoggerFactory.getLogger(TiDBTestBase.class);
private static final Pattern COMMENT_PATTERN = Pattern.compile("^(.*)--.*$"); private static final Pattern COMMENT_PATTERN = Pattern.compile("^(.*)--.*$");

@ -18,7 +18,7 @@
package org.apache.flink.cdc.connectors.vitess; package org.apache.flink.cdc.connectors.vitess;
import org.apache.flink.cdc.connectors.vitess.container.VitessContainer; import org.apache.flink.cdc.connectors.vitess.container.VitessContainer;
import org.apache.flink.test.util.AbstractTestBase; import org.apache.flink.test.util.AbstractTestBaseJUnit4;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -43,7 +43,7 @@ import java.util.stream.Stream;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
/** Basic class for testing Vitess source, this contains a Vitess container. */ /** Basic class for testing Vitess source, this contains a Vitess container. */
public abstract class VitessTestBase extends AbstractTestBase { public abstract class VitessTestBase extends AbstractTestBaseJUnit4 {
private static final Logger LOG = LoggerFactory.getLogger(VitessTestBase.class); private static final Logger LOG = LoggerFactory.getLogger(VitessTestBase.class);
private static final Pattern COMMENT_PATTERN = Pattern.compile("^(.*)--.*$"); private static final Pattern COMMENT_PATTERN = Pattern.compile("^(.*)--.*$");

@ -33,7 +33,8 @@ limitations under the License.
<flink-major-1.19>1.19</flink-major-1.19> <flink-major-1.19>1.19</flink-major-1.19>
<flink-major-1.20>1.20</flink-major-1.20> <flink-major-1.20>1.20</flink-major-1.20>
<mysql.driver.version>8.0.27</mysql.driver.version> <mysql.driver.version>8.0.27</mysql.driver.version>
<starrocks.connector.version>1.2.10_flink-${flink.major.version}</starrocks.connector.version> <!-- TODO: Update this, when StarRocks releases a 1.20 compatible connector. -->
<starrocks.connector.version>1.2.10_flink-${flink-major-1.19}</starrocks.connector.version>
<paimon.version>0.9.0</paimon.version> <paimon.version>0.9.0</paimon.version>
</properties> </properties>

@ -50,9 +50,9 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.CyclicBarrier; import java.util.concurrent.CyclicBarrier;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
@ -486,7 +486,9 @@ public abstract class SerializerTestBase<T> {
// -------------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------------
private void deepEquals(String message, T should, T is) { private void deepEquals(String message, T should, T is) {
assertThat(message, is, CustomEqualityMatcher.deeplyEquals(should).withChecker(checker)); assertThat(is)
.as(message)
.matches(CustomEqualityMatcher.deeplyEquals(should).withChecker(checker));
} }
// -------------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------------
@ -580,11 +582,12 @@ public abstract class SerializerTestBase<T> {
T serdeTestItem = serializer.deserialize(dataInputDeserializer); T serdeTestItem = serializer.deserialize(dataInputDeserializer);
T copySerdeTestItem = serializer.copy(serdeTestItem); T copySerdeTestItem = serializer.copy(serdeTestItem);
dataOutputSerializer.clear(); dataOutputSerializer.clear();
assertThat(copySerdeTestItem)
assertThat( .as(
"Serialization/Deserialization cycle resulted in an object that are not equal to the original.", "Serialization/Deserialization cycle resulted in an object that are not equal to the original.")
copySerdeTestItem, .matches(
CustomEqualityMatcher.deeplyEquals(testItem).withChecker(checker)); CustomEqualityMatcher.deeplyEquals(testItem)
.withChecker(checker));
// try to enforce some upper bound to the test time // try to enforce some upper bound to the test time
if (System.nanoTime() >= endTimeNanos) { if (System.nanoTime() >= endTimeNanos) {

@ -67,8 +67,8 @@ limitations under the License.
<flink.reuseForks>true</flink.reuseForks> <flink.reuseForks>true</flink.reuseForks>
<!-- dependencies versions --> <!-- dependencies versions -->
<flink.version>1.19.1</flink.version> <flink.version>1.20.0</flink.version>
<flink.major.version>1.19</flink.major.version> <flink.major.version>1.20</flink.major.version>
<flink.shaded.version>17.0</flink.shaded.version> <flink.shaded.version>17.0</flink.shaded.version>
<debezium.version>1.9.8.Final</debezium.version> <debezium.version>1.9.8.Final</debezium.version>
<tikv.version>3.2.0</tikv.version> <tikv.version>3.2.0</tikv.version>

Loading…
Cancel
Save