From 61446af428dfe343a722d12cb96da116e6b97557 Mon Sep 17 00:00:00 2001 From: panbingkun Date: Tue, 30 Apr 2024 07:33:26 +0800 Subject: [PATCH 1/8] [SPARK-48049][BUILD] Upgrade Scala to 2.13.14 --- dev/deps/spark-deps-hadoop-3-hive-2.3 | 6 +++--- docs/_config.yml | 2 +- pom.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3 b/dev/deps/spark-deps-hadoop-3-hive-2.3 index 5d933e34e40ba..9cd76933fea1f 100644 --- a/dev/deps/spark-deps-hadoop-3-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-3-hive-2.3 @@ -249,11 +249,11 @@ py4j/0.10.9.7//py4j-0.10.9.7.jar remotetea-oncrpc/1.1.2//remotetea-oncrpc-1.1.2.jar rocksdbjni/8.11.4//rocksdbjni-8.11.4.jar scala-collection-compat_2.13/2.7.0//scala-collection-compat_2.13-2.7.0.jar -scala-compiler/2.13.13//scala-compiler-2.13.13.jar -scala-library/2.13.13//scala-library-2.13.13.jar +scala-compiler/2.13.14//scala-compiler-2.13.14.jar +scala-library/2.13.14//scala-library-2.13.14.jar scala-parallel-collections_2.13/1.0.4//scala-parallel-collections_2.13-1.0.4.jar scala-parser-combinators_2.13/2.3.0//scala-parser-combinators_2.13-2.3.0.jar -scala-reflect/2.13.13//scala-reflect-2.13.13.jar +scala-reflect/2.13.14//scala-reflect-2.13.14.jar scala-xml_2.13/2.2.0//scala-xml_2.13-2.2.0.jar slf4j-api/2.0.13//slf4j-api-2.0.13.jar snakeyaml-engine/2.7//snakeyaml-engine-2.7.jar diff --git a/docs/_config.yml b/docs/_config.yml index 19183f85df239..e74eda0470417 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -22,7 +22,7 @@ include: SPARK_VERSION: 4.0.0-SNAPSHOT SPARK_VERSION_SHORT: 4.0.0 SCALA_BINARY_VERSION: "2.13" -SCALA_VERSION: "2.13.13" +SCALA_VERSION: "2.13.14" SPARK_ISSUE_TRACKER_URL: https://issues.apache.org/jira/browse/SPARK SPARK_GITHUB_URL: https://github.com/apache/spark # Before a new release, we should: diff --git a/pom.xml b/pom.xml index 8103865bbdae4..d9c5f93357c80 100644 --- a/pom.xml +++ b/pom.xml @@ -172,7 +172,7 @@ 3.2.2 4.4 - 2.13.13 + 2.13.14 2.13 2.2.0 4.8.1 From 22fcc876279033ba13c1de13f68cd4ff2b523f52 Mon Sep 17 00:00:00 2001 From: panbingkun Date: Thu, 2 May 2024 16:59:43 +0800 Subject: [PATCH 2/8] update genjavadoc to 0.19 --- project/SparkBuild.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 9d2ee6077d116..90e3a4fc0ebed 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -264,7 +264,7 @@ object SparkBuild extends PomBuild { .orElse(sys.props.get("java.home").map { p => new File(p).getParentFile().getAbsolutePath() }) .map(file), publishMavenStyle := true, - unidocGenjavadocVersion := "0.18", + unidocGenjavadocVersion := "0.19", // Override SBT's default resolvers: resolvers := Seq( From 7de0949239ff0df670156407372105936892d4b8 Mon Sep 17 00:00:00 2001 From: panbingkun Date: Thu, 2 May 2024 17:33:54 +0800 Subject: [PATCH 3/8] only for test --- connector/connect/client/jvm/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connector/connect/client/jvm/pom.xml b/connector/connect/client/jvm/pom.xml index 81ffb140226e8..9dd61c53c9350 100644 --- a/connector/connect/client/jvm/pom.xml +++ b/connector/connect/client/jvm/pom.xml @@ -73,7 +73,7 @@ com.lihaoyi - ammonite_${scala.version} + ammonite_2.13.13 ${ammonite.version} provided From 979a6670344e1f0e8d91771b84506138f2175bb6 Mon Sep 17 00:00:00 2001 From: panbingkun Date: Fri, 3 May 2024 07:51:21 +0800 Subject: [PATCH 4/8] exclude jline 3.25.1 --- connector/connect/client/jvm/pom.xml | 2 +- dev/deps/spark-deps-hadoop-3-hive-2.3 | 2 +- pom.xml | 15 ++++++++++++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/connector/connect/client/jvm/pom.xml b/connector/connect/client/jvm/pom.xml index 9dd61c53c9350..81ffb140226e8 100644 --- a/connector/connect/client/jvm/pom.xml +++ b/connector/connect/client/jvm/pom.xml @@ -73,7 +73,7 @@ com.lihaoyi - ammonite_2.13.13 + ammonite_${scala.version} ${ammonite.version} provided diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3 b/dev/deps/spark-deps-hadoop-3-hive-2.3 index 9cd76933fea1f..71a96ccbe4e2b 100644 --- a/dev/deps/spark-deps-hadoop-3-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-3-hive-2.3 @@ -142,7 +142,7 @@ jetty-util-ajax/11.0.20//jetty-util-ajax-11.0.20.jar jetty-util/11.0.20//jetty-util-11.0.20.jar jline/2.14.6//jline-2.14.6.jar jline/3.24.1//jline-3.24.1.jar -jna/5.13.0//jna-5.13.0.jar +jna/5.14.0//jna-5.14.0.jar joda-time/2.12.7//joda-time-2.12.7.jar jodd-core/3.5.2//jodd-core-3.5.2.jar jpam/1.1//jpam-1.1.jar diff --git a/pom.xml b/pom.xml index ac478c700fb63..dab3aacaaa1c1 100644 --- a/pom.xml +++ b/pom.xml @@ -229,7 +229,7 @@ and ./python/packaging/connect/setup.py too. --> 16.0.0 - 3.0.0-M1 + 3.0.0-M1-19-a7973e17 org.fusesource.leveldbjni @@ -438,6 +438,11 @@ jupiter-interface test + + org.jline + jline + 3.24.1 + @@ -1136,6 +1141,10 @@ org.scala-lang.modules scala-xml_2.13 + + org.jline + jline + @@ -1510,6 +1519,10 @@ junit junit + + org.jline + jline + From 3e5a24afdabac3e3826ea19d7182f89a3f51abee Mon Sep 17 00:00:00 2001 From: panbingkun Date: Mon, 6 May 2024 15:14:54 +0800 Subject: [PATCH 5/8] ignore org.jline.terminal.impl.ffm.* --- dev/deps/spark-deps-hadoop-3-hive-2.3 | 2 +- pom.xml | 16 +++------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3 b/dev/deps/spark-deps-hadoop-3-hive-2.3 index 71a96ccbe4e2b..603f2ec908758 100644 --- a/dev/deps/spark-deps-hadoop-3-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-3-hive-2.3 @@ -141,7 +141,7 @@ jettison/1.5.4//jettison-1.5.4.jar jetty-util-ajax/11.0.20//jetty-util-ajax-11.0.20.jar jetty-util/11.0.20//jetty-util-11.0.20.jar jline/2.14.6//jline-2.14.6.jar -jline/3.24.1//jline-3.24.1.jar +jline/3.25.1//jline-3.25.1.jar jna/5.14.0//jna-5.14.0.jar joda-time/2.12.7//joda-time-2.12.7.jar jodd-core/3.5.2//jodd-core-3.5.2.jar diff --git a/pom.xml b/pom.xml index dab3aacaaa1c1..929cb0ff1522a 100644 --- a/pom.xml +++ b/pom.xml @@ -438,11 +438,6 @@ jupiter-interface test - - org.jline - jline - 3.24.1 - @@ -1141,10 +1136,6 @@ org.scala-lang.modules scala-xml_2.13 - - org.jline - jline - @@ -1519,10 +1510,6 @@ junit junit - - org.jline - jline - @@ -2994,6 +2981,9 @@ ${java.version} test provided + + org.jline.terminal.impl.ffm.* + From 0bd3a97003ea99ed62c0da543306a5626479bc9b Mon Sep 17 00:00:00 2001 From: panbingkun Date: Tue, 7 May 2024 15:34:23 +0800 Subject: [PATCH 6/8] add some comment --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 929cb0ff1522a..5587d0bab80e0 100644 --- a/pom.xml +++ b/pom.xml @@ -2982,6 +2982,11 @@ test provided + org.jline.terminal.impl.ffm.* From 431f7a8ebf0e4e9656bce4a9e8876b17e8af25a6 Mon Sep 17 00:00:00 2001 From: panbingkun Date: Tue, 14 May 2024 17:20:55 +0800 Subject: [PATCH 7/8] update ammonite to 3.0.0-M2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7e99f70626220..53bd3e56f8dae 100644 --- a/pom.xml +++ b/pom.xml @@ -226,7 +226,7 @@ and ./python/packaging/connect/setup.py too. --> 16.0.0 - 3.0.0-M1-19-a7973e17 + 3.0.0-M2 org.fusesource.leveldbjni From 7e9fd24e6aa45d9a8811b7ee5a60f7c87c0eb368 Mon Sep 17 00:00:00 2001 From: panbingkun Date: Tue, 14 May 2024 21:08:34 +0800 Subject: [PATCH 8/8] update --- project/SparkBuild.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index d1b0ed953e30b..5bb7745d77bf2 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -266,7 +266,7 @@ object SparkBuild extends PomBuild { .orElse(sys.props.get("java.home").map { p => new File(p).getParentFile().getAbsolutePath() }) .map(file), publishMavenStyle := true, - unidocGenjavadocVersion := "0.19", + unidocGenjavadocVersion := "0.18", // Override SBT's default resolvers: resolvers := Seq(