8000 [SPARK-39414][BUILD] Upgrade Scala to 2.12.16 · a0x8o/spark@e19a413 · GitHub
[go: up one dir, main page]
Skip to content

Commit e19a413

Browse files
a0x8oa0x8o
committed
[SPARK-39414][BUILD] Upgrade Scala to 2.12.16
### What changes were proposed in this pull request? This PR aims to upgrade Scala to 2.12.16 ### Why are the changes needed? This version bring some bug fix and start to try to support Java 19 scala/scala@v2.12.15...v2.12.16 - [Upgrade to asm 9.3, for JDK19 support](scala/scala#10000) - [Fix codegen for MH.invoke etc under JDK 17 -release](scala/scala#9930) - [Deprecation related SecurityManager on JDK 17 ](scala/scala#9775) ### Does this PR introduce _any_ user-facing change? Yes, this is a Scala version change. ### How was this patch tested? Pass Github Actions Closes #36807 from LuciferYang/SPARK-39414. Authored-by: yangjie01 <yangjie01@baidu.com> Signed-off-by: Dongjoon Hyun <dongjoon@apache.org>
1 parent dfe5539 commit e19a413

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.5//py4j-0.10.9.5.jar
237237
remotetea-oncrpc/1.1.2//remotetea-oncrpc-1.1.2.jar
238238
rocksdbjni/7.2.2//rocksdbjni-7.2.2.jar
239239
scala-collection-compat_2.12/2.1.1//scala-collection-compat_2.12-2.1.1.jar
240-
scala-compiler/2.12.15//scala-compiler-2.12.15.jar
241-
scala-library/2.12.15//scala-library-2.12.15.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
242242
scala-parser-combinators_2.12/1.1.2//scala-parser-combinators_2.12-1.1.2.jar
243-
scala-reflect/2.12.15//scala-reflect-2.12.15.jar
243+
scala-reflect/2.12.16//scala-reflect-2.12.16.jar
244244
scala-xml_2.12/1.2.0//scala-xml_2.12-1.2.0.jar
245245
shapeless_2.12/2.3.7//shapeless_2.12-2.3.7.jar
246246
shims/0.9.28//shims-0.9.28.jar

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,10 +226,10 @@ py4j/0.10.9.5//py4j-0.10.9.5.jar
226226
remotetea-oncrpc/1.1.2//remotetea-oncrpc-1.1.2.jar
227227
rocksdbjni/7.2.2//rocksdbjni-7.2.2.jar
228228
scala-collection-compat_2.12/2.1.1//scala-collection-compat_2.12-2.1.1.jar
229-
scala-compiler/2.12.15//scala-compiler-2.12.15.jar
230-
scala-library/2.12.15//scala-library-2.12.15.jar
229+
scala-compiler/2.12.16//scala-compiler-2.12.16.jar
230+
scala-library/2.12.16//scala-library-2.12.16.jar
231231
scala-parser-combinators_2.12/1.1.2//scala-parser-combinators_2.12-1.1.2.jar
232-
scala-reflect/2.12.15//scala-reflect-2.12.15.jar
232+
scala-reflect/2.12.16//scala-reflect-2.12.16.jar
233233
scala-xml_2.12/1.2.0//scala-xml_2.12-1.2.0.jar
234234
shapeless_2.12/2.3.7//shapeless_2.12-2.3.7.jar
235235
shims/0.9.28//shims-0.9.28.jar

‎pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
<!-- managed up from 3.2.1 for SPARK-11652 -->
158158
<commons.collections.version>3.2.2</commons.collections.version>
159159
<commons.collections4.version>4.4</commons.collections4.version>
160-
<scala.version>2.12.15</scala.version>
160+
<scala.version>2.12.16</scala.version>
161161
<scala.binary.version>2.12</scala.binary.version>
162162
<scalatest-maven-plugin.version>2.0.2</scalatest-maven-plugin.version>
163163
<!--
@@ -2908,7 +2908,7 @@
29082908
<compilerPlugin>
29092909
<groupId>com.github.ghik</groupId>
29102910
<artifactId>silencer-plugin_${scala.version}</artifactId>
2911-
<version>1.7.6</version>
2911+
<version>1.7.9</version>
29122912
</compilerPlugin>
29132913
</compilerPlugins>
29142914
</configuration>
@@ -3573,7 +3573,7 @@
35733573
SPARK-34774 Add this property to ensure change-scala-version.sh can replace the public `scala.version`
35743574
property correctly.
35753575
-->
3576-
<scala.version>2.12.15</scala.version>
3576+
<scala.version>2.12.16</scala.version>
35773577
</properties>
35783578
<build>
35793579
<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.7 and compiler settings to enable fatal warnings
206+
// <2.13.2 - silencer 1.7.9 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.7"
211+
val silencerVersion = "1.7.9"
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)
0