From 7015528f30abaeedaf5c46eff4b446e50cbe5900 Mon Sep 17 00:00:00 2001
From: yux <34335406+yuxiqian@users.noreply.github.com>
Date: Wed, 15 Jul 2026 13:21:21 +0800
Subject: [PATCH] [hotfix][build] Upgrade supported Flink versions

---
 .github/workflows/flink_cdc_ci.yml            | 12 ++++----
 .github/workflows/flink_cdc_ci_nightly.yml    | 12 ++++----
 .../flink-cdc-pipeline-e2e-tests/pom.xml      | 30 +++++++++++++++----
 .../flink-cdc-source-e2e-tests/pom.xml        |  2 +-
 pom.xml                                       |  8 ++---
 5 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/flink_cdc_ci.yml b/.github/workflows/flink_cdc_ci.yml
index 1dd0a6b14c2..2a925e50b3a 100644
--- a/.github/workflows/flink_cdc_ci.yml
+++ b/.github/workflows/flink_cdc_ci.yml
@@ -68,7 +68,7 @@ jobs:
     uses: ./.github/workflows/flink_cdc_base.yml
     with:
       java-versions: "[11]"
-      flink-versions: "['2.2.0']"
+      flink-versions: "['2.3.0']"
       custom-maven-parameter: "-Pflink2"
       modules: "['core']"
   pipeline-ut:
@@ -82,7 +82,7 @@ jobs:
     uses: ./.github/workflows/flink_cdc_base.yml
     with:
       java-versions: "[11]"
-      flink-versions: "['2.2.0']"
+      flink-versions: "['2.3.0']"
       custom-maven-parameter: "-Pflink2"
       modules: "['doris, elasticsearch, fluss, iceberg, kafka, maxcompute, mysql-pipeline, oceanbase-pipeline, paimon, postgres-pipeline, starrocks, oracle-pipeline']"
   source-ut:
@@ -96,7 +96,7 @@ jobs:
     uses: ./.github/workflows/flink_cdc_base.yml
     with:
       java-versions: "[11]"
-      flink-versions: "['2.2.0']"
+      flink-versions: "['2.3.0']"
       custom-maven-parameter: "-Pflink2"
       modules: "['mysql-source', 'postgres-source, oceanbase-source, tidb, vitess', 'oracle, sqlserver', 'db2, mongodb']"
   pipeline_e2e:
@@ -109,7 +109,7 @@ jobs:
     uses: ./.github/workflows/flink_cdc_base.yml
     with:
       java-versions: "[11]"
-      flink-versions: "['1.20.3']"
+      flink-versions: "['1.20.5']"
       modules: "['pipeline_e2e']"
       parallelism: ${{ matrix.parallelism }}
   pipeline_e2e_2_x:
@@ -122,7 +122,7 @@ jobs:
     uses: ./.github/workflows/flink_cdc_base.yml
     with:
       java-versions: "[11]"
-      flink-versions: "['2.2.0']"
+      flink-versions: "['2.2.1', '2.3.0']"
       custom-maven-parameter: "-Pflink2"
       modules: "['pipeline_e2e']"
       parallelism: ${{ matrix.parallelism }}
@@ -131,5 +131,5 @@ jobs:
     uses: ./.github/workflows/flink_cdc_base.yml
     with:
       java-versions: "[11]"
-      flink-versions: "['1.20.3']"
+      flink-versions: "['1.20.5']"
       modules: "['source_e2e']"
diff --git a/.github/workflows/flink_cdc_ci_nightly.yml b/.github/workflows/flink_cdc_ci_nightly.yml
index fa1fa0f8efe..93192e4565b 100644
--- a/.github/workflows/flink_cdc_ci_nightly.yml
+++ b/.github/workflows/flink_cdc_ci_nightly.yml
@@ -60,7 +60,7 @@ jobs:
     uses: ./.github/workflows/flink_cdc_base.yml
     with:
       java-versions: "[17]"
