Skip to content

Commit ce5e6a2

Browse files
JoshRosenrxin
authored andcommitted
[SPARK-11491] Update build to use Scala 2.10.5
Spark should build against Scala 2.10.5, since that includes a fix for Scaladoc that will fix doc snapshot publishing: https://issues.scala-lang.org/browse/SI-8479 Author: Josh Rosen <[email protected]> Closes #9450 from JoshRosen/upgrade-to-scala-2.10.5.
1 parent b6e0a5a commit ce5e6a2

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

LICENSE

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

dev/audit-release/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ run them locally by setting appropriate environment variables.
44

55
```
66
$ cd sbt_app_core
7-
$ SCALA_VERSION=2.10.4 \
7+
$ SCALA_VERSION=2.10.5 \
88
SPARK_VERSION=1.0.0-SNAPSHOT \
99
SPARK_RELEASE_REPOSITORY=file:///home/patrick/.ivy2/local \
1010
sbt run

dev/audit-release/audit_release.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
RELEASE_KEY = "XXXXXXXX" # Your 8-digit hex
3636
RELEASE_REPOSITORY = "https://repository.apache.org/content/repositories/orgapachespark-1033"
3737
RELEASE_VERSION = "1.1.1"
38-
SCALA_VERSION = "2.10.4"
38+
SCALA_VERSION = "2.10.5"
3939
SCALA_BINARY_VERSION = "2.10"
4040

4141
# Do not set these

docker/spark-test/base/Dockerfile

+1-1
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.10.4
28+
ENV SCALA_VERSION 2.10.5
2929
ENV CDH_VERSION cdh4
3030
ENV SCALA_HOME /opt/scala-$SCALA_VERSION
3131
ENV SPARK_HOME /opt/spark

docs/_config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ include:
1717
SPARK_VERSION: 1.6.0-SNAPSHOT
1818
SPARK_VERSION_SHORT: 1.6.0
1919
SCALA_BINARY_VERSION: "2.10"
20-
SCALA_VERSION: "2.10.4"
20+
SCALA_VERSION: "2.10.5"
2121
MESOS_VERSION: 0.21.0
2222
SPARK_ISSUE_TRACKER_URL: https://issues.apache.org/jira/browse/SPARK
2323
SPARK_GITHUB_URL: https://github.com/apache/spark

pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
<!-- commons-httpclient/commons-httpclient-->
160160
<httpclient.classic.version>3.1</httpclient.classic.version>
161161
<commons.math3.version>3.4.1</commons.math3.version>
162-
<scala.version>2.10.4</scala.version>
162+
<scala.version>2.10.5</scala.version>
163163
<scala.binary.version>2.10</scala.binary.version>
164164
<jline.version>${scala.version}</jline.version>
165165
<jline.groupid>org.scala-lang</jline.groupid>
@@ -2422,7 +2422,7 @@
24222422
<property><name>!scala-2.11</name></property>
24232423
</activation>
24242424
<properties>
2425-
<scala.version>2.10.4</scala.version>
2425+
<scala.version>2.10.5</scala.version>
24262426
<scala.binary.version>2.10</scala.binary.version>
24272427
<jline.version>${scala.version}</jline.version>
24282428
<jline.groupid>org.scala-lang</jline.groupid>

project/SparkBuild.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ object OldDeps {
316316

317317
def oldDepsSettings() = Defaults.coreDefaultSettings ++ Seq(
318318
name := "old-deps",
319-
scalaVersion := "2.10.4",
319+
scalaVersion := "2.10.5",
320320
retrieveManaged := true,
321321
retrievePattern := "[type]s/[artifact](-[revision])(-[classifier]).[ext]",
322322
libraryDependencies := Seq("spark-streaming-mqtt", "spark-streaming-zeromq",

0 commit comments

Comments
 (0)