Repository: spark Updated Branches: refs/heads/master f5c418da0 -> 764353d2c
[SPARK-1342] Scala 2.10.4 Just a Scala version increment Author: Mark Hamstra <markhams...@gmail.com> Closes #259 from markhamstra/scala-2.10.4 and squashes the following commits: fbec547 [Mark Hamstra] [SPARK-1342] Bumped Scala version to 2.10.4 Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/764353d2 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/764353d2 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/764353d2 Branch: refs/heads/master Commit: 764353d2c5162352781c273dd3d4af6a309190c7 Parents: f5c418d Author: Mark Hamstra <markhams...@gmail.com> Authored: Tue Apr 1 18:35:50 2014 -0700 Committer: Matei Zaharia <ma...@databricks.com> Committed: Tue Apr 1 18:35:50 2014 -0700 ---------------------------------------------------------------------- core/pom.xml | 2 +- dev/audit-release/README.md | 2 +- dev/audit-release/audit_release.py | 2 +- docker/spark-test/base/Dockerfile | 2 +- docs/_config.yml | 2 +- pom.xml | 4 ++-- project/SparkBuild.scala | 2 +- project/plugins.sbt | 2 +- project/project/SparkPluginBuild.scala | 2 +- sql/README.md | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/764353d2/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index eb6cc4d..e4c32ef 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -150,7 +150,7 @@ <artifactId>json4s-jackson_${scala.binary.version}</artifactId> <version>3.2.6</version> <!-- see also exclusion for lift-json; this is necessary since it depends on - scala-library and scalap 2.10.0, but we use 2.10.3, and only override + scala-library and scalap 2.10.0, but we use 2.10.4, and only override scala-library --> <exclusions> <exclusion> http://git-wip-us.apache.org/repos/asf/spark/blob/764353d2/dev/audit-release/README.md ---------------------------------------------------------------------- diff --git a/dev/audit-release/README.md b/dev/audit-release/README.md index 2437a98..38becda 100644 --- a/dev/audit-release/README.md +++ b/dev/audit-release/README.md @@ -4,7 +4,7 @@ run them locally by setting appropriate environment variables. ``` $ cd sbt_app_core -$ SCALA_VERSION=2.10.3 \ +$ SCALA_VERSION=2.10.4 \ SPARK_VERSION=1.0.0-SNAPSHOT \ SPARK_RELEASE_REPOSITORY=file:///home/patrick/.ivy2/local \ sbt run http://git-wip-us.apache.org/repos/asf/spark/blob/764353d2/dev/audit-release/audit_release.py ---------------------------------------------------------------------- diff --git a/dev/audit-release/audit_release.py b/dev/audit-release/audit_release.py index 52c367d..fa2f02d 100755 --- a/dev/audit-release/audit_release.py +++ b/dev/audit-release/audit_release.py @@ -35,7 +35,7 @@ RELEASE_URL = "http://people.apache.org/~pwendell/spark-1.0.0-rc1/"; RELEASE_KEY = "9E4FE3AF" RELEASE_REPOSITORY = "https://repository.apache.org/content/repositories/orgapachespark-1006/"; RELEASE_VERSION = "1.0.0" -SCALA_VERSION = "2.10.3" +SCALA_VERSION = "2.10.4" SCALA_BINARY_VERSION = "2.10" ## http://git-wip-us.apache.org/repos/asf/spark/blob/764353d2/docker/spark-test/base/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/spark-test/base/Dockerfile b/docker/spark-test/base/Dockerfile index e543db6..5956d59 100644 --- a/docker/spark-test/base/Dockerfile +++ b/docker/spark-test/base/Dockerfile @@ -25,7 +25,7 @@ RUN apt-get update # install a few other useful packages plus Open Jdk 7 RUN apt-get install -y less openjdk-7-jre-headless net-tools vim-tiny sudo openssh-server -ENV SCALA_VERSION 2.10.3 +ENV SCALA_VERSION 2.10.4 ENV CDH_VERSION cdh4 ENV SCALA_HOME /opt/scala-$SCALA_VERSION ENV SPARK_HOME /opt/spark http://git-wip-us.apache.org/repos/asf/spark/blob/764353d2/docs/_config.yml ---------------------------------------------------------------------- diff --git a/docs/_config.yml b/docs/_config.yml index aa5a5ad..d585b8c 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -6,7 +6,7 @@ markdown: kramdown SPARK_VERSION: 1.0.0-SNAPSHOT SPARK_VERSION_SHORT: 1.0.0 SCALA_BINARY_VERSION: "2.10" -SCALA_VERSION: "2.10.3" +SCALA_VERSION: "2.10.4" MESOS_VERSION: 0.13.0 SPARK_ISSUE_TRACKER_URL: https://spark-project.atlassian.net SPARK_GITHUB_URL: https://github.com/apache/spark http://git-wip-us.apache.org/repos/asf/spark/blob/764353d2/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 09a449d..7d58060 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ <java.version>1.6</java.version> - <scala.version>2.10.3</scala.version> + <scala.version>2.10.4</scala.version> <scala.binary.version>2.10</scala.binary.version> <mesos.version>0.13.0</mesos.version> <akka.group>org.spark-project.akka</akka.group> @@ -380,7 +380,7 @@ <artifactId>lift-json_${scala.binary.version}</artifactId> <version>2.5.1</version> <!-- see also exclusion for json4s; this is necessary since it depends on - scala-library and scalap 2.10.0, but we use 2.10.3, and only override + scala-library and scalap 2.10.0, but we use 2.10.4, and only override scala-library --> <exclusions> <exclusion> http://git-wip-us.apache.org/repos/asf/spark/blob/764353d2/project/SparkBuild.scala ---------------------------------------------------------------------- diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 7457ff4..c5c697e 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -152,7 +152,7 @@ object SparkBuild extends Build { def sharedSettings = Defaults.defaultSettings ++ MimaBuild.mimaSettings(file(sparkHome)) ++ Seq( organization := "org.apache.spark", version := SPARK_VERSION, - scalaVersion := "2.10.3", + scalaVersion := "2.10.4", scalacOptions := Seq("-Xmax-classfile-name", "120", "-unchecked", "-deprecation", "-target:" + SCALAC_JVM_VERSION), javacOptions := Seq("-target", JAVAC_JVM_VERSION, "-source", JAVAC_JVM_VERSION), http://git-wip-us.apache.org/repos/asf/spark/blob/764353d2/project/plugins.sbt ---------------------------------------------------------------------- diff --git a/project/plugins.sbt b/project/plugins.sbt index 5aa8a1e..d787237 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.10.3" +scalaVersion := "2.10.4" resolvers += Resolver.url("artifactory", url("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases";))(Resolver.ivyStylePatterns) http://git-wip-us.apache.org/repos/asf/spark/blob/764353d2/project/project/SparkPluginBuild.scala ---------------------------------------------------------------------- diff --git a/project/project/SparkPluginBuild.scala b/project/project/SparkPluginBuild.scala index 5a30704..0142256 100644 --- a/project/project/SparkPluginBuild.scala +++ b/project/project/SparkPluginBuild.scala @@ -32,7 +32,7 @@ object SparkPluginDef extends Build { name := "spark-style", organization := "org.apache.spark", version := sparkVersion, - scalaVersion := "2.10.3", + scalaVersion := "2.10.4", scalacOptions := Seq("-unchecked", "-deprecation"), libraryDependencies ++= Dependencies.scalaStyle ) http://git-wip-us.apache.org/repos/asf/spark/blob/764353d2/sql/README.md ---------------------------------------------------------------------- diff --git a/sql/README.md b/sql/README.md index 4192fec..14d5555 100644 --- a/sql/README.md +++ b/sql/README.md @@ -38,7 +38,7 @@ import org.apache.spark.sql.catalyst.util._ import org.apache.spark.sql.execution import org.apache.spark.sql.hive._ import org.apache.spark.sql.hive.TestHive._ -Welcome to Scala version 2.10.3 (Java HotSpot(TM) 64-Bit Server VM, Java 1.7.0_45). +Welcome to Scala version 2.10.4 (Java HotSpot(TM) 64-Bit Server VM, Java 1.7.0_45). Type in expressions to have them evaluated. Type :help for more information.
