Skip to content

Commit 8c3f27c

Browse files
wangyumdongjoon-hyun
authored andcommitted
[SPARK-28683][BUILD] Upgrade Scala to 2.12.10
## What changes were proposed in this pull request? This PR upgrade Scala to **2.12.10**. Release notes: - Fix regression in large string interpolations with non-String typed splices - Revert "Generate shallower ASTs in pattern translation" - Fix regression in classpath when JARs have 'a.b' entries beside 'a/b' - Faster compiler: 5–10% faster since 2.12.8 - Improved compatibility with JDK 11, 12, and 13 - Experimental support for build pipelining and outline type checking More details: https://github.com/scala/scala/releases/tag/v2.12.10 https://github.com/scala/scala/releases/tag/v2.12.9 ## How was this patch tested? Existing tests Closes #25404 from wangyum/SPARK-28683. Authored-by: Yuming Wang <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]>
1 parent f32f16f commit 8c3f27c

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

dev/deps/spark-deps-hadoop-2.7

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,10 @@ parquet-jackson-1.10.1.jar
172172
protobuf-java-2.5.0.jar
173173
py4j-0.10.8.1.jar
174174
pyrolite-4.30.jar
175-
scala-compiler-2.12.8.jar
176-
scala-library-2.12.8.jar
175+
scala-compiler-2.12.10.jar
176+
scala-library-2.12.10.jar
177177
scala-parser-combinators_2.12-1.1.0.jar
178-
scala-reflect-2.12.8.jar
178+
scala-reflect-2.12.10.jar
179179
scala-xml_2.12-1.2.0.jar
180180
shapeless_2.12-2.3.2.jar
181181
shims-0.7.45.jar

dev/deps/spark-deps-hadoop-3.2

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,10 @@ protobuf-java-2.5.0.jar
191191
py4j-0.10.8.1.jar
192192
pyrolite-4.30.jar
193193
re2j-1.1.jar
194-
scala-compiler-2.12.8.jar
195-
scala-library-2.12.8.jar
194+
scala-compiler-2.12.10.jar
195+
scala-library-2.12.10.jar
196196
scala-parser-combinators_2.12-1.1.0.jar
197-
scala-reflect-2.12.8.jar
197+
scala-reflect-2.12.10.jar
198198
scala-xml_2.12-1.2.0.jar
199199
shapeless_2.12-2.3.2.jar
200200
shims-0.7.45.jar

docs/_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ include:
1717
SPARK_VERSION: 3.0.0-SNAPSHOT
1818
SPARK_VERSION_SHORT: 3.0.0
1919
SCALA_BINARY_VERSION: "2.12"
20-
SCALA_VERSION: "2.12.8"
20+
SCALA_VERSION: "2.12.10"
2121
MESOS_VERSION: 1.0.0
2222
SPARK_ISSUE_TRACKER_URL: https://issues.apache.org/jira/browse/SPARK
2323
SPARK_GITHUB_URL: https://github.com/apache/spark

external/docker/spark-test/base/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ RUN apt-get update && \
2525
apt-get install -y less openjdk-8-jre-headless iproute2 vim-tiny sudo openssh-server && \
2626
rm -rf /var/lib/apt/lists/*
2727

28-
ENV SCALA_VERSION 2.12.8
28+
ENV SCALA_VERSION 2.12.10
2929
ENV CDH_VERSION cdh4
3030
ENV SCALA_HOME /opt/scala-$SCALA_VERSION
3131
ENV SPARK_HOME /opt/spark

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
<commons.math3.version>3.4.1</commons.math3.version>
165165
<!-- managed up from 3.2.1 for SPARK-11652 -->
166166
<commons.collections.version>3.2.2</commons.collections.version>
167-
<scala.version>2.12.8</scala.version>
167+
<scala.version>2.12.10</scala.version>
168168
<scala.binary.version>2.12</scala.binary.version>
169169
<scalafmt.parameters>--diff --test</scalafmt.parameters>
170170
<!-- for now, not running scalafmt as part of default verify pipeline -->

project/SparkBuild.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ object SparkBuild extends PomBuild {
223223
.map(file),
224224
incOptions := incOptions.value.withNameHashing(true),
225225
publishMavenStyle := true,
226-
unidocGenjavadocVersion := "0.13",
226+
unidocGenjavadocVersion := "0.14",
227227

228228
// Override SBT's default resolvers:
229229
resolvers := Seq(

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/ScalaReflection.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ object ScalaReflection extends ScalaReflection {
7272
/**
7373
* Synchronize to prevent concurrent usage of `<:<` operator.
7474
* This operator is not thread safe in any current version of scala; i.e.
75-
* (2.11.12, 2.12.8, 2.13.0-M5).
75+
* (2.11.12, 2.12.10, 2.13.0-M5).
7676
*
7777
* See https://github.com/scala/bug/issues/10766
7878
*/

0 commit comments

Comments
 (0)