This is an automated email from the ASF dual-hosted git repository.

chengpan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kyuubi.git


The following commit(s) were added to refs/heads/master by this push:
     new 675d3e7e20 [KYUUBI #7285] Deprecate support for Flink 1.19, Spark 3.3, 
3.4
675d3e7e20 is described below

commit 675d3e7e20b31fe3e7928946136e7a40849ed39a
Author: Cheng Pan <[email protected]>
AuthorDate: Thu Dec 25 20:53:08 2025 +0800

    [KYUUBI #7285] Deprecate support for Flink 1.19, Spark 3.3, 3.4
    
    ### Why are the changes needed?
    
    Flink 1.19 and Spark 3.3, 3.4 are EOLed for a long time, and Kyuubi are 
likely to drop the support for those versions in the future, this PR adds a 
deprecated warning message before dropping.
    
    ### How was this patch tested?
    
    Review.
    
    ### Was this patch authored or co-authored using generative AI tooling?
    
    No.
    
    Closes #7285 from pan3793/deprecate.
    
    Closes #7285
    
    569dca40f [Cheng Pan] nit
    66441fd91 [Cheng Pan] Deprecate support for Flink 1.19, Spark 3.3, 3.4
    
    Authored-by: Cheng Pan <[email protected]>
    Signed-off-by: Cheng Pan <[email protected]>
---
 docs/security/authorization/spark/build.md                          | 2 +-
 .../scala/org/apache/kyuubi/engine/flink/FlinkEngineUtils.scala     | 6 +++---
 .../main/scala/org/apache/kyuubi/engine/spark/SparkSQLEngine.scala  | 4 ++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/docs/security/authorization/spark/build.md 
b/docs/security/authorization/spark/build.md
index 2a550dd6c4..9d6a18a5ef 100644
--- a/docs/security/authorization/spark/build.md
+++ b/docs/security/authorization/spark/build.md
@@ -64,7 +64,7 @@ The available `spark.version`s are shown in the following 
table.
 |       3.5.x       |     √     |                                              
             -                                                            |
 |       3.4.x       |     √     |                                              
             -                                                            |
 |       3.3.x       |     √     |                                              
             -                                                            |
-|       3.2.x       |     √     |                                              
             -                                                            |
+|       3.2.x       |     x     |                                              
     EOL since v1.11.0                                                    |
 |       3.1.x       |     x     |                                              
     EOL since v1.10.0                                                    |
 |       3.0.x       |     x     |                                              
      EOL since v1.9.0                                                    |
 | 2.4.x and earlier |     ×     | [PR 
2367](https://github.com/apache/kyuubi/pull/2367) is used to track how we work 
with older releases with scala 2.11 |
diff --git 
a/externals/kyuubi-flink-sql-engine/src/main/scala/org/apache/kyuubi/engine/flink/FlinkEngineUtils.scala
 
b/externals/kyuubi-flink-sql-engine/src/main/scala/org/apache/kyuubi/engine/flink/FlinkEngineUtils.scala
index 4a426edd61..8b2b1237fd 100644
--- 
a/externals/kyuubi-flink-sql-engine/src/main/scala/org/apache/kyuubi/engine/flink/FlinkEngineUtils.scala
+++ 
b/externals/kyuubi-flink-sql-engine/src/main/scala/org/apache/kyuubi/engine/flink/FlinkEngineUtils.scala
@@ -55,9 +55,9 @@ object FlinkEngineUtils extends Logging {
     val flinkVersion = EnvironmentInformation.getVersion
     if (SUPPORTED_FLINK_VERSIONS.contains(FLINK_RUNTIME_VERSION)) {
       info(s"The current Flink version is $flinkVersion")
-      if (FlinkEngineUtils.FLINK_RUNTIME_VERSION <= "1.18") {
-        warn("The support for Flink 1.17 and 1.18 are deprecated, and will be 
removed " +
-          "in the next version.")
+      if (FlinkEngineUtils.FLINK_RUNTIME_VERSION <= "1.19") {
+        warn("The support for Flink 1.17, 1.18 and 1.19 is deprecated, and 
will be removed " +
+          "in a future version.")
       }
     } else {
       throw new UnsupportedOperationException(
diff --git 
a/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/SparkSQLEngine.scala
 
b/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/SparkSQLEngine.scala
index 9151fe0a26..d7ad10c00b 100644
--- 
a/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/SparkSQLEngine.scala
+++ 
b/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/SparkSQLEngine.scala
@@ -383,6 +383,10 @@ object SparkSQLEngine extends Logging {
   }
 
   def main(args: Array[String]): Unit = {
+    if (KyuubiSparkUtil.SPARK_ENGINE_RUNTIME_VERSION <= "3.4") {
+      warn("The support for Spark 3.3 and 3.4 is deprecated, and will be 
removed " +
+        "in a future version.")
+    }
     val startedTime = System.currentTimeMillis()
     val submitTime = kyuubiConf.getOption(KYUUBI_ENGINE_SUBMIT_TIME_KEY) match 
{
       case Some(t) => t.toLong

Reply via email to