Skip to content

Commit 3ac4a48

Browse files
vrozovdongjoon-hyun
authored andcommitted
[SPARK-53585][BUILD] Upgrade Scala to 2.13.17
### What changes were proposed in this pull request? Upgrade to scala 2.13.17 ### Why are the changes needed? To bring the latest bug fixes and improvements like JDK 25 support. Note that Scala community announces two breaking changes due to the bug fixes. > Breaking changes > - Mix in the productPrefix hash statically in case class hashCode > - Improve scala.util.Using suppression order - https://github.com/scala/scala/releases/tag/v2.13.17 - scala/scala#11046 - scala/scala#10937 - scala/scala#10927 - scala/bug#13058 - scala/scala#11023 - scala/bug#13033 - scala/scala#11000 ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? local and github builds ### Was this patch authored or co-authored using generative AI tooling? No Closes #52509 from vrozov/SPARK-53585. Authored-by: Vlad Rozov <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]>
1 parent 00d2a54 commit 3ac4a48

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ jakarta.validation-api/3.0.2//jakarta.validation-api-3.0.2.jar
118118
jakarta.ws.rs-api/3.0.0//jakarta.ws.rs-api-3.0.0.jar
119119
jakarta.xml.bind-api/4.0.2//jakarta.xml.bind-api-4.0.2.jar
120120
janino/3.1.9//janino-3.1.9.jar
121-
java-diff-utils/4.15//java-diff-utils-4.15.jar
121+
java-diff-utils/4.16//java-diff-utils-4.16.jar
122122
java-xmlbuilder/1.2//java-xmlbuilder-1.2.jar
123123
javassist/3.30.2-GA//javassist-3.30.2-GA.jar
124124
javax.jdo/3.2.0-m3//javax.jdo-3.2.0-m3.jar
@@ -142,7 +142,7 @@ jjwt-api/0.12.6//jjwt-api-0.12.6.jar
142142
jjwt-impl/0.12.6//jjwt-impl-0.12.6.jar
143143
jjwt-jackson/0.12.6//jjwt-jackson-0.12.6.jar
144144
jline/2.14.6//jline-2.14.6.jar
145-
jline/3.27.1/jdk8/jline-3.27.1-jdk8.jar
145+
jline/3.29.0/jdk8/jline-3.29.0-jdk8.jar
146146
joda-time/2.14.0//joda-time-2.14.0.jar
147147
jpam/1.1//jpam-1.1.jar
148148
json/1.8//json-1.8.jar
@@ -264,11 +264,11 @@ pickle/1.5//pickle-1.5.jar
264264
py4j/0.10.9.9//py4j-0.10.9.9.jar
265265
remotetea-oncrpc/1.1.2//remotetea-oncrpc-1.1.2.jar
266266
rocksdbjni/9.8.4//rocksdbjni-9.8.4.jar
267-
scala-compiler/2.13.16//scala-compiler-2.13.16.jar
268-
scala-library/2.13.16//scala-library-2.13.16.jar
267+
scala-compiler/2.13.17//scala-compiler-2.13.17.jar
268+
scala-library/2.13.17//scala-library-2.13.17.jar
269269
scala-parallel-collections_2.13/1.2.0//scala-parallel-collections_2.13-1.2.0.jar
270270
scala-parser-combinators_2.13/2.4.0//scala-parser-combinators_2.13-2.4.0.jar
271-
scala-reflect/2.13.16//scala-reflect-2.13.16.jar
271+
scala-reflect/2.13.17//scala-reflect-2.13.17.jar
272272
scala-xml_2.13/2.3.0//scala-xml_2.13-2.3.0.jar
273273
slf4j-api/2.0.17//slf4j-api-2.0.17.jar
274274
snakeyaml-engine/2.10//snakeyaml-engine-2.10.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.1.0-SNAPSHOT
2323
SPARK_VERSION_SHORT: 4.1.0
2424
SCALA_BINARY_VERSION: "2.13"
25-
SCALA_VERSION: "2.13.16"
25+
SCALA_VERSION: "2.13.17"
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@
174174
<!-- managed up from 3.2.1 for SPARK-11652 -->
175175
<commons.collections.version>3.2.2</commons.collections.version>
176176
<commons.collections4.version>4.5.0</commons.collections4.version>
177-
<scala.version>2.13.16</scala.version>
177+
<scala.version>2.13.17</scala.version>
178178
<scala.binary.version>2.13</scala.binary.version>
179179
<scalatest-maven-plugin.version>2.2.0</scalatest-maven-plugin.version>
180180
<scala-maven-plugin.version>4.9.5</scala-maven-plugin.version>

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/trees/TreeNode.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ abstract class TreeNode[BaseType <: TreeNode[BaseType]]
223223
children.map(_.height).reduceOption(_ max _).getOrElse(0) + 1)
224224
def height: Int = _height()
225225

226-
private val _hashCode = new BestEffortLazyVal[Integer](() => MurmurHash3.productHash(this))
226+
private val _hashCode = new BestEffortLazyVal[Integer](() => MurmurHash3.caseClassHash(this))
227227
override def hashCode(): Int = _hashCode()
228228

229229
/**

0 commit comments

Comments
 (0)