From 007874ad73057ef765a71497a4713f25e9b3f24b Mon Sep 17 00:00:00 2001
From: yunfengzhou-hub <yuri.zhouyunfeng@outlook.com>
Date: Thu, 21 Nov 2024 14:26:06 +0800
Subject: [PATCH] [flink][cdc] Update flink dependency to 1.20

---
 paimon-flink/paimon-flink-cdc/pom.xml         | 11 ++++--
 .../streamrecord/RecordAttributes.java        | 22 ------------
 .../catalog/CatalogMaterializedTable.java     | 34 -------------------
 3 files changed, 9 insertions(+), 58 deletions(-)
 delete mode 100644 paimon-flink/paimon-flink-cdc/src/main/java/org/apache/flink/streaming/runtime/streamrecord/RecordAttributes.java
 delete mode 100644 paimon-flink/paimon-flink-cdc/src/main/java/org/apache/flink/table/catalog/CatalogMaterializedTable.java

diff --git a/paimon-flink/paimon-flink-cdc/pom.xml b/paimon-flink/paimon-flink-cdc/pom.xml
index 7f5bb3e786da..792c6c14378b 100644
--- a/paimon-flink/paimon-flink-cdc/pom.xml
+++ b/paimon-flink/paimon-flink-cdc/pom.xml
@@ -34,7 +34,7 @@ under the License.
     <name>Paimon : Flink : CDC</name>
 
     <properties>
-        <flink.version>1.18.1</flink.version>
+        <flink.version>1.20.0</flink.version>
         <flink.cdc.version>3.1.1</flink.cdc.version>
         <flink.mongodb.cdc.version>3.1.1</flink.mongodb.cdc.version>
         <avro.version>1.11.4</avro.version>
@@ -43,7 +43,7 @@ under the License.
         <mongodb.testcontainers.version>1.19.1</mongodb.testcontainers.version>
         <flink.connector.pulsar.version>4.0.0-1.17</flink.connector.pulsar.version>
         <confluent.platform.version>7.5.0</confluent.platform.version>
-        <flink.connector.kafka.version>3.0.1-1.18</flink.connector.kafka.version>
+        <flink.connector.kafka.version>3.3.0-1.20</flink.connector.kafka.version>
     </properties>
 
     <repositories>
@@ -167,6 +167,13 @@ under the License.
 
         <!-- test dependencies -->
 
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.9</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.paimon</groupId>
             <artifactId>paimon-common</artifactId>
diff --git a/paimon-flink/paimon-flink-cdc/src/main/java/org/apache/flink/streaming/runtime/streamrecord/RecordAttributes.java b/paimon-flink/paimon-flink-cdc/src/main/java/org/apache/flink/streaming/runtime/streamrecord/RecordAttributes.java
deleted file mode 100644
index 723c71dc565d..000000000000
--- a/paimon-flink/paimon-flink-cdc/src/main/java/org/apache/flink/streaming/runtime/streamrecord/RecordAttributes.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.streaming.runtime.streamrecord;
-
-/** Placeholder class for new feature introduced since flink 1.19. Should never be used. */
-public class RecordAttributes extends StreamElement {}
diff --git a/paimon-flink/paimon-flink-cdc/src/main/java/org/apache/flink/table/catalog/CatalogMaterializedTable.java b/paimon-flink/paimon-flink-cdc/src/main/java/org/apache/flink/table/catalog/CatalogMaterializedTable.java
deleted file mode 100644
index 6eabd1db7f38..000000000000
--- a/paimon-flink/paimon-flink-cdc/src/main/java/org/apache/flink/table/catalog/CatalogMaterializedTable.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.table.catalog;
-
-/**
- * Dummy placeholder to resolve compatibility issue of CatalogMaterializedTable(introduced in flink
- * 1.20).
- */
-public interface CatalogMaterializedTable extends CatalogBaseTable {
-    /** Dummy LogicalRefreshMode placeholder. */
-    enum LogicalRefreshMode {}
-
-    /** Dummy RefreshMode placeholder. */
-    enum RefreshMode {}
-
-    /** Dummy RefreshStatus placeholder. */
-    enum RefreshStatus {}
-}