Skip to content

Commit aedd9fc

Browse files
dongjoon-hyunLuciferYang
authored andcommitted
[SPARK-50807][BUILD] Upgrade Scala to 2.13.16
### What changes were proposed in this pull request? This PR aims to Upgrade Scala to 2.13.16. For now, this is a draft because the following plugins are not ready. So, we are using this PR to track the readiness. - [x] lightbend/genjavadoc#375 - [x] com-lihaoyi/Ammonite#1597 - scala/scala#10868 (comment) ### Why are the changes needed? To deliver the latest Scala 2.13.x version to Apache Spark 4.0.0. - https://github.com/scala/scala/releases/tag/v2.13.16 ### Does this PR introduce _any_ user-facing change? No because Apache Spark 4 is not released yet. ### How was this patch tested? Pass the CIs. ### Was this patch authored or co-authored using generative AI tooling? No. Closes #49478 from dongjoon-hyun/SPARK-50807. Authored-by: Dongjoon Hyun <[email protected]> Signed-off-by: yangjie01 <[email protected]> (cherry picked from commit 585f434) Signed-off-by: yangjie01 <[email protected]>
1 parent 1c5994e commit aedd9fc

File tree

4 files changed

+8
-18
lines changed

4 files changed

+8
-18
lines changed

LICENSE-binary

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,6 @@ jakarta.inject:jakarta.inject-api
296296
jakarta.validation:jakarta.validation-api
297297
javax.jdo:jdo-api
298298
joda-time:joda-time
299-
net.java.dev.jna:jna
300299
net.sf.opencsv:opencsv
301300
net.sf.supercsv:super-csv
302301
net.sf.jpam:jpam

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ jakarta.validation-api/3.0.2//jakarta.validation-api-3.0.2.jar
120120
jakarta.ws.rs-api/3.0.0//jakarta.ws.rs-api-3.0.0.jar
121121
jakarta.xml.bind-api/2.3.2//jakarta.xml.bind-api-2.3.2.jar
122122
janino/3.1.9//janino-3.1.9.jar
123-
java-diff-utils/4.12//java-diff-utils-4.12.jar
123+
java-diff-utils/4.15//java-diff-utils-4.15.jar
124124
java-xmlbuilder/1.2//java-xmlbuilder-1.2.jar
125125
javassist/3.30.2-GA//javassist-3.30.2-GA.jar
126126
javax.jdo/3.2.0-m3//javax.jdo-3.2.0-m3.jar
@@ -144,8 +144,7 @@ jjwt-api/0.12.6//jjwt-api-0.12.6.jar
144144
jjwt-impl/0.12.6//jjwt-impl-0.12.6.jar
145145
jjwt-jackson/0.12.6//jjwt-jackson-0.12.6.jar
146146
jline/2.14.6//jline-2.14.6.jar
147-
jline/3.26.3//jline-3.26.3.jar
148-
jna/5.14.0//jna-5.14.0.jar
147+
jline/3.27.1/jdk8/jline-3.27.1-jdk8.jar
149148
joda-time/2.13.0//joda-time-2.13.0.jar
150149
jodd-core/3.5.2//jodd-core-3.5.2.jar
151150
jpam/1.1//jpam-1.1.jar
@@ -253,11 +252,11 @@ py4j/0.10.9.9//py4j-0.10.9.9.jar
253252
remotetea-oncrpc/1.1.2//remotetea-oncrpc-1.1.2.jar
254253
rocksdbjni/9.8.4//rocksdbjni-9.8.4.jar
255254
scala-collection-compat_2.13/2.7.0//scala-collection-compat_2.13-2.7.0.jar
256-
scala-compiler/2.13.15//scala-compiler-2.13.15.jar
257-
scala-library/2.13.15//scala-library-2.13.15.jar
255+
scala-compiler/2.13.16//scala-compiler-2.13.16.jar
256+
scala-library/2.13.16//scala-library-2.13.16.jar
258257
scala-parallel-collections_2.13/1.2.0//scala-parallel-collections_2.13-1.2.0.jar
259258
scala-parser-combinators_2.13/2.4.0//scala-parser-combinators_2.13-2.4.0.jar
260-
scala-reflect/2.13.15//scala-reflect-2.13.15.jar
259+
scala-reflect/2.13.16//scala-reflect-2.13.16.jar
261260
scala-xml_2.13/2.3.0//scala-xml_2.13-2.3.0.jar
262261
slf4j-api/2.0.16//slf4j-api-2.0.16.jar
263262
snakeyaml-engine/2.8//snakeyaml-engine-2.8.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.15"
25+
SCALA_VERSION: "2.13.16"
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: 2 additions & 10 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.15</scala.version>
172+
<scala.version>2.13.16</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.2</scala-maven-plugin.version>
@@ -230,7 +230,7 @@
230230
and ./python/packaging/connect/setup.py too.
231231
-->
232232
<arrow.version>18.1.0</arrow.version>
233-
<ammonite.version>3.0.0</ammonite.version>
233+
<ammonite.version>3.0.1</ammonite.version>
234234
<jjwt.version>0.12.6</jjwt.version>
235235

236236
<!-- org.fusesource.leveldbjni will be used except on arm64 platform. -->
@@ -2657,14 +2657,6 @@
26572657
<maxJdkVersion>${java.version}</maxJdkVersion>
26582658
<ignoredScopes>test</ignoredScopes>
26592659
<ignoredScopes>provided</ignoredScopes>
2660-
<ignoreClasses>
2661-
<!--
2662-
The package `org.jline.terminal.impl.ffm.*` contains some class files
2663-
that are not compatible with JDK17 (only JDK21 is supported).
2664-
However, it will not cause problems for use. See: https://github.com/scala/bug/issues/12994
2665-
-->
2666-
<ignoreClass>org.jline.terminal.impl.ffm.*</ignoreClass>
2667-
</ignoreClasses>
26682660
</enforceBytecodeVersion>
26692661
</rules>
26702662
</configuration>

0 commit comments

Comments
 (0)