Skip to content

Commit dba2ca2

Browse files
liu-zhaokunsrowen
authored andcommitted
[SPARK-20759] SCALA_VERSION in _config.yml should be consistent with pom.xml
[https://issues.apache.org/jira/browse/SPARK-20759](https://issues.apache.org/jira/browse/SPARK-20759) SCALA_VERSION in _config.yml is 2.11.7, but 2.11.8 in pom.xml. So I think SCALA_VERSION in _config.yml should be consistent with pom.xml. Author: liuzhaokun <liu.zhaokun@zte.com.cn> Closes #17992 from liu-zhaokun/new.
1 parent f398640 commit dba2ca2

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

LICENSE

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -249,11 +249,11 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
249249
(Interpreter classes (all .scala files in repl/src/main/scala
250250
except for Main.Scala, SparkHelper.scala and ExecutorClassLoader.scala),
251251
and for SerializableMapWrapper in JavaUtils.scala)
252-
(BSD-like) Scala Actors library (org.scala-lang:scala-actors:2.11.7 - http://www.scala-lang.org/)
253-
(BSD-like) Scala Compiler (org.scala-lang:scala-compiler:2.11.7 - http://www.scala-lang.org/)
254-
(BSD-like) Scala Compiler (org.scala-lang:scala-reflect:2.11.7 - http://www.scala-lang.org/)
255-
(BSD-like) Scala Library (org.scala-lang:scala-library:2.11.7 - http://www.scala-lang.org/)
256-
(BSD-like) Scalap (org.scala-lang:scalap:2.11.7 - http://www.scala-lang.org/)
252+
(BSD-like) Scala Actors library (org.scala-lang:scala-actors:2.11.8 - http://www.scala-lang.org/)
253+
(BSD-like) Scala Compiler (org.scala-lang:scala-compiler:2.11.8 - http://www.scala-lang.org/)
254+
(BSD-like) Scala Compiler (org.scala-lang:scala-reflect:2.11.8 - http://www.scala-lang.org/)
255+
(BSD-like) Scala Library (org.scala-lang:scala-library:2.11.8 - http://www.scala-lang.org/)
256+
(BSD-like) Scalap (org.scala-lang:scalap:2.11.8 - http://www.scala-lang.org/)
257257
(BSD-style) scalacheck (org.scalacheck:scalacheck_2.11:1.10.0 - http://www.scalacheck.org)
258258
(BSD-style) spire (org.spire-math:spire_2.11:0.7.1 - http://spire-math.org)
259259
(BSD-style) spire-macros (org.spire-math:spire-macros_2.11:0.7.1 - http://spire-math.org)

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: 2.3.0-SNAPSHOT
1818
SPARK_VERSION_SHORT: 2.3.0
1919
SCALA_BINARY_VERSION: "2.11"
20-
SCALA_VERSION: "2.11.7"
20+
SCALA_VERSION: "2.11.8"
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-7-jre-headless net-tools vim-tiny sudo openssh-server && \
2626
rm -rf /var/lib/apt/lists/*
2727

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

0 commit comments

Comments
 (0)