Skip to content

Commit f340b1b

Browse files
committed
[SPARK-40436][BUILD] Upgrade Scala to 2.12.17
### What changes were proposed in this pull request? This PR aims to upgrade Scala to 2.12.17 - https://www.scala-lang.org/news/2.12.17 ### Why are the changes needed? The main [change](https://github.com/scala/scala/pulls?q=is%3Apr+sort%3Aupdated-desc+milestone%3A2.12.17+is%3Amerged+label%3Arelease-notes) fo this version as follows: - scala/scala#10109 - scala/scala#10075 - scala/scala#10108 - scala/scala#10045 - scala/scala#10063 - scala/scala#10042 - scala/scala#10040 - scala/scala#10095 ### Does this PR introduce _any_ user-facing change? Yes, this is a Scala version change. ### How was this patch tested? Existing Test Closes apache#37892 from LuciferYang/SPARK-40436. Authored-by: yangjie01 <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]>
1 parent 922777e commit f340b1b

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,10 +237,10 @@ py4j/0.10.9.7//py4j-0.10.9.7.jar
237237
remotetea-oncrpc/1.1.2//remotetea-oncrpc-1.1.2.jar
238238
rocksdbjni/7.5.3//rocksdbjni-7.5.3.jar
239239
scala-collection-compat_2.12/2.7.0//scala-collection-compat_2.12-2.7.0.jar
240-
scala-compiler/2.12.16//scala-compiler-2.12.16.jar
241-
scala-library/2.12.16//scala-library-2.12.16.jar
240+
scala-compiler/2.12.17//scala-compiler-2.12.17.jar
241+
scala-library/2.12.17//scala-library-2.12.17.jar
242242
scala-parser-combinators_2.12/1.1.2//scala-parser-combinators_2.12-1.1.2.jar
243-
scala-reflect/2.12.16//scala-reflect-2.12.16.jar
243+
scala-reflect/2.12.17//scala-reflect-2.12.17.jar
244244
scala-xml_2.12/2.1.0//scala-xml_2.12-2.1.0.jar
245245
shims/0.9.32//shims-0.9.32.jar
246246
slf4j-api/1.7.36//slf4j-api-1.7.36.jar

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,10 +224,10 @@ py4j/0.10.9.7//py4j-0.10.9.7.jar
224224
remotetea-oncrpc/1.1.2//remotetea-oncrpc-1.1.2.jar
225225
rocksdbjni/7.5.3//rocksdbjni-7.5.3.jar
226226
scala-collection-compat_2.12/2.7.0//scala-collection-compat_2.12-2.7.0.jar
227-
scala-compiler/2.12.16//scala-compiler-2.12.16.jar
228-
scala-library/2.12.16//scala-library-2.12.16.jar
227+
scala-compiler/2.12.17//scala-compiler-2.12.17.jar
228+
scala-library/2.12.17//scala-library-2.12.17.jar
229229
scala-parser-combinators_2.12/1.1.2//scala-parser-combinators_2.12-1.1.2.jar
230-
scala-reflect/2.12.16//scala-reflect-2.12.16.jar
230+
scala-reflect/2.12.17//scala-reflect-2.12.17.jar
231231
scala-xml_2.12/2.1.0//scala-xml_2.12-2.1.0.jar
232232
shims/0.9.32//shims-0.9.32.jar
233233
slf4j-api/1.7.36//slf4j-api-1.7.36.jar

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
<!-- managed up from 3.2.1 for SPARK-11652 -->
160160
<commons.collections.version>3.2.2</commons.collections.version>
161161
<commons.collections4.version>4.4</commons.collections4.version>
162-
<scala.version>2.12.16</scala.version>
162+
<scala.version>2.12.17</scala.version>
163163
<scala.binary.version>2.12</scala.binary.version>
164164
<scalatest-maven-plugin.version>2.1.0</scalatest-maven-plugin.version>
165165
<!--
@@ -2922,7 +2922,7 @@
29222922
<compilerPlugin>
29232923
<groupId>com.github.ghik</groupId>
29242924
<artifactId>silencer-plugin_${scala.version}</artifactId>
2925-
<version>1.7.9</version>
2925+
<version>1.7.10</version>
29262926
</compilerPlugin>
29272927
</compilerPlugins>
29282928
</configuration>
@@ -3588,7 +3588,7 @@
35883588
SPARK-34774 Add this property to ensure change-scala-version.sh can replace the public `scala.version`
35893589
property correctly.
35903590
-->
3591-
<scala.version>2.12.16</scala.version>
3591+
<scala.version>2.12.17</scala.version>
35923592
</properties>
35933593
<build>
35943594
<pluginManagement>

project/SparkBuild.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,12 +203,12 @@ object SparkBuild extends PomBuild {
203203
// Silencer: Scala compiler plugin for warning suppression
204204
// Aim: enable fatal warnings, but suppress ones related to using of deprecated APIs
205205
// depends on scala version:
206-
// <2.13.2 - silencer 1.7.9 and compiler settings to enable fatal warnings
206+
// <2.13.2 - silencer 1.7.10 and compiler settings to enable fatal warnings
207207
// 2.13.2+ - no silencer and configured warnings to achieve the same
208208
lazy val compilerWarningSettings: Seq[sbt.Def.Setting[_]] = Seq(
209209
libraryDependencies ++= {
210210
if (VersionNumber(scalaVersion.value).matchesSemVer(SemanticSelector("<2.13.2"))) {
211-
val silencerVersion = "1.7.9"
211+
val silencerVersion = "1.7.10"
212212
Seq(
213213
"org.scala-lang.modules" %% "scala-collection-compat" % "2.2.0",
214214
compilerPlugin("com.github.ghik" % "silencer-plugin" % silencerVersion cross CrossVersion.full),

0 commit comments

Comments
 (0)