diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/pom.xml b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/pom.xml index 7c2a93d700..56a3e00687 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/pom.xml +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/pom.xml @@ -46,7 +46,7 @@ under the License. io.debezium debezium-connector-vitess - 1.9.13.Final + 1.9.14.Final diff --git a/pom.xml b/pom.xml index 24183bb811..5044efcfa8 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ under the License. - 3.0.14 + 3.0.15 1.8 2.12 ${java.version} diff --git a/temp.diff b/temp.diff deleted file mode 100644 index bd7097e058..0000000000 --- a/temp.diff +++ /dev/null @@ -1,804 +0,0 @@ - - ``` - -diff --git a/flink-connector-debezium/src/main/java/io/debezium/metrics/Metrics.java b/flink-connector-debezium/src/main/java/io/debezium/metrics/Metrics.java -new file mode 100644 -index 00000000..02b764f3 ---- /dev/null -+++ b/flink-connector-debezium/src/main/java/io/debezium/metrics/Metrics.java -@@ -0,0 +1,46 @@ -+/* -+ * Copyright Debezium Authors. -+ * -+ * Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0 -+ */ -+ -+package io.debezium.metrics; -+ -+import io.debezium.annotation.ThreadSafe; -+import io.debezium.config.CommonConnectorConfig; -+import io.debezium.connector.common.CdcSourceTaskContext; -+import org.slf4j.Logger; -+import org.slf4j.LoggerFactory; -+ -+import java.util.Map; -+ -+/** Disabling debezium metrics altogether. */ -+@ThreadSafe -+public abstract class Metrics { -+ private static final Logger LOGGER = LoggerFactory.getLogger(Metrics.class); -+ -+ protected Metrics(CdcSourceTaskContext taskContext, String contextName) {} -+ -+ protected Metrics(CdcSourceTaskContext taskContext, Map tags) {} -+ -+ protected Metrics( -+ CommonConnectorConfig connectorConfig, -+ String contextName, -+ boolean multiPartitionMode) {} -+ -+ /** -+ * Registers a metrics MBean into the platform MBean server. The method is intentionally -+ * synchronized to prevent preemption between registration and unregistration. -+ */ -+ public synchronized void register() { -+ LOGGER.info("JMX Metrics are not supported"); -+ } -+ -+ /** -+ * Unregisters a metrics MBean from the platform MBean server. The method is intentionally -+ * synchronized to prevent preemption between registration and unregistration. -+ */ -+ public synchronized void unregister() { -+ LOGGER.info("JMX Metrics are not supported"); -+ } -+} -diff --git a/flink-connector-mongodb-cdc/pom.xml b/flink-connector-mongodb-cdc/pom.xml -index 600c9898..4541b0df 100644 ---- a/flink-connector-mongodb-cdc/pom.xml -+++ b/flink-connector-mongodb-cdc/pom.xml -@@ -18,8 +18,8 @@ under the License. - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - flink-cdc-connectors -- com.vinted -- 2.5-SNAPSHOT -+ com.vinted -+ 2.5.3 - - 4.0.0 - -@@ -30,7 +30,7 @@ under the License. - - - -- com.vinted -+ com.vinted - flink-connector-debezium - ${project.version} - -@@ -42,7 +42,7 @@ under the License. - - - -- com.vinted -+ com.vinted - flink-cdc-base - ${project.version} - -@@ -72,7 +72,7 @@ under the License. - - - -- com.vinted -+ com.vinted - flink-connector-test-util - ${project.version} - test -@@ -174,4 +174,4 @@ under the License. - - - -- -\ No newline at end of file -+ -diff --git a/flink-connector-mysql-cdc/pom.xml b/flink-connector-mysql-cdc/pom.xml -index 4671dd07..111a61aa 100644 ---- a/flink-connector-mysql-cdc/pom.xml -+++ b/flink-connector-mysql-cdc/pom.xml -@@ -18,8 +18,8 @@ under the License. - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - flink-cdc-connectors -- com.vinted -- 2.5-SNAPSHOT -+ com.vinted -+ 2.5.3 - - 4.0.0 - -@@ -31,7 +31,7 @@ under the License. - - - -- com.vinted -+ com.vinted - flink-connector-debezium - ${project.version} - -@@ -76,7 +76,7 @@ under the License. - - - -- com.vinted -+ com.vinted - flink-connector-test-util - ${project.version} - test -diff --git a/flink-connector-oceanbase-cdc/pom.xml b/flink-connector-oceanbase-cdc/pom.xml -index 69072615..16080ea9 100644 ---- a/flink-connector-oceanbase-cdc/pom.xml -+++ b/flink-connector-oceanbase-cdc/pom.xml -@@ -18,8 +18,8 @@ under the License. - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - flink-cdc-connectors -- com.vinted -- 2.5-SNAPSHOT -+ com.vinted -+ 2.5.3 - - 4.0.0 - -@@ -30,7 +30,7 @@ under the License. - - - -- com.vinted -+ com.vinted - flink-connector-debezium - ${project.version} - -diff --git a/flink-connector-oracle-cdc/pom.xml b/flink-connector-oracle-cdc/pom.xml -index 7b7a4fd7..d92cf5eb 100644 ---- a/flink-connector-oracle-cdc/pom.xml -+++ b/flink-connector-oracle-cdc/pom.xml -@@ -18,8 +18,8 @@ under the License. - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - flink-cdc-connectors -- com.vinted -- 2.5-SNAPSHOT -+ com.vinted -+ 2.5.3 - - 4.0.0 - -@@ -30,14 +30,14 @@ under the License. - - - -- com.vinted -+ com.vinted - flink-cdc-base - ${project.version} - - - - -- com.vinted -+ com.vinted - flink-connector-debezium - ${project.version} - -@@ -57,7 +57,7 @@ under the License. - - - -- com.vinted -+ com.vinted - flink-connector-test-util - ${project.version} - test -diff --git a/flink-connector-postgres-cdc/pom.xml b/flink-connector-postgres-cdc/pom.xml -index 47a9f777..9e7b7c4d 100644 ---- a/flink-connector-postgres-cdc/pom.xml -+++ b/flink-connector-postgres-cdc/pom.xml -@@ -18,8 +18,8 @@ under the License. - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - flink-cdc-connectors -- com.vinted -- 2.5-SNAPSHOT -+ com.vinted -+ 2.5.3 - - 4.0.0 - -@@ -31,7 +31,7 @@ under the License. - - - -- com.vinted -+ com.vinted - flink-cdc-base - ${project.version} - -@@ -44,7 +44,7 @@ under the License. - - - -- com.vinted -+ com.vinted - flink-connector-debezium - ${project.version} - -@@ -77,7 +77,7 @@ under the License. - - - -- com.vinted -+ com.vinted - flink-connector-test-util - ${project.version} - test -@@ -168,4 +168,4 @@ under the License. - - - -- -\ No newline at end of file -+ -diff --git a/flink-connector-sqlserver-cdc/pom.xml b/flink-connector-sqlserver-cdc/pom.xml -index b9fa1077..0feb97c2 100644 ---- a/flink-connector-sqlserver-cdc/pom.xml -+++ b/flink-connector-sqlserver-cdc/pom.xml -@@ -18,8 +18,8 @@ under the License. - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - flink-cdc-connectors -- com.vinted -- 2.5-SNAPSHOT -+ com.vinted -+ 2.5.3 - - 4.0.0 - -@@ -31,14 +31,14 @@ under the License. - - - -- com.vinted -+ com.vinted - flink-cdc-base - ${project.version} - - - - -- com.vinted -+ com.vinted - flink-connector-debezium - ${project.version} - -@@ -58,7 +58,7 @@ under the License. - - - -- com.vinted -+ com.vinted - flink-connector-test-util - ${project.version} - test -diff --git a/flink-connector-test-util/pom.xml b/flink-connector-test-util/pom.xml -index ea7ae19a..4ca1344e 100644 ---- a/flink-connector-test-util/pom.xml -+++ b/flink-connector-test-util/pom.xml -@@ -18,8 +18,8 @@ under the License. - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - flink-cdc-connectors -- com.vinted -- 2.5-SNAPSHOT -+ com.vinted -+ 2.5.3 - - 4.0.0 - -@@ -29,7 +29,7 @@ under the License. - - - -- com.vinted -+ com.vinted - flink-connector-debezium - ${project.version} - -@@ -53,4 +53,4 @@ under the License. - - - -- -\ No newline at end of file -+ -diff --git a/flink-connector-tidb-cdc/pom.xml b/flink-connector-tidb-cdc/pom.xml -index a52dcf6e..aae03e98 100644 ---- a/flink-connector-tidb-cdc/pom.xml -+++ b/flink-connector-tidb-cdc/pom.xml -@@ -18,8 +18,8 @@ under the License. - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - flink-cdc-connectors -- com.vinted -- 2.5-SNAPSHOT -+ com.vinted -+ 2.5.3 - - 4.0.0 - -@@ -30,7 +30,7 @@ under the License. - - - -- com.vinted -+ com.vinted - flink-connector-debezium - ${project.version} - -@@ -146,4 +146,4 @@ under the License. - - - -- -\ No newline at end of file -+ -diff --git a/flink-connector-vitess-cdc/pom.xml b/flink-connector-vitess-cdc/pom.xml -index 9400de34..c39a2ead 100644 ---- a/flink-connector-vitess-cdc/pom.xml -+++ b/flink-connector-vitess-cdc/pom.xml -@@ -18,8 +18,8 @@ under the License. - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - flink-cdc-connectors -- com.vinted -- 2.5-SNAPSHOT -+ com.vinted -+ 2.5.3 - - 4.0.0 - -@@ -31,7 +31,7 @@ under the License. - - - -- com.vinted -+ com.vinted - flink-connector-debezium - ${project.version} - -@@ -45,13 +45,14 @@ under the License. - - io.debezium - debezium-connector-vitess -- ${debezium.version} -+ -+ 1.9.8.Final - - - - - -- com.vinted -+ com.vinted - flink-connector-test-util - ${project.version} - test -diff --git a/flink-sql-connector-db2-cdc/pom.xml b/flink-sql-connector-db2-cdc/pom.xml -index 86963a97..8b359a35 100644 ---- a/flink-sql-connector-db2-cdc/pom.xml -+++ b/flink-sql-connector-db2-cdc/pom.xml -@@ -18,8 +18,8 @@ under the License. - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - flink-cdc-connectors -- com.vinted -- 2.5-SNAPSHOT -+ com.vinted -+ 2.5.3 - - 4.0.0 - -@@ -27,7 +27,7 @@ under the License. - - - -- com.vinted -+ com.vinted - flink-connector-db2-cdc - ${project.version} - -@@ -87,4 +87,4 @@ under the License. - - - -- -\ No newline at end of file -+ -diff --git a/flink-sql-connector-mongodb-cdc/pom.xml b/flink-sql-connector-mongodb-cdc/pom.xml -index 80445242..8d3b7859 100644 ---- a/flink-sql-connector-mongodb-cdc/pom.xml -+++ b/flink-sql-connector-mongodb-cdc/pom.xml -@@ -18,8 +18,8 @@ under the License. - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - flink-cdc-connectors -- com.vinted -- 2.5-SNAPSHOT -+ com.vinted -+ 2.5.3 - - 4.0.0 - -@@ -27,7 +27,7 @@ under the License. - - - -- com.vinted -+ com.vinted - flink-connector-mongodb-cdc - ${project.version} - -@@ -114,4 +114,4 @@ under the License. - - - -- -\ No newline at end of file -+ -diff --git a/flink-sql-connector-mysql-cdc/pom.xml b/flink-sql-connector-mysql-cdc/pom.xml -index b42e806f..cfdb1b47 100644 ---- a/flink-sql-connector-mysql-cdc/pom.xml -+++ b/flink-sql-connector-mysql-cdc/pom.xml -@@ -18,8 +18,8 @@ under the License. - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - flink-cdc-connectors -- com.vinted -- 2.5-SNAPSHOT -+ com.vinted -+ 2.5.3 - - 4.0.0 - -@@ -27,7 +27,7 @@ under the License. - - - -- com.vinted -+ com.vinted - flink-connector-mysql-cdc - ${project.version} - -@@ -55,8 +55,8 @@ under the License. - io.debezium:debezium-core - io.debezium:debezium-ddl-parser - io.debezium:debezium-connector-mysql -- com.ververica:flink-connector-debezium -- com.ververica:flink-connector-mysql-cdc -+ com.vinted:flink-connector-debezium -+ com.vinted:flink-connector-mysql-cdc - org.antlr:antlr4-runtime - org.apache.kafka:* - mysql:mysql-connector-java -@@ -84,10 +84,22 @@ under the License. - - - -+ -+ -+ -+ -+ -+ - -- org.apache.kafka -+ org.apache.kafka.clients - -- com.ververica.cdc.connectors.shaded.org.apache.kafka -+ com.ververica.cdc.connectors.shaded.org.apache.kafka.clients -+ -+ -+ -+ org.apache.kafka.common -+ -+ com.ververica.cdc.connectors.shaded.org.apache.kafka.common - - - -@@ -125,4 +137,4 @@ under the License. - - - -- -\ No newline at end of file -+ -diff --git a/flink-sql-connector-oceanbase-cdc/pom.xml b/flink-sql-connector-oceanbase-cdc/pom.xml -index 84f15bea..a2df3723 100644 ---- a/flink-sql-connector-oceanbase-cdc/pom.xml -+++ b/flink-sql-connector-oceanbase-cdc/pom.xml -@@ -18,8 +18,8 @@ under the License. - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - flink-cdc-connectors -- com.vinted -- 2.5-SNAPSHOT -+ com.vinted -+ 2.5.3 - - 4.0.0 - -@@ -27,7 +27,7 @@ under the License. - - - -- com.vinted -+ com.vinted - flink-connector-oceanbase-cdc - ${project.version} - -diff --git a/flink-sql-connector-oracle-cdc/pom.xml b/flink-sql-connector-oracle-cdc/pom.xml -index a5fcaf7a..07da9ab5 100644 ---- a/flink-sql-connector-oracle-cdc/pom.xml -+++ b/flink-sql-connector-oracle-cdc/pom.xml -@@ -18,8 +18,8 @@ under the License. - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - flink-cdc-connectors -- com.vinted -- 2.5-SNAPSHOT -+ com.vinted -+ 2.5.3 - - 4.0.0 - -@@ -27,7 +27,7 @@ under the License. - - - -- com.vinted -+ com.vinted - flink-connector-oracle-cdc - ${project.version} - -diff --git a/flink-sql-connector-postgres-cdc/pom.xml b/flink-sql-connector-postgres-cdc/pom.xml -index 8672afe1..d7602176 100644 ---- a/flink-sql-connector-postgres-cdc/pom.xml -+++ b/flink-sql-connector-postgres-cdc/pom.xml -@@ -18,8 +18,8 @@ under the License. - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - flink-cdc-connectors -- com.vinted -- 2.5-SNAPSHOT -+ com.vinted -+ 2.5.3 - - 4.0.0 - -@@ -27,7 +27,7 @@ under the License. - - - -- com.vinted -+ com.vinted - flink-connector-postgres-cdc - ${project.version} - -@@ -107,4 +107,4 @@ under the License. - - - -- -\ No newline at end of file -+ -diff --git a/flink-sql-connector-sqlserver-cdc/pom.xml b/flink-sql-connector-sqlserver-cdc/pom.xml -index 3784e1c0..2a288179 100644 ---- a/flink-sql-connector-sqlserver-cdc/pom.xml -+++ b/flink-sql-connector-sqlserver-cdc/pom.xml -@@ -18,8 +18,8 @@ under the License. - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - flink-cdc-connectors -- com.vinted -- 2.5-SNAPSHOT -+ com.vinted -+ 2.5.3 - - 4.0.0 - -@@ -27,7 +27,7 @@ under the License. - - - -- com.vinted -+ com.vinted - flink-connector-sqlserver-cdc - ${project.version} - -diff --git a/flink-sql-connector-tidb-cdc/pom.xml b/flink-sql-connector-tidb-cdc/pom.xml -index 15a997c6..5b3341f0 100644 ---- a/flink-sql-connector-tidb-cdc/pom.xml -+++ b/flink-sql-connector-tidb-cdc/pom.xml -@@ -18,8 +18,8 @@ under the License. - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - flink-cdc-connectors -- com.vinted -- 2.5-SNAPSHOT -+ com.vinted -+ 2.5.3 - - 4.0.0 - -@@ -27,7 +27,7 @@ under the License. - - - -- com.vinted -+ com.vinted - flink-connector-tidb-cdc - ${project.version} - -@@ -79,4 +79,4 @@ under the License. - - - -- -\ No newline at end of file -+ -diff --git a/flink-sql-connector-vitess-cdc/pom.xml b/flink-sql-connector-vitess-cdc/pom.xml -index 744282e8..4b9a8c86 100644 ---- a/flink-sql-connector-vitess-cdc/pom.xml -+++ b/flink-sql-connector-vitess-cdc/pom.xml -@@ -18,8 +18,8 @@ under the License. - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - flink-cdc-connectors -- com.vinted -- 2.5-SNAPSHOT -+ com.vinted -+ 2.5.3 - - 4.0.0 - -@@ -27,7 +27,7 @@ under the License. - - - -- com.vinted -+ com.vinted - flink-connector-vitess-cdc - ${project.version} - -@@ -53,7 +53,38 @@ under the License. - - - -- *:* -+ io.debezium:debezium-api -+ io.debezium:debezium-embedded -+ io.debezium:debezium-core -+ io.debezium:debezium-ddl-parser -+ io.debezium:debezium-connector-vitess -+ com.vinted:flink-connector-debezium -+ com.vinted:flink-connector-vitess-cdc -+ org.apache.kafka:* -+ com.github.luben.zstd:* -+ com.google.guava:* -+ io.vitess:vitess-grpc-client -+ io.vitess:vitess-client -+ io.netty:netty-handler -+ io.netty:netty-resolver -+ io.netty:netty-transport -+ io.netty:netty-buffer -+ io.netty:netty-codec-http2 -+ io.netty:netty-codec-http -+ io.netty:netty-codec -+ io.netty:netty-common -+ io.grpc:grpc-core -+ io.grpc:grpc-netty -+ io.grpc:grpc-stub -+ io.grpc:grpc-protobuf -+ io.grpc:grpc-protobuf-lite -+ io.grpc:grpc-context -+ io.grpc:grpc-api -+ com.google.protobuf:protobuf-java -+ com.google.code.gson:gson -+ io.opentracing.contrib:opentracing-grpc -+ io.perfmark:perfmark-api -+ com.github.luben:zstd-jni - - - -@@ -69,6 +100,22 @@ under the License. - com.google - com.ververica.cdc.connectors.vitess.shaded.com.google - -+ -+ com.github.luben.zstd -+ com.ververica.cdc.connectors.shaded.com.github.luben.zstd -+ -+ -+ org.apache.kafka.clients -+ -+ com.ververica.cdc.connectors.shaded.org.apache.kafka.clients -+ -+ -+ -+ org.apache.kafka.common -+ -+ com.ververica.cdc.connectors.shaded.org.apache.kafka.common -+ -+ - - - -diff --git a/pom.xml b/pom.xml -index 7779c1c6..d3690ec0 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -25,9 +25,9 @@ under the License. - - 4.0.0 - -- com.vinted -+ com.vinted - flink-cdc-connectors -- 2.5-SNAPSHOT -+ 2.5.3 - pom - - -@@ -39,18 +39,14 @@ under the License. - - - -- -- oss -- https://oss.sonatype.org/content/repositories/snapshots/ -- - -- oss -- https://oss.sonatype.org/service/local/staging/deploy/maven2/ -+ cloudsmith -+ https://maven.cloudsmith.io/vinted/maven-hosted-oom/ - - - - -- 1.17.0 -+ 1.17.1 - 1.9.7.Final - 3.2.0 - 2.2.0 -@@ -178,7 +174,19 @@ under the License. - - - -- -+ -+ org.apache.maven.plugins -+ maven-deploy-plugin -+ 2.8.2 -+ -+ ${project.distributionManagement.repository.url} -+ ${project.build.directory}/${project.artifactId}-${project.version}.jar -+ ${project.artifactId} -+ ${project.groupId} -+ ${project.version} -+ true -+ -+ - - org.apache.rat - apache-rat-plugin