From a87bf7268c9e3d69f56ba69e1e237fd47f91ebeb Mon Sep 17 00:00:00 2001
From: Danny Cranmer <dannycranmer@apache.org>
Date: Mon, 22 Apr 2024 14:24:33 +0100
Subject: [PATCH] [FLINK-35138][Connectors/Kafka] Drop support for Flink 1.17

---
 .github/workflows/push_pr.yml |  8 +++-----
 .github/workflows/weekly.yml  | 15 +++++++--------
 pom.xml                       |  2 +-
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/push_pr.yml b/.github/workflows/push_pr.yml
index 0f3da2ce6..951579406 100644
--- a/.github/workflows/push_pr.yml
+++ b/.github/workflows/push_pr.yml
@@ -28,11 +28,9 @@ jobs:
   compile_and_test:
     strategy:
       matrix:
-        flink: [ 1.17.2 ]
-        jdk: [ '8, 11' ]
+        flink: [ 1.18.1 ]
+        jdk: [ '8, 11, 17' ]
         include:
-          - flink: 1.18.1
-            jdk: '8, 11, 17'
           - flink: 1.19.0
             jdk: '8, 11, 17, 21'
     uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
@@ -42,7 +40,7 @@ jobs:
   python_test:
     strategy:
       matrix:
-        flink: [ 1.17.2, 1.18.1, 1.19.0 ]
+        flink: [ 1.18.1, 1.19.0 ]
     uses: apache/flink-connector-shared-utils/.github/workflows/python_ci.yml@ci_utils
     with:
       flink_version: ${{ matrix.flink }}
\ No newline at end of file
diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml
index 7ee0f419b..1caecd5c9 100644
--- a/.github/workflows/weekly.yml
+++ b/.github/workflows/weekly.yml
@@ -30,11 +30,7 @@ jobs:
     strategy:
       matrix:
         flink_branches: [{
-          flink: 1.17-SNAPSHOT,
-          branch: main
-        }, {
           flink: 1.18-SNAPSHOT,
-          jdk: '8, 11, 17',
           branch: main
         }, {
           flink: 1.19-SNAPSHOT,
@@ -45,11 +41,14 @@ jobs:
           jdk: '8, 11, 17, 21',
           branch: main
         }, {
-          flink: 1.17.2,
-          branch: v3.1
+          flink: 1.18.1,
+          branch: v3.2
+        }, {
+          flink: 1.19.0,
+          branch: v3.2,
+          jdk: '8, 11, 17, 21',
         }, {
           flink: 1.18.1,
-          jdk: '8, 11, 17',
           branch: v3.1
         }, {
           flink: 1.19.0,
@@ -60,5 +59,5 @@ jobs:
     with:
       flink_version: ${{ matrix.flink_branches.flink }}
       connector_branch: ${{ matrix.flink_branches.branch }}
-      jdk_version: ${{ matrix.flink_branches.jdk || '8, 11' }}
+      jdk_version: ${{ matrix.flink_branches.jdk || '8, 11, 17' }}
       run_dependency_convergence: false
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 9215540fd..a86da54d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@ under the License.
     </modules>
 
     <properties>
-        <flink.version>1.17.0</flink.version>
+        <flink.version>1.18.0</flink.version>
         <kafka.version>3.4.0</kafka.version>
         <confluent.version>7.4.4</confluent.version>