Skip to content

Commit 983f6f4

Browse files
panbingkunLuciferYang
authored andcommitted
[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: scala/scala#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]>
1 parent d230232 commit 983f6f4

File tree

4 files changed

+14
-9
lines changed

4 files changed

+14
-9
lines changed

dev/deps/spark-deps-hadoop-3-hive-2.3

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ jetty-util-ajax/11.0.23//jetty-util-ajax-11.0.23.jar
144144
jetty-util/11.0.23//jetty-util-11.0.23.jar
145145
jjwt-api/0.12.6//jjwt-api-0.12.6.jar
146146
jline/2.14.6//jline-2.14.6.jar
147-
jline/3.25.1//jline-3.25.1.jar
147+
jline/3.26.3//jline-3.26.3.jar
148148
jna/5.14.0//jna-5.14.0.jar
149149
joda-time/2.13.0//joda-time-2.13.0.jar
150150
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
252252
remotetea-oncrpc/1.1.2//remotetea-oncrpc-1.1.2.jar
253253
rocksdbjni/9.5.2//rocksdbjni-9.5.2.jar
254254
scala-collection-compat_2.13/2.7.0//scala-collection-compat_2.13-2.7.0.jar
255-
scala-compiler/2.13.14//scala-compiler-2.13.14.jar
256-
scala-library/2.13.14//scala-library-2.13.14.jar
255+
scala-compiler/2.13.15//scala-compiler-2.13.15.jar
256+
scala-library/2.13.15//scala-library-2.13.15.jar
257257
scala-parallel-collections_2.13/1.0.4//scala-parallel-collections_2.13-1.0.4.jar
258258
scala-parser-combinators_2.13/2.4.0//scala-parser-combinators_2.13-2.4.0.jar
259-
scala-reflect/2.13.14//scala-reflect-2.13.14.jar
259+
scala-reflect/2.13.15//scala-reflect-2.13.15.jar
260260
scala-xml_2.13/2.3.0//scala-xml_2.13-2.3.0.jar
261261
slf4j-api/2.0.16//slf4j-api-2.0.16.jar
262262
snakeyaml-engine/2.7//snakeyaml-engine-2.7.jar

docs/_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ include:
2222
SPARK_VERSION: 4.0.0-SNAPSHOT
2323
SPARK_VERSION_SHORT: 4.0.0
2424
SCALA_BINARY_VERSION: "2.13"
25-
SCALA_VERSION: "2.13.14"
25+
SCALA_VERSION: "2.13.15"
2626
SPARK_ISSUE_TRACKER_URL: https://issues.apache.org/jira/browse/SPARK
2727
SPARK_GITHUB_URL: https://github.com/apache/spark
2828
# Before a new release, we should:

pom.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@
169169
<!-- managed up from 3.2.1 for SPARK-11652 -->
170170
<commons.collections.version>3.2.2</commons.collections.version>
171171
<commons.collections4.version>4.4</commons.collections4.version>
172-
<scala.version>2.13.14</scala.version>
172+
<scala.version>2.13.15</scala.version>
173173
<scala.binary.version>2.13</scala.binary.version>
174174
<scalatest-maven-plugin.version>2.2.0</scalatest-maven-plugin.version>
175175
<scala-maven-plugin.version>4.9.1</scala-maven-plugin.version>
@@ -226,7 +226,7 @@
226226
and ./python/packaging/connect/setup.py too.
227227
-->
228228
<arrow.version>17.0.0</arrow.version>
229-
<ammonite.version>3.0.0-M2</ammonite.version>
229+
<ammonite.version>3.0.0</ammonite.version>
230230
<jjwt.version>0.12.6</jjwt.version>
231231

232232
<!-- org.fusesource.leveldbjni will be used except on arm64 platform. -->
@@ -3051,7 +3051,8 @@
30513051
<arg>-explaintypes</arg>
30523052
<arg>-release</arg>
30533053
<arg>17</arg>
3054-
<arg>-Wconf:cat=deprecation:wv,any:e</arg>
3054+
<arg>-Wconf:any:e</arg>
3055+
<arg>-Wconf:cat=deprecation:wv</arg>
30553056
<arg>-Wunused:imports</arg>
30563057
<arg>-Wconf:cat=scaladoc:wv</arg>
30573058
<arg>-Wconf:msg=^(?=.*?method|value|type|object|trait|inheritance)(?=.*?deprecated)(?=.*?since 2.13).+$:e</arg>

project/SparkBuild.scala

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,11 @@ object SparkBuild extends PomBuild {
234234
// replace -Xfatal-warnings with fine-grained configuration, since 2.13.2
235235
// verbose warning on deprecation, error on all others
236236
// see `scalac -Wconf:help` for details
237-
"-Wconf:cat=deprecation:wv,any:e",
237+
// since 2.13.15, "-Wconf:cat=deprecation:wv,any:e" no longer takes effect and needs to
238+
// be changed to "-Wconf:any:e", "-Wconf:cat=deprecation:wv",
239+
// please refer to the details: https://github.com/scala/scala/pull/10708
240+
"-Wconf:any:e",
241+
"-Wconf:cat=deprecation:wv",
238242
// 2.13-specific warning hits to be muted (as narrowly as possible) and addressed separately
239243
"-Wunused:imports",
240244
"-Wconf:msg=^(?=.*?method|value|type|object|trait|inheritance)(?=.*?deprecated)(?=.*?since 2.13).+$:e",

0 commit comments

Comments
 (0)