From 494eff41f4f47a619307abee930e9de1d4c19f71 Mon Sep 17 00:00:00 2001
From: Deepali Gupta <g.deepali1211@gmail.com>
Date: Wed, 28 Feb 2024 11:08:16 +0800
Subject: [PATCH] [KYUUBI #6097][KYUUBI #6098] Upgrade Flink 1.16.3 and 1.18.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# :mag: Description
## Issue References 🔗

This pull request fixes https://github.com/apache/kyuubi/issues/6098, https://github.com/apache/kyuubi/issues/6097
## Describe Your Solution 🔧

Upgrade flink from 1.16.2 to 1.16.3 and 1.18.0 to 1.18.1

## Types of changes :bookmark:

- [ ] Bugfix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to change)

## Test Plan 🧪

#### Behavior Without This Pull Request :coffin:

#### Behavior With This Pull Request :tada:

#### Related Unit Tests

---

# Checklist 📝

- [x] This patch was not authored or co-authored using [Generative Tooling](https://www.apache.org/legal/generative-tooling.html)

**Be nice. Be informative.**

Closes #6105 from Deepali1211/master.

Closes #6097

Closes #6098

0d3516b24 [Deepali Gupta] Update flink version
1543443d3 [Deepali Gupta] Update flink version
c95e3bfc0 [Deepali Gupta] Update flink version

Lead-authored-by: Deepali Gupta <g.deepali1211@gmail.com>
Co-authored-by: Deepali Gupta <90255953+Deepali1211@users.noreply.github.com>
Signed-off-by: Cheng Pan <chengpan@apache.org>
---
 .github/workflows/master.yml                                  | 4 ++--
 .../apache/kyuubi/engine/flink/FlinkProcessBuilderSuite.scala | 4 ++--
 pom.xml                                                       | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index b3fb71081..0ded887a8 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -196,11 +196,11 @@ jobs:
         include:
           - java: 8
             flink: '1.17'
-            flink-archive: '-Dflink.archive.mirror=https://archive.apache.org/dist/flink/flink-1.16.1 -Dflink.archive.name=flink-1.16.1-bin-scala_2.12.tgz'
+            flink-archive: '-Dflink.archive.mirror=https://archive.apache.org/dist/flink/flink-1.16.3 -Dflink.archive.name=flink-1.16.3-bin-scala_2.12.tgz'
             comment: 'verify-on-flink-1.16-binary'
           - java: 8
             flink: '1.17'
-            flink-archive: '-Dflink.archive.mirror=https://archive.apache.org/dist/flink/flink-1.18.0 -Dflink.archive.name=flink-1.18.0-bin-scala_2.12.tgz'
+            flink-archive: '-Dflink.archive.mirror=https://archive.apache.org/dist/flink/flink-1.18.1 -Dflink.archive.name=flink-1.18.1-bin-scala_2.12.tgz'
             comment: 'verify-on-flink-1.18-binary'
     steps:
       - uses: actions/checkout@v4
diff --git a/kyuubi-server/src/test/scala/org/apache/kyuubi/engine/flink/FlinkProcessBuilderSuite.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/engine/flink/FlinkProcessBuilderSuite.scala
index 4c0e30d8d..88d3a2d14 100644
--- a/kyuubi-server/src/test/scala/org/apache/kyuubi/engine/flink/FlinkProcessBuilderSuite.scala
+++ b/kyuubi-server/src/test/scala/org/apache/kyuubi/engine/flink/FlinkProcessBuilderSuite.scala
@@ -50,8 +50,8 @@ class FlinkProcessBuilderSuite extends KyuubiFunSuite {
   private val tempFlinkHome = Files.createTempDirectory("flink-home").toFile
   private val tempOpt =
     Files.createDirectories(Paths.get(tempFlinkHome.toPath.toString, "opt")).toFile
-  Files.createFile(Paths.get(tempOpt.toPath.toString, "flink-sql-client-1.16.1.jar"))
-  Files.createFile(Paths.get(tempOpt.toPath.toString, "flink-sql-gateway-1.16.1.jar"))
+  Files.createFile(Paths.get(tempOpt.toPath.toString, "flink-sql-client-1.16.3.jar"))
+  Files.createFile(Paths.get(tempOpt.toPath.toString, "flink-sql-gateway-1.16.3.jar"))
   private val tempUsrLib =
     Files.createDirectories(Paths.get(tempFlinkHome.toPath.toString, "usrlib")).toFile
   private val tempUdfJar =
diff --git a/pom.xml b/pom.xml
index 7fa15291b..2da107b70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2335,7 +2335,7 @@
         <profile>
             <id>flink-1.16</id>
             <properties>
-                <flink.version>1.16.2</flink.version>
+                <flink.version>1.16.3</flink.version>
             </properties>
         </profile>
 
@@ -2349,7 +2349,7 @@
         <profile>
             <id>flink-1.18</id>
             <properties>
-                <flink.version>1.18.0</flink.version>
+                <flink.version>1.18.1</flink.version>
             </properties>
         </profile>