Repository: spark Updated Branches: refs/heads/master 0fc4aaa71 -> c16a39688
[SPARK-13825][CORE] Upgrade to Scala 2.11.8 ## What changes were proposed in this pull request? Upgrade to 2.11.8 (from the current 2.11.7) ## How was this patch tested? A manual build Author: Jacek Laskowski <ja...@japila.pl> Closes #11681 from jaceklaskowski/SPARK-13825-scala-2_11_8. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/c16a3968 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/c16a3968 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/c16a3968 Branch: refs/heads/master Commit: c16a396886672493df694f3ca30478c8edb771f0 Parents: 0fc4aaa Author: Jacek Laskowski <ja...@japila.pl> Authored: Fri Apr 1 15:21:29 2016 -0700 Committer: Sean Owen <so...@cloudera.com> Committed: Fri Apr 1 15:21:29 2016 -0700 ---------------------------------------------------------------------- dev/deps/spark-deps-hadoop-2.2 | 8 ++++---- dev/deps/spark-deps-hadoop-2.3 | 8 ++++---- dev/deps/spark-deps-hadoop-2.4 | 8 ++++---- dev/deps/spark-deps-hadoop-2.6 | 8 ++++---- dev/deps/spark-deps-hadoop-2.7 | 8 ++++---- pom.xml | 6 +++--- 6 files changed, 23 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/c16a3968/dev/deps/spark-deps-hadoop-2.2 ---------------------------------------------------------------------- diff --git a/dev/deps/spark-deps-hadoop-2.2 b/dev/deps/spark-deps-hadoop-2.2 index 115018e..3865a9f 100644 --- a/dev/deps/spark-deps-hadoop-2.2 +++ b/dev/deps/spark-deps-hadoop-2.2 @@ -158,12 +158,12 @@ protobuf-java-2.5.0.jar py4j-0.9.2.jar pyrolite-4.9.jar reflectasm-1.07-shaded.jar -scala-compiler-2.11.7.jar -scala-library-2.11.7.jar +scala-compiler-2.11.8.jar +scala-library-2.11.8.jar scala-parser-combinators_2.11-1.0.4.jar -scala-reflect-2.11.7.jar +scala-reflect-2.11.8.jar scala-xml_2.11-1.0.2.jar -scalap-2.11.7.jar +scalap-2.11.8.jar servlet-api-2.5.jar slf4j-api-1.7.16.jar slf4j-log4j12-1.7.16.jar http://git-wip-us.apache.org/repos/asf/spark/blob/c16a3968/dev/deps/spark-deps-hadoop-2.3 ---------------------------------------------------------------------- diff --git a/dev/deps/spark-deps-hadoop-2.3 b/dev/deps/spark-deps-hadoop-2.3 index 246d114..4313799 100644 --- a/dev/deps/spark-deps-hadoop-2.3 +++ b/dev/deps/spark-deps-hadoop-2.3 @@ -149,12 +149,12 @@ protobuf-java-2.5.0.jar py4j-0.9.2.jar pyrolite-4.9.jar reflectasm-1.07-shaded.jar -scala-compiler-2.11.7.jar -scala-library-2.11.7.jar +scala-compiler-2.11.8.jar +scala-library-2.11.8.jar scala-parser-combinators_2.11-1.0.4.jar -scala-reflect-2.11.7.jar +scala-reflect-2.11.8.jar scala-xml_2.11-1.0.2.jar -scalap-2.11.7.jar +scalap-2.11.8.jar servlet-api-2.5.jar slf4j-api-1.7.16.jar slf4j-log4j12-1.7.16.jar http://git-wip-us.apache.org/repos/asf/spark/blob/c16a3968/dev/deps/spark-deps-hadoop-2.4 ---------------------------------------------------------------------- diff --git a/dev/deps/spark-deps-hadoop-2.4 b/dev/deps/spark-deps-hadoop-2.4 index 0e2cdaf..910ea68 100644 --- a/dev/deps/spark-deps-hadoop-2.4 +++ b/dev/deps/spark-deps-hadoop-2.4 @@ -150,12 +150,12 @@ protobuf-java-2.5.0.jar py4j-0.9.2.jar pyrolite-4.9.jar reflectasm-1.07-shaded.jar -scala-compiler-2.11.7.jar -scala-library-2.11.7.jar +scala-compiler-2.11.8.jar +scala-library-2.11.8.jar scala-parser-combinators_2.11-1.0.4.jar -scala-reflect-2.11.7.jar +scala-reflect-2.11.8.jar scala-xml_2.11-1.0.2.jar -scalap-2.11.7.jar +scalap-2.11.8.jar servlet-api-2.5.jar slf4j-api-1.7.16.jar slf4j-log4j12-1.7.16.jar http://git-wip-us.apache.org/repos/asf/spark/blob/c16a3968/dev/deps/spark-deps-hadoop-2.6 ---------------------------------------------------------------------- diff --git a/dev/deps/spark-deps-hadoop-2.6 b/dev/deps/spark-deps-hadoop-2.6 index 1ed1559..0692f24 100644 --- a/dev/deps/spark-deps-hadoop-2.6 +++ b/dev/deps/spark-deps-hadoop-2.6 @@ -156,12 +156,12 @@ protobuf-java-2.5.0.jar py4j-0.9.2.jar pyrolite-4.9.jar reflectasm-1.07-shaded.jar -scala-compiler-2.11.7.jar -scala-library-2.11.7.jar +scala-compiler-2.11.8.jar +scala-library-2.11.8.jar scala-parser-combinators_2.11-1.0.4.jar -scala-reflect-2.11.7.jar +scala-reflect-2.11.8.jar scala-xml_2.11-1.0.2.jar -scalap-2.11.7.jar +scalap-2.11.8.jar servlet-api-2.5.jar slf4j-api-1.7.16.jar slf4j-log4j12-1.7.16.jar http://git-wip-us.apache.org/repos/asf/spark/blob/c16a3968/dev/deps/spark-deps-hadoop-2.7 ---------------------------------------------------------------------- diff --git a/dev/deps/spark-deps-hadoop-2.7 b/dev/deps/spark-deps-hadoop-2.7 index 218631e..e397558 100644 --- a/dev/deps/spark-deps-hadoop-2.7 +++ b/dev/deps/spark-deps-hadoop-2.7 @@ -157,12 +157,12 @@ protobuf-java-2.5.0.jar py4j-0.9.2.jar pyrolite-4.9.jar reflectasm-1.07-shaded.jar -scala-compiler-2.11.7.jar -scala-library-2.11.7.jar +scala-compiler-2.11.8.jar +scala-library-2.11.8.jar scala-parser-combinators_2.11-1.0.4.jar -scala-reflect-2.11.7.jar +scala-reflect-2.11.8.jar scala-xml_2.11-1.0.2.jar -scalap-2.11.7.jar +scalap-2.11.8.jar servlet-api-2.5.jar slf4j-api-1.7.16.jar slf4j-log4j12-1.7.16.jar http://git-wip-us.apache.org/repos/asf/spark/blob/c16a3968/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index be80e6b..e135c92 100644 --- a/pom.xml +++ b/pom.xml @@ -156,7 +156,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.11.7</scala.version> + <scala.version>2.11.8</scala.version> <scala.binary.version>2.11</scala.binary.version> <jline.version>${scala.version}</jline.version> <jline.groupid>org.scala-lang</jline.groupid> @@ -2448,7 +2448,7 @@ <property><name>scala-2.10</name></property> </activation> <properties> - <scala.version>2.10.5</scala.version> + <scala.version>2.10.6</scala.version> <scala.binary.version>2.10</scala.binary.version> <jline.version>${scala.version}</jline.version> <jline.groupid>org.scala-lang</jline.groupid> @@ -2480,7 +2480,7 @@ <property><name>!scala-2.10</name></property> </activation> <properties> - <scala.version>2.11.7</scala.version> + <scala.version>2.11.8</scala.version> <scala.binary.version>2.11</scala.binary.version> </properties> </profile> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