-      flink-versions: "['2.2.0']"
+      flink-versions: "['2.3.0']"
       custom-maven-parameter: "-Pflink2"
       modules: "['core']"
   pipeline-ut:
@@ -76,7 +76,7 @@ jobs:
     uses: ./.github/workflows/flink_cdc_base.yml
     with:
       java-versions: "[17]"
-      flink-versions: "['2.2.0']"
+      flink-versions: "['2.3.0']"
       custom-maven-parameter: "-Pflink2"
       modules: "['doris, elasticsearch, fluss, iceberg, kafka, maxcompute, mysql-pipeline, oceanbase-pipeline, paimon, postgres-pipeline, starrocks, oracle-pipeline']"
   source-ut:
@@ -92,7 +92,7 @@ jobs:
     uses: ./.github/workflows/flink_cdc_base.yml
     with:
       java-versions: "[17]"
-      flink-versions: "['2.2.0']"
+      flink-versions: "['2.3.0']"
       custom-maven-parameter: "-Pflink2"
       modules: "['mysql-source', 'postgres-source, oceanbase-source, tidb, vitess', 'oracle, sqlserver', 'db2, mongodb']"
   pipeline_e2e:
@@ -106,7 +106,7 @@ jobs:
     uses: ./.github/workflows/flink_cdc_base.yml
     with:
       java-versions: "[17]"
-      flink-versions: "['1.20.3']"
+      flink-versions: "['1.20.5']"
       modules: "['pipeline_e2e']"
       parallelism: ${{ matrix.parallelism }}
   pipeline_e2e_2_x:
@@ -120,7 +120,7 @@ jobs:
     uses: ./.github/workflows/flink_cdc_base.yml
     with:
       java-versions: "[17]"
-      flink-versions: "['2.2.0']"
+      flink-versions: "['2.2.1', '2.3.0']"
       custom-maven-parameter: "-Pflink2"
       modules: "['pipeline_e2e']"
       parallelism: ${{ matrix.parallelism }}
@@ -130,5 +130,5 @@ jobs:
     uses: ./.github/workflows/flink_cdc_base.yml
     with:
       java-versions: "[17]"
-      flink-versions: "['1.20.3']"
+      flink-versions: "['1.20.5']"
       modules: "['source_e2e']"
diff --git a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/pom.xml b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/pom.xml
index 029360af464..e5e4c221cd3 100644
--- a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/pom.xml
+++ b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/pom.xml
@@ -28,7 +28,9 @@ limitations under the License.
     <artifactId>flink-cdc-pipeline-e2e-tests</artifactId>
 
     <properties>
-        <flink-1.20>1.20.3</flink-1.20>
+        <flink-1.20>1.20.5</flink-1.20>
+        <flink-2.2>2.2.1</flink-2.2>
+        <flink-2.3>2.3.0</flink-2.3>
         <flink-major-1.20>1.20</flink-major-1.20>
         <mysql.driver.version>8.0.27</mysql.driver.version>
         <starrocks.connector.version>1.2.14_flink-${flink-major-1.20}</starrocks.connector.version>
@@ -169,7 +171,7 @@ limitations under the License.
         </dependency>
         <dependency>
             <groupId>org.apache.paimon</groupId>
-            <artifactId>paimon-flink-${flink.major.version}</artifactId>
+            <artifactId>paimon-flink-${paimon.flink.major.version}</artifactId>
             <version>${paimon.version}</version>
             <scope>test</scope>
         </dependency>
@@ -713,7 +715,16 @@ limitations under the License.
                             <groupId>org.apache.fluss</groupId>
                             <artifactId>fluss-flink-2.2</artifactId>
                             <version>${fluss.version}</version>
