Skip to content
Snippets Groups Projects
Commit ce5e6a28 authored by Josh Rosen's avatar Josh Rosen Committed by Reynold Xin
Browse files

[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 <joshrosen@databricks.com>

Closes #9450 from JoshRosen/upgrade-to-scala-2.10.5.
parent b6e0a5ae
No related branches found
No related tags found
No related merge requests found
...@@ -250,11 +250,11 @@ The text of each license is also included at licenses/LICENSE-[project].txt. ...@@ -250,11 +250,11 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
(Interpreter classes (all .scala files in repl/src/main/scala (Interpreter classes (all .scala files in repl/src/main/scala
except for Main.Scala, SparkHelper.scala and ExecutorClassLoader.scala), except for Main.Scala, SparkHelper.scala and ExecutorClassLoader.scala),
and for SerializableMapWrapper in JavaUtils.scala) and for SerializableMapWrapper in JavaUtils.scala)
(BSD-like) Scala Actors library (org.scala-lang:scala-actors:2.10.4 - http://www.scala-lang.org/) (BSD-like) Scala Actors library (org.scala-lang:scala-actors:2.10.5 - http://www.scala-lang.org/)
(BSD-like) Scala Compiler (org.scala-lang:scala-compiler:2.10.4 - http://www.scala-lang.org/) (BSD-like) Scala Compiler (org.scala-lang:scala-compiler:2.10.5 - http://www.scala-lang.org/)
(BSD-like) Scala Compiler (org.scala-lang:scala-reflect:2.10.4 - http://www.scala-lang.org/) (BSD-like) Scala Compiler (org.scala-lang:scala-reflect:2.10.5 - http://www.scala-lang.org/)
(BSD-like) Scala Library (org.scala-lang:scala-library:2.10.4 - http://www.scala-lang.org/) (BSD-like) Scala Library (org.scala-lang:scala-library:2.10.5 - http://www.scala-lang.org/)
(BSD-like) Scalap (org.scala-lang:scalap:2.10.4 - http://www.scala-lang.org/) (BSD-like) Scalap (org.scala-lang:scalap:2.10.5 - http://www.scala-lang.org/)
(BSD-style) scalacheck (org.scalacheck:scalacheck_2.10:1.10.0 - http://www.scalacheck.org) (BSD-style) scalacheck (org.scalacheck:scalacheck_2.10:1.10.0 - http://www.scalacheck.org)
(BSD-style) spire (org.spire-math:spire_2.10:0.7.1 - http://spire-math.org) (BSD-style) spire (org.spire-math:spire_2.10:0.7.1 - http://spire-math.org)
(BSD-style) spire-macros (org.spire-math:spire-macros_2.10:0.7.1 - http://spire-math.org) (BSD-style) spire-macros (org.spire-math:spire-macros_2.10:0.7.1 - http://spire-math.org)
......
...@@ -4,7 +4,7 @@ run them locally by setting appropriate environment variables. ...@@ -4,7 +4,7 @@ run them locally by setting appropriate environment variables.
``` ```
$ cd sbt_app_core $ cd sbt_app_core
$ SCALA_VERSION=2.10.4 \ $ SCALA_VERSION=2.10.5 \
SPARK_VERSION=1.0.0-SNAPSHOT \ SPARK_VERSION=1.0.0-SNAPSHOT \
SPARK_RELEASE_REPOSITORY=file:///home/patrick/.ivy2/local \ SPARK_RELEASE_REPOSITORY=file:///home/patrick/.ivy2/local \
sbt run sbt run
......
...@@ -35,7 +35,7 @@ RELEASE_URL = "http://people.apache.org/~andrewor14/spark-1.1.1-rc1/" ...@@ -35,7 +35,7 @@ RELEASE_URL = "http://people.apache.org/~andrewor14/spark-1.1.1-rc1/"
RELEASE_KEY = "XXXXXXXX" # Your 8-digit hex RELEASE_KEY = "XXXXXXXX" # Your 8-digit hex
RELEASE_REPOSITORY = "https://repository.apache.org/content/repositories/orgapachespark-1033" RELEASE_REPOSITORY = "https://repository.apache.org/content/repositories/orgapachespark-1033"
RELEASE_VERSION = "1.1.1" RELEASE_VERSION = "1.1.1"
SCALA_VERSION = "2.10.4" SCALA_VERSION = "2.10.5"
SCALA_BINARY_VERSION = "2.10" SCALA_BINARY_VERSION = "2.10"
# Do not set these # Do not set these
......
...@@ -25,7 +25,7 @@ RUN apt-get update && \ ...@@ -25,7 +25,7 @@ RUN apt-get update && \
apt-get install -y less openjdk-7-jre-headless net-tools vim-tiny sudo openssh-server && \ apt-get install -y less openjdk-7-jre-headless net-tools vim-tiny sudo openssh-server && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
ENV SCALA_VERSION 2.10.4 ENV SCALA_VERSION 2.10.5
ENV CDH_VERSION cdh4 ENV CDH_VERSION cdh4
ENV SCALA_HOME /opt/scala-$SCALA_VERSION ENV SCALA_HOME /opt/scala-$SCALA_VERSION
ENV SPARK_HOME /opt/spark ENV SPARK_HOME /opt/spark
......
...@@ -17,7 +17,7 @@ include: ...@@ -17,7 +17,7 @@ include:
SPARK_VERSION: 1.6.0-SNAPSHOT SPARK_VERSION: 1.6.0-SNAPSHOT
SPARK_VERSION_SHORT: 1.6.0 SPARK_VERSION_SHORT: 1.6.0
SCALA_BINARY_VERSION: "2.10" SCALA_BINARY_VERSION: "2.10"
SCALA_VERSION: "2.10.4" SCALA_VERSION: "2.10.5"
MESOS_VERSION: 0.21.0 MESOS_VERSION: 0.21.0
SPARK_ISSUE_TRACKER_URL: https://issues.apache.org/jira/browse/SPARK SPARK_ISSUE_TRACKER_URL: https://issues.apache.org/jira/browse/SPARK
SPARK_GITHUB_URL: https://github.com/apache/spark SPARK_GITHUB_URL: https://github.com/apache/spark
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
<!-- commons-httpclient/commons-httpclient--> <!-- commons-httpclient/commons-httpclient-->
<httpclient.classic.version>3.1</httpclient.classic.version> <httpclient.classic.version>3.1</httpclient.classic.version>
<commons.math3.version>3.4.1</commons.math3.version> <commons.math3.version>3.4.1</commons.math3.version>
<scala.version>2.10.4</scala.version> <scala.version>2.10.5</scala.version>
<scala.binary.version>2.10</scala.binary.version> <scala.binary.version>2.10</scala.binary.version>
<jline.version>${scala.version}</jline.version> <jline.version>${scala.version}</jline.version>
<jline.groupid>org.scala-lang</jline.groupid> <jline.groupid>org.scala-lang</jline.groupid>
...@@ -2422,7 +2422,7 @@ ...@@ -2422,7 +2422,7 @@
<property><name>!scala-2.11</name></property> <property><name>!scala-2.11</name></property>
</activation> </activation>
<properties> <properties>
<scala.version>2.10.4</scala.version> <scala.version>2.10.5</scala.version>
<scala.binary.version>2.10</scala.binary.version> <scala.binary.version>2.10</scala.binary.version>
<jline.version>${scala.version}</jline.version> <jline.version>${scala.version}</jline.version>
<jline.groupid>org.scala-lang</jline.groupid> <jline.groupid>org.scala-lang</jline.groupid>
......
...@@ -316,7 +316,7 @@ object OldDeps { ...@@ -316,7 +316,7 @@ object OldDeps {
def oldDepsSettings() = Defaults.coreDefaultSettings ++ Seq( def oldDepsSettings() = Defaults.coreDefaultSettings ++ Seq(
name := "old-deps", name := "old-deps",
scalaVersion := "2.10.4", scalaVersion := "2.10.5",
retrieveManaged := true, retrieveManaged := true,
retrievePattern := "[type]s/[artifact](-[revision])(-[classifier]).[ext]", retrievePattern := "[type]s/[artifact](-[revision])(-[classifier]).[ext]",
libraryDependencies := Seq("spark-streaming-mqtt", "spark-streaming-zeromq", libraryDependencies := Seq("spark-streaming-mqtt", "spark-streaming-zeromq",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment