From 050a837c4e743fc73f1dfe2fd697bcb020a57767 Mon Sep 17 00:00:00 2001
From: Andrew Fielder <90247335+fieldera-da@users.noreply.github.com>
Date: Wed, 21 Feb 2024 10:09:18 +0000
Subject: [PATCH] update flink to 1.18.1 (#173)

* update flink to 1.18.1
* upgrade flink-connector-kafka to  3.1.0-1.18
---
 build.sbt                                                 | 3 ++-
 cloudflow-it/Makefile                                     | 8 ++++----
 .../cloudflow/contrib/CloudflowNativeFlinkPlugin.scala    | 2 +-
 .../docs/modules/get-started/pages/flink-native.adoc      | 2 +-
 project/Dependencies.scala                                | 4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/build.sbt b/build.sbt
index 93c59b9..917ded3 100644
--- a/build.sbt
+++ b/build.sbt
@@ -33,7 +33,8 @@ lazy val flinkTests =
       crossScalaVersions := Vector(Dependencies.Scala212),
       scalafmtOnCompile := true,
       (Test / sourceGenerators) += (Test / avroScalaGenerateSpecific).taskValue,
-      Test / parallelExecution := false)
+      Test / parallelExecution := false,
+      Test / fork := true)
 
 lazy val flinkSbtPlugin =
   Project(id = "cloudflow-sbt-flink", base = file("cloudflow-sbt-flink"))
diff --git a/cloudflow-it/Makefile b/cloudflow-it/Makefile
index be5776c..fa8d3d5 100644
--- a/cloudflow-it/Makefile
+++ b/cloudflow-it/Makefile
@@ -34,10 +34,10 @@ prepare-clis:
 	mv spark-3.3.4-bin-hadoop2 spark
 	rm spark-3.3.4-bin-hadoop2.tgz
 	rm -rf flink
-	wget https://archive.apache.org/dist/flink/flink-1.17.2/flink-1.17.2-bin-scala_2.12.tgz
-	tar -xf flink-1.17.2-bin-scala_2.12.tgz
-	mv flink-1.17.2 flink
-	rm flink-1.17.2-bin-scala_2.12.tgz
+	wget https://archive.apache.org/dist/flink/flink-1.18.1/flink-1.18.1-bin-scala_2.12.tgz
+	tar -xf flink-1.18.1-bin-scala_2.12.tgz
+	mv flink-1.18.1 flink
+	rm flink-1.18.1-bin-scala_2.12.tgz
 
 .PHONY: prepare-cluster
 prepare-cluster:
diff --git a/cloudflow-sbt-flink/src/main/scala/cloudflow/contrib/CloudflowNativeFlinkPlugin.scala b/cloudflow-sbt-flink/src/main/scala/cloudflow/contrib/CloudflowNativeFlinkPlugin.scala
index cfc9420..1e401c0 100644
--- a/cloudflow-sbt-flink/src/main/scala/cloudflow/contrib/CloudflowNativeFlinkPlugin.scala
+++ b/cloudflow-sbt-flink/src/main/scala/cloudflow/contrib/CloudflowNativeFlinkPlugin.scala
@@ -29,7 +29,7 @@ import cloudflow.sbt.CloudflowBasePlugin._
 
 object CloudflowNativeFlinkPlugin extends AutoPlugin {
   val FlinkHome = "/opt/flink"
-  val FlinkVersion = "1.17.2"
+  val FlinkVersion = "1.18.1"
   val FlinkUsrLib = s"$FlinkHome/usrlib"
 
   val AppJarsDir: String = "app-jars"
diff --git a/docs/docs-source/docs/modules/get-started/pages/flink-native.adoc b/docs/docs-source/docs/modules/get-started/pages/flink-native.adoc
index 41a02f7..014abb0 100644
--- a/docs/docs-source/docs/modules/get-started/pages/flink-native.adoc
+++ b/docs/docs-source/docs/modules/get-started/pages/flink-native.adoc
@@ -57,7 +57,7 @@ The following scripts are expected to be present on the `PATH`:
   - bash
   - jq (minimum version required is > 1.5, because of https://github.com/stedolan/jq/issues/1408[this] issue) 
   - kubectl
-  - flink cli (version 1.17.2)
+  - flink cli (version 1.18.1)
 
 In the `flink` sub-folder the first script available is `setup-example-rbac.sh` and this first step needs to be performed once on any cluster you want to deploy Flink streamlets, refer to https://ci.apache.org/projects/flink/flink-docs-master/docs/deployment/resource-providers/native_kubernetes/#rbac[the upstream documentation] for further details. This script will setup service account and cluster role binding. Take a note of the service account name that it prints in stdout - you will need it to run subsequent scripts.
 
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index afbc17b..b55089d 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -9,8 +9,8 @@ object Dependencies {
   object Versions {
     val cloudflowVersion = "2.3.2"
 
-    val flinkVersion = "1.17.2"
-    val flinkKafkaVersion = "3.0.2-1.17"
+    val flinkVersion = "1.18.1"
+    val flinkKafkaVersion = "3.1.0-1.18"
     val sparkVersion = "3.3.4"
     val akka = "2.6.19"
     val jackson = "2.12.6"