-                            <destFileName>fluss-flink-2.2.0.jar</destFileName>
+                            <destFileName>fluss-flink-${flink-2.2}.jar</destFileName>
+                            <type>jar</type>
+                            <outputDirectory>${project.build.directory}/dependencies
+                            </outputDirectory>
+                        </artifactItem>
+                        <artifactItem>
+                            <groupId>org.apache.fluss</groupId>
+                            <artifactId>fluss-flink-2.2</artifactId>
+                            <version>${fluss.version}</version>
+                            <destFileName>fluss-flink-${flink-2.3}.jar</destFileName>
                             <type>jar</type>
                             <outputDirectory>${project.build.directory}/dependencies
                             </outputDirectory>
@@ -792,9 +803,18 @@ limitations under the License.
                         </artifactItem>
                         <artifactItem>
                             <groupId>org.apache.paimon</groupId>
-                            <artifactId>paimon-flink-2.1</artifactId>
+                            <artifactId>paimon-flink-${paimon.flink.major.version}</artifactId>
+                            <version>${paimon.version}</version>
+                            <destFileName>paimon-sql-connector-${flink-2.2}.jar</destFileName>
+                            <type>jar</type>
+                            <outputDirectory>${project.build.directory}/dependencies
+                            </outputDirectory>
+                        </artifactItem>
+                        <artifactItem>
+                            <groupId>org.apache.paimon</groupId>
+                            <artifactId>paimon-flink-${paimon.flink.major.version}</artifactId>
                             <version>${paimon.version}</version>
-                            <destFileName>paimon-sql-connector-2.2.0.jar</destFileName>
+                            <destFileName>paimon-sql-connector-${flink-2.3}.jar</destFileName>
                             <type>jar</type>
                             <outputDirectory>${project.build.directory}/dependencies
                             </outputDirectory>
diff --git a/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/pom.xml b/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/pom.xml
index 188e2e36b4d..a61c267329c 100644
--- a/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/pom.xml
+++ b/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/pom.xml
@@ -28,7 +28,7 @@ limitations under the License.
     <artifactId>flink-cdc-source-e2e-tests</artifactId>
 
     <properties>
-        <flink-1.20>1.20.3</flink-1.20>
+        <flink-1.20>1.20.5</flink-1.20>
         <jdbc.version-1.20>3.3.0-1.20</jdbc.version-1.20>
         <mysql.driver.version>8.0.27</mysql.driver.version>
         <postgresql.driver.version>42.7.3</postgresql.driver.version>
diff --git a/pom.xml b/pom.xml
index 54e5f69c340..0692f9a0831 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,12 +69,12 @@ limitations under the License.
         <flink.reuseForks>true</flink.reuseForks>
 
         <!-- dependencies versions -->
-        <flink.1.x.version>1.20.3</flink.1.x.version>
-        <flink.2.x.version>2.2.0</flink.2.x.version>
+        <flink.1.x.version>1.20.5</flink.1.x.version>
+        <flink.2.x.version>2.3.0</flink.2.x.version>
         <flink.version>${flink.1.x.version}</flink.version>
         <flink.major.version>1.20</flink.major.version>
         <flink.1.x.shaded.guava.version>31.1-jre-17.0</flink.1.x.shaded.guava.version>
-        <flink.2.x.shaded.guava.version>33.4.0-jre-20.0</flink.2.x.shaded.guava.version>
+        <flink.2.x.shaded.guava.version>33.5.0-jre-21.0</flink.2.x.shaded.guava.version>
         <shaded.guava.version>${flink.1.x.shaded.guava.version}</shaded.guava.version>
         <flink.shaded.version>17.0</flink.shaded.version>
         <debezium.version>1.9.8.Final</debezium.version>
@@ -855,7 +855,7 @@ limitations under the License.
             <id>flink2</id>
             <properties>
                 <flink.kafka.connector.version>4.0.1-2.0</flink.kafka.connector.version>
-                <paimon.flink.major.version>2.1</paimon.flink.major.version>
+                <paimon.flink.major.version>2.2</paimon.flink.major.version>
                 <iceberg.flink.major.version>2.0</iceberg.flink.major.version>
             </properties>
             <build>