This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 983f6f434af3 [SPARK-49746][BUILD] Upgrade Scala to 2.13.15
983f6f434af3 is described below
commit 983f6f434af335b9270a0748dc5b4b18c7dc4846
Author: panbingkun <[email protected]>
AuthorDate: Wed Sep 25 07:50:20 2024 -0700
[SPARK-49746][BUILD] Upgrade Scala to 2.13.15
### What changes were proposed in this pull request?
The pr aims to upgrade `scala` from `2.13.14` to `2.13.15`.
### Why are the changes needed?
https://contributors.scala-lang.org/t/scala-2-13-15-release-planning/6649
<img width="770" alt="image"
src="https://github.com/user-attachments/assets/277cfdb4-8542-42fe-86e5-ad72ca2bba4c";>
**Note: since 2.13.15, "-Wconf:cat=deprecation:wv,any:e" no longer takes
effect and needs to be changed to "-Wconf:any:e", "-Wconf:cat=deprecation:wv",
please refer to the details: https://github.com/scala/scala/pull/10708**
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Pass GA.
### Was this patch authored or co-authored using generative AI tooling?
No.
Closes #48192 from panbingkun/SPARK-49746.
Lead-authored-by: panbingkun <[email protected]>
Co-authored-by: YangJie <[email protected]>
Signed-off-by: Dongjoon Hyun <[email protected]>
---
dev/deps/spark-deps-hadoop-3-hive-2.3 | 8 ++++----
docs/_config.yml | 2 +-
pom.xml | 7 ++++---
project/SparkBuild.scala | 6 +++++-
4 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3
b/dev/deps/spark-deps-hadoop-3-hive-2.3
index 88526995293f..19b8a237d30a 100644
--- a/dev/deps/spark-deps-hadoop-3-hive-2.3
+++ b/dev/deps/spark-deps-hadoop-3-hive-2.3
@@ -144,7 +144,7 @@ jetty-util-ajax/11.0.23//jetty-util-ajax-11.0.23.jar
jetty-util/11.0.23//jetty-util-11.0.23.jar
jjwt-api/0.12.6//jjwt-api-0.12.6.jar
jline/2.14.6//jline-2.14.6.jar
-jline/3.25.1//jline-3.25.1.jar
+jline/3.26.3//jline-3.26.3.jar
jna/5.14.0//jna-5.14.0.jar
joda-time/2.13.0//joda-time-2.13.0.jar
jodd-core/3.5.2//jodd-core-3.5.2.jar
@@ -252,11 +252,11 @@ py4j/0.10.9.7//py4j-0.10.9.7.jar
remotetea-oncrpc/1.1.2//remotetea-oncrpc-1.1.2.jar
rocksdbjni/9.5.2//rocksdbjni-9.5.2.jar
scala-collection-compat_2.13/2.7.0//scala-collection-compat_2.13-2.7.0.jar
-scala-compiler/2.13.14//scala-compiler-2.13.14.jar
-scala-library/2.13.14//scala-library-2.13.14.jar
+scala-compiler/2.13.15//scala-compiler-2.13.15.jar
+scala-library/2.13.15//scala-library-2.13.15.jar
scala-parallel-collections_2.13/1.0.4//scala-parallel-collections_2.13-1.0.4.jar
scala-parser-combinators_2.13/2.4.0//scala-parser-combinators_2.13-2.4.0.jar
-scala-reflect/2.13.14//scala-reflect-2.13.14.jar
+scala-reflect/2.13.15//scala-reflect-2.13.15.jar
scala-xml_2.13/2.3.0//scala-xml_2.13-2.3.0.jar
slf4j-api/2.0.16//slf4j-api-2.0.16.jar
snakeyaml-engine/2.7//snakeyaml-engine-2.7.jar
diff --git a/docs/_config.yml b/docs/_config.yml
index e74eda047041..089d6bf2097b 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.14"
+SCALA_VERSION: "2.13.15"
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 131e754da815..f3dc92426ac4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -169,7 +169,7 @@
<!-- managed up from 3.2.1 for SPARK-11652 -->
<commons.collections.version>3.2.2</commons.collections.version>
<commons.collections4.version>4.4</commons.collections4.version>
- <scala.version>2.13.14</scala.version>
+ <scala.version>2.13.15</scala.version>
<scala.binary.version>2.13</scala.binary.version>
<scalatest-maven-plugin.version>2.2.0</scalatest-maven-plugin.version>
<scala-maven-plugin.version>4.9.1</scala-maven-plugin.version>
@@ -226,7 +226,7 @@
and ./python/packaging/connect/setup.py too.
-->
<arrow.version>17.0.0</arrow.version>
- <ammonite.version>3.0.0-M2</ammonite.version>
+ <ammonite.version>3.0.0</ammonite.version>
<jjwt.version>0.12.6</jjwt.version>
<!-- org.fusesource.leveldbjni will be used except on arm64 platform. -->
@@ -3051,7 +3051,8 @@
<arg>-explaintypes</arg>
<arg>-release</arg>
<arg>17</arg>
- <arg>-Wconf:cat=deprecation:wv,any:e</arg>
+ <arg>-Wconf:any:e</arg>
+ <arg>-Wconf:cat=deprecation:wv</arg>
<arg>-Wunused:imports</arg>
<arg>-Wconf:cat=scaladoc:wv</arg>
<arg>-Wconf:msg=^(?=.*?method|value|type|object|trait|inheritance)(?=.*?deprecated)(?=.*?since
2.13).+$:e</arg>
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 2f390cb70baa..82950fb30287 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -234,7 +234,11 @@ object SparkBuild extends PomBuild {
// replace -Xfatal-warnings with fine-grained configuration, since
2.13.2
// verbose warning on deprecation, error on all others
// see `scalac -Wconf:help` for details
- "-Wconf:cat=deprecation:wv,any:e",
+ // since 2.13.15, "-Wconf:cat=deprecation:wv,any:e" no longer takes
effect and needs to
+ // be changed to "-Wconf:any:e", "-Wconf:cat=deprecation:wv",
+ // please refer to the details:
https://github.com/scala/scala/pull/10708
+ "-Wconf:any:e",
+ "-Wconf:cat=deprecation:wv",
// 2.13-specific warning hits to be muted (as narrowly as possible)
and addressed separately
"-Wunused:imports",
"-Wconf:msg=^(?=.*?method|value|type|object|trait|inheritance)(?=.*?deprecated)(?=.*?since
2.13).+$:e",
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
