You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by jo...@apache.org on 2016/02/09 20:56:30 UTC
spark git commit: [SPARK-13189] Cleanup build references to Scala 2.10
Repository: spark
Updated Branches:
refs/heads/master 34d0b70b3 -> 2dbb91644
[SPARK-13189] Cleanup build references to Scala 2.10
Author: Luciano Resende <lr...@apache.org>
Closes #11092 from lresende/SPARK-13189.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/2dbb9164
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/2dbb9164
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/2dbb9164
Branch: refs/heads/master
Commit: 2dbb9164405d6f595905c7d4b32e20177f0f669f
Parents: 34d0b70
Author: Luciano Resende <lr...@apache.org>
Authored: Tue Feb 9 11:56:25 2016 -0800
Committer: Josh Rosen <jo...@databricks.com>
Committed: Tue Feb 9 11:56:25 2016 -0800
----------------------------------------------------------------------
LICENSE | 18 +++++++++---------
dev/audit-release/README.md | 9 +++++----
dev/audit-release/audit_release.py | 4 ++--
docker/spark-test/base/Dockerfile | 2 +-
docs/_config.yml | 4 ++--
pom.xml | 2 +-
6 files changed, 20 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/2dbb9164/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 9fc29db..9b78f3b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -249,14 +249,14 @@ 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.10.5 - 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.5 - 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.5 - http://www.scala-lang.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-macros (org.spire-math:spire-macros_2.10:0.7.1 - http://spire-math.org)
+ (BSD-like) Scala Actors library (org.scala-lang:scala-actors:2.11.7 - http://www.scala-lang.org/)
+ (BSD-like) Scala Compiler (org.scala-lang:scala-compiler:2.11.7 - http://www.scala-lang.org/)
+ (BSD-like) Scala Compiler (org.scala-lang:scala-reflect:2.11.7 - http://www.scala-lang.org/)
+ (BSD-like) Scala Library (org.scala-lang:scala-library:2.11.7 - http://www.scala-lang.org/)
+ (BSD-like) Scalap (org.scala-lang:scalap:2.11.7 - 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)
(New BSD License) Kryo (com.esotericsoftware.kryo:kryo:2.21 - http://code.google.com/p/kryo/)
(New BSD License) MinLog (com.esotericsoftware.minlog:minlog:1.2 - http://code.google.com/p/minlog/)
(New BSD License) ReflectASM (com.esotericsoftware.reflectasm:reflectasm:1.07 - http://code.google.com/p/reflectasm/)
@@ -283,7 +283,7 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
(MIT License) SLF4J API Module (org.slf4j:slf4j-api:1.7.5 - http://www.slf4j.org)
(MIT License) SLF4J LOG4J-12 Binding (org.slf4j:slf4j-log4j12:1.7.5 - http://www.slf4j.org)
(MIT License) pyrolite (org.spark-project:pyrolite:2.0.1 - http://pythonhosted.org/Pyro4/)
- (MIT License) scopt (com.github.scopt:scopt_2.10:3.2.0 - https://github.com/scopt/scopt)
+ (MIT License) scopt (com.github.scopt:scopt_2.11:3.2.0 - https://github.com/scopt/scopt)
(The MIT License) Mockito (org.mockito:mockito-core:1.9.5 - http://www.mockito.org)
(MIT License) jquery (https://jquery.org/license/)
(MIT License) AnchorJS (https://github.com/bryanbraun/anchorjs)
http://git-wip-us.apache.org/repos/asf/spark/blob/2dbb9164/dev/audit-release/README.md
----------------------------------------------------------------------
diff --git a/dev/audit-release/README.md b/dev/audit-release/README.md
index f72f8c6..37b2a0a 100644
--- a/dev/audit-release/README.md
+++ b/dev/audit-release/README.md
@@ -1,10 +1,11 @@
-# Test Application Builds
-This directory includes test applications which are built when auditing releases. You can
-run them locally by setting appropriate environment variables.
+Test Application Builds
+=======================
+
+This directory includes test applications which are built when auditing releases. You can run them locally by setting appropriate environment variables.
```
$ cd sbt_app_core
-$ SCALA_VERSION=2.10.5 \
+$ SCALA_VERSION=2.11.7 \
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/2dbb9164/dev/audit-release/audit_release.py
----------------------------------------------------------------------
diff --git a/dev/audit-release/audit_release.py b/dev/audit-release/audit_release.py
index 972be30..4dabb51 100755
--- a/dev/audit-release/audit_release.py
+++ b/dev/audit-release/audit_release.py
@@ -35,8 +35,8 @@ RELEASE_URL = "http://people.apache.org/~andrewor14/spark-1.1.1-rc1/"
RELEASE_KEY = "XXXXXXXX" # Your 8-digit hex
RELEASE_REPOSITORY = "https://repository.apache.org/content/repositories/orgapachespark-1033"
RELEASE_VERSION = "1.1.1"
-SCALA_VERSION = "2.10.5"
-SCALA_BINARY_VERSION = "2.10"
+SCALA_VERSION = "2.11.7"
+SCALA_BINARY_VERSION = "2.11"
# Do not set these
LOG_FILE_NAME = "spark_audit_%s" % time.strftime("%h_%m_%Y_%I_%M_%S")
http://git-wip-us.apache.org/repos/asf/spark/blob/2dbb9164/docker/spark-test/base/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/spark-test/base/Dockerfile b/docker/spark-test/base/Dockerfile
index 7ba0de6..76f550f 100644
--- a/docker/spark-test/base/Dockerfile
+++ b/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.10.5
+ENV SCALA_VERSION 2.11.7
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/2dbb9164/docs/_config.yml
----------------------------------------------------------------------
diff --git a/docs/_config.yml b/docs/_config.yml
index dc25ff2..8bdc68a 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -16,8 +16,8 @@ include:
# of Spark, Scala, and Mesos.
SPARK_VERSION: 2.0.0-SNAPSHOT
SPARK_VERSION_SHORT: 2.0.0
-SCALA_BINARY_VERSION: "2.10"
-SCALA_VERSION: "2.10.5"
+SCALA_BINARY_VERSION: "2.11"
+SCALA_VERSION: "2.11.7"
MESOS_VERSION: 0.21.0
SPARK_ISSUE_TRACKER_URL: https://issues.apache.org/jira/browse/SPARK
SPARK_GITHUB_URL: https://github.com/apache/spark
http://git-wip-us.apache.org/repos/asf/spark/blob/2dbb9164/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d0387ac..4f7a057 100644
--- a/pom.xml
+++ b/pom.xml
@@ -164,7 +164,7 @@
<commons.math3.version>3.4.1</commons.math3.version>
<!-- managed up from 3.2.1 for SPARK-11652 -->
<commons.collections.version>3.2.2</commons.collections.version>
- <scala.version>2.10.5</scala.version>
+ <scala.version>2.11.7</scala.version>
<scala.binary.version>2.11</scala.binary.version>
<jline.version>${scala.version}</jline.version>
<jline.groupid>org.scala-lang</jline.groupid>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org