chore[vitess-cdc]: Rebase from latest master

apache · Jul 27, 2022 · d9bb902 · d9bb902
1 parent 1f9a6d6
commit d9bb902
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/flink-connector-vitess-cdc/pom.xml b/flink-connector-vitess-cdc/pom.xml
@@ -79,14 +79,14 @@ under the License.
 
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-planner-blink_${scala.binary.version}</artifactId>
+            <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
             <version>${flink.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-runtime-blink_${scala.binary.version}</artifactId>
+            <artifactId>flink-table-runtime_${scala.binary.version}</artifactId>
             <version>${flink.version}</version>
             <scope>test</scope>
         </dependency>
@@ -132,7 +132,7 @@ under the License.
 
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-planner-blink_${scala.binary.version}</artifactId>
+            <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
             <version>${flink.version}</version>
             <type>test-jar</type>
             <scope>test</scope>

diff --git a/...nnector-vitess-cdc/src/main/java/com/ververica/cdc/connectors/vitess/VitessValidator.java b/...nnector-vitess-cdc/src/main/java/com/ververica/cdc/connectors/vitess/VitessValidator.java
@@ -18,7 +18,7 @@
 
 package com.ververica.cdc.connectors.vitess;
 
-import org.apache.flink.shaded.guava18.com.google.common.collect.Maps;
+import org.apache.flink.shaded.guava30.com.google.common.collect.Maps;
 
 import com.ververica.cdc.debezium.Validator;
 import io.debezium.connector.vitess.VitessConnector;

diff --git a/...nector-vitess-cdc/src/test/java/com/vervetica/cdc/connectors/vitess/VitessSourceTest.java b/...nector-vitess-cdc/src/test/java/com/vervetica/cdc/connectors/vitess/VitessSourceTest.java
@@ -47,6 +47,7 @@
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.OptionalLong;
 import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -297,6 +298,11 @@ public boolean isRestored() {
             return isRestored;
         }
 
+        @Override
+        public OptionalLong getRestoredCheckpointId() {
+            throw new UnsupportedOperationException();
+        }
+
         @Override
         public OperatorStateStore getOperatorStateStore() {
             return operatorStateStore;