diff --git a/LICENSE b/LICENSE
index 66a2e8f13295..468ed9ffe450 100644
--- a/LICENSE
+++ b/LICENSE
@@ -249,11 +249,11 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
(Interpreter classes (all .scala files in repl/src/main/scala
except for Main.Scala, SparkHelper.scala and ExecutorClassLoader.scala),
and for SerializableMapWrapper in JavaUtils.scala)
- (BSD-like) Scala Actors library (org.scala-lang:scala-actors:2.11.8 - http://www.scala-lang.org/)
- (BSD-like) Scala Compiler (org.scala-lang:scala-compiler:2.11.8 - http://www.scala-lang.org/)
- (BSD-like) Scala Compiler (org.scala-lang:scala-reflect:2.11.8 - http://www.scala-lang.org/)
- (BSD-like) Scala Library (org.scala-lang:scala-library:2.11.8 - http://www.scala-lang.org/)
- (BSD-like) Scalap (org.scala-lang:scalap:2.11.8 - http://www.scala-lang.org/)
+ (BSD-like) Scala Actors library (org.scala-lang:scala-actors:2.11.11 - http://www.scala-lang.org/)
+ (BSD-like) Scala Compiler (org.scala-lang:scala-compiler:2.11.11 - http://www.scala-lang.org/)
+ (BSD-like) Scala Compiler (org.scala-lang:scala-reflect:2.11.11 - http://www.scala-lang.org/)
+ (BSD-like) Scala Library (org.scala-lang:scala-library:2.11.11 - http://www.scala-lang.org/)
+ (BSD-like) Scalap (org.scala-lang:scalap:2.11.11 - http://www.scala-lang.org/)
(BSD-style) scalacheck (org.scalacheck:scalacheck_2.11:1.10.0 - http://www.scalacheck.org)
(BSD-style) spire (org.spire-math:spire_2.11:0.7.1 - http://spire-math.org)
(BSD-style) spire-macros (org.spire-math:spire-macros_2.11:0.7.1 - http://spire-math.org)
diff --git a/build/mvn b/build/mvn
index 1e393c331dd8..efa4f9364ea5 100755
--- a/build/mvn
+++ b/build/mvn
@@ -91,13 +91,13 @@ install_mvn() {
# Install zinc under the build/ folder
install_zinc() {
- local zinc_path="zinc-0.3.11/bin/zinc"
+ local zinc_path="zinc-0.3.15/bin/zinc"
[ ! -f "${_DIR}/${zinc_path}" ] && ZINC_INSTALL_FLAG=1
local TYPESAFE_MIRROR=${TYPESAFE_MIRROR:-https://downloads.typesafe.com}
install_app \
- "${TYPESAFE_MIRROR}/zinc/0.3.11" \
- "zinc-0.3.11.tgz" \
+ "${TYPESAFE_MIRROR}/zinc/0.3.15" \
+ "zinc-0.3.15.tgz" \
"${zinc_path}"
ZINC_BIN="${_DIR}/${zinc_path}"
}
diff --git a/dev/deps/spark-deps-hadoop-2.6 b/dev/deps/spark-deps-hadoop-2.6
index 9287bd47cf11..9b2d06e4680e 100644
--- a/dev/deps/spark-deps-hadoop-2.6
+++ b/dev/deps/spark-deps-hadoop-2.6
@@ -158,12 +158,12 @@ pmml-schema-1.2.15.jar
protobuf-java-2.5.0.jar
py4j-0.10.4.jar
pyrolite-4.13.jar
-scala-compiler-2.11.8.jar
-scala-library-2.11.8.jar
+scala-compiler-2.11.11.jar
+scala-library-2.11.11.jar
scala-parser-combinators_2.11-1.0.4.jar
-scala-reflect-2.11.8.jar
+scala-reflect-2.11.11.jar
scala-xml_2.11-1.0.2.jar
-scalap-2.11.8.jar
+scalap-2.11.11.jar
shapeless_2.11-2.3.2.jar
slf4j-api-1.7.16.jar
slf4j-log4j12-1.7.16.jar
diff --git a/dev/deps/spark-deps-hadoop-2.7 b/dev/deps/spark-deps-hadoop-2.7
index ab1de3d3dd8a..b963af0f6a53 100644
--- a/dev/deps/spark-deps-hadoop-2.7
+++ b/dev/deps/spark-deps-hadoop-2.7
@@ -159,12 +159,12 @@ pmml-schema-1.2.15.jar
protobuf-java-2.5.0.jar
py4j-0.10.4.jar
pyrolite-4.13.jar
-scala-compiler-2.11.8.jar
-scala-library-2.11.8.jar
+scala-compiler-2.11.11.jar
+scala-library-2.11.11.jar
scala-parser-combinators_2.11-1.0.4.jar
-scala-reflect-2.11.8.jar
+scala-reflect-2.11.11.jar
scala-xml_2.11-1.0.2.jar
-scalap-2.11.8.jar
+scalap-2.11.11.jar
shapeless_2.11-2.3.2.jar
slf4j-api-1.7.16.jar
slf4j-log4j12-1.7.16.jar
diff --git a/docs/_config.yml b/docs/_config.yml
index dcc211204d76..8239f00a936f 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -17,7 +17,7 @@ include:
SPARK_VERSION: 2.3.0-SNAPSHOT
SPARK_VERSION_SHORT: 2.3.0
SCALA_BINARY_VERSION: "2.11"
-SCALA_VERSION: "2.11.8"
+SCALA_VERSION: "2.11.11"
MESOS_VERSION: 1.0.0
SPARK_ISSUE_TRACKER_URL: https://issues.apache.org/jira/browse/SPARK
SPARK_GITHUB_URL: https://github.com/apache/spark
diff --git a/external/docker/spark-test/base/Dockerfile b/external/docker/spark-test/base/Dockerfile
index 5a95a9387c31..ece0ae7aa0bb 100644
--- a/external/docker/spark-test/base/Dockerfile
+++ b/external/docker/spark-test/base/Dockerfile
@@ -25,7 +25,7 @@ RUN apt-get update && \
apt-get install -y less openjdk-7-jre-headless net-tools vim-tiny sudo openssh-server && \
rm -rf /var/lib/apt/lists/*
-ENV SCALA_VERSION 2.11.8
+ENV SCALA_VERSION 2.11.11
ENV CDH_VERSION cdh4
ENV SCALA_HOME /opt/scala-$SCALA_VERSION
ENV SPARK_HOME /opt/spark
diff --git a/pom.xml b/pom.xml
index 0533a8dcf2e0..b2a00afee93a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,7 +154,7 @@
3.4.1
3.2.2
- 2.11.8
+ 2.11.11
2.11
1.9.13
2.6.5
@@ -2607,7 +2607,7 @@
!scala-2.10
- 2.11.8
+ 2.11.11
2.11
2.12.1
jline
diff --git a/repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkILoop.scala b/repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkILoop.scala
index d1d25b7bf041..3ab3e11613c9 100644
--- a/repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkILoop.scala
+++ b/repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkILoop.scala
@@ -90,13 +90,15 @@ class SparkILoop(in0: Option[BufferedReader], out: JPrintWriter)
override def commands: List[LoopCommand] = standardCommands
/**
- * We override `loadFiles` because we need to initialize Spark *before* the REPL
+ * We override `createInterpreter` because we need to initialize Spark *before* the REPL
* sees any files, so that the Spark context is visible in those files. This is a bit of a
- * hack, but there isn't another hook available to us at this point.
+ * hack, but there isn't another hook available to us at this point -- at least,
+ * not one that works across versions of Scala 2.11.
+ * TODO: use `loopPostInit()`, probably, in Scala 2.12+ or when 2.11.8 support is dropped.
*/
- override def loadFiles(settings: Settings): Unit = {
+ override def createInterpreter(): Unit = {
+ super.createInterpreter()
initializeSpark()
- super.loadFiles(settings)
}
override def resetCommand(line: String): Unit = {