From ca74525cc75003c3c882b7fccbe33afc6093a3da Mon Sep 17 00:00:00 2001
From: Jun Qin <11677043+qinjunjerry@users.noreply.github.com>
Date: Tue, 31 Oct 2023 19:24:23 +0100
Subject: [PATCH] Upgrade to Flink 1.17.1 and JDK 11

---
 .github/workflows/build.yaml   | 4 ++--
 .github/workflows/publish.yaml | 4 ++--
 .github/workflows/release.yaml | 4 ++--
 build.gradle                   | 6 ++++--
 commit-analytics/build.gradle  | 2 +-
 import/build.gradle            | 2 +-
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 6a683ad..e7a4f75 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -13,10 +13,10 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: Verify
         run: ./gradlew check
       - name: Build
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index cbabb8f..921703e 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -11,10 +11,10 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: Verify
         run: ./gradlew check
       - name: Build
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index c0881a7..a66dfce 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -12,10 +12,10 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: Verify
         run: ./gradlew check
       - name: Build
diff --git a/build.gradle b/build.gradle
index 47f006e..d99056d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,14 +22,16 @@ plugins {
 }
 
 ext {
-    javaVersion = '1.8'
+    javaVersion = '11'
 //    flinkGroup = 'com.ververica.flink'
 //    flinkVersion = '1.12.2-stream1'
     flinkGroup = 'org.apache.flink'
-    flinkVersion = '1.15.3'
+    flinkVersion = '1.17.1'
     scalaBinaryVersion = '2.12'
     githubApiVersion = '1.301'
     okHttpVersion = '4.9.3'
+
+    elasticVersion = '3.0.1-1.17'
     /*
     Mime4J versions 0.8.5+ are built with Java 11 and will fail with the
     following error when run on Java 8:
diff --git a/commit-analytics/build.gradle b/commit-analytics/build.gradle
index 65d68eb..4107099 100644
--- a/commit-analytics/build.gradle
+++ b/commit-analytics/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     implementation "org.kohsuke:github-api:${githubApiVersion}"
     implementation "com.squareup.okhttp3:okhttp-urlconnection:${okHttpVersion}"
 
-    implementation "${flinkGroup}:flink-connector-elasticsearch7:${flinkVersion}"
+    implementation "${flinkGroup}:flink-connector-elasticsearch7:${elasticVersion}"
 }
 
 publishing {
diff --git a/import/build.gradle b/import/build.gradle
index 38307c5..655aa20 100644
--- a/import/build.gradle
+++ b/import/build.gradle
@@ -12,7 +12,7 @@ dependencies {
 
     implementation project(path: ':source-mbox')
 
-    implementation "${flinkGroup}:flink-connector-elasticsearch7:${flinkVersion}"
+    implementation "${flinkGroup}:flink-connector-elasticsearch7:${elasticVersion}"
     implementation "${flinkGroup}:flink-connector-kafka:${flinkVersion}"
     implementation "${flinkGroup}:flink-json:${flinkVersion}"
 }