Skip to content

Commit

Permalink
[SPARK-48049][BUILD] Upgrade Scala to 2.13.14
Browse files Browse the repository at this point in the history
### What changes were proposed in this pull request?
The pr aims to upgrade `scala` from `2.13.13` to `2.13.14`.

### Why are the changes needed?
https://github.com/scala/scala/releases/tag/v2.13.14
<img width="984" alt="image" src="https://github.com/apache/spark/assets/15246973/179274bf-11c0-472c-a6b6-217b9904832d">

### 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 #46288 from panbingkun/SPARK-48049.

Authored-by: panbingkun <panbingkun@baidu.com>
Signed-off-by: Dongjoon Hyun <dhyun@apple.com>
  • Loading branch information
panbingkun authored and dongjoon-hyun committed May 15, 2024
1 parent 973328c commit 12820e1
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 8 deletions.
10 changes: 5 additions & 5 deletions dev/deps/spark-deps-hadoop-3-hive-2.3
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ 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
jna/5.13.0//jna-5.13.0.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
jpam/1.1//jpam-1.1.jar
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
12 changes: 10 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.13</scala.version>
<scala.version>2.13.14</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.8.1</scala-maven-plugin.version>
Expand Down Expand Up @@ -226,7 +226,7 @@
and ./python/packaging/connect/setup.py too.
-->
<arrow.version>16.0.0</arrow.version>
<ammonite.version>3.0.0-M1</ammonite.version>
<ammonite.version>3.0.0-M2</ammonite.version>

<!-- org.fusesource.leveldbjni will be used except on arm64 platform. -->
<leveldbjni.group>org.fusesource.leveldbjni</leveldbjni.group>
Expand Down Expand Up @@ -2980,6 +2980,14 @@
<maxJdkVersion>${java.version}</maxJdkVersion>
<ignoredScopes>test</ignoredScopes>
<ignoredScopes>provided</ignoredScopes>
<ignoreClasses>
<!--
The package `org.jline.terminal.impl.ffm.*` contains some class files
that are not compatible with JDK17 (only JDK21 is supported).
However, it will not cause problems for use. See: https://github.com/scala/bug/issues/12994
-->
<ignoreClass>org.jline.terminal.impl.ffm.*</ignoreClass>
</ignoreClasses>
</enforceBytecodeVersion>
</rules>
</configuration>
Expand Down

0 comments on commit 12820e1

Please sign in to comment.