aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacek Laskowski <jacek@japila.pl>2016-04-01 15:21:29 -0700
committerSean Owen <sowen@cloudera.com>2016-04-01 15:21:29 -0700
commitc16a396886672493df694f3ca30478c8edb771f0 (patch)
tree2079636f350a6e6a4223cd548c64a2a71e42aba8
parent0fc4aaa71c5b4531b3a7c8ac71d62ea8e66b6f0c (diff)
downloadspark-c16a396886672493df694f3ca30478c8edb771f0.tar.gz
spark-c16a396886672493df694f3ca30478c8edb771f0.tar.bz2
spark-c16a396886672493df694f3ca30478c8edb771f0.zip
[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 <jacek@japila.pl> Closes #11681 from jaceklaskowski/SPARK-13825-scala-2_11_8.
-rw-r--r--dev/deps/spark-deps-hadoop-2.28
-rw-r--r--dev/deps/spark-deps-hadoop-2.38
-rw-r--r--dev/deps/spark-deps-hadoop-2.48
-rw-r--r--dev/deps/spark-deps-hadoop-2.68
-rw-r--r--dev/deps/spark-deps-hadoop-2.78
-rw-r--r--pom.xml6
6 files changed, 23 insertions, 23 deletions
diff --git a/dev/deps/spark-deps-hadoop-2.2 b/dev/deps/spark-deps-hadoop-2.2
index 115018e7c1..3865a9fb16 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
diff --git a/dev/deps/spark-deps-hadoop-2.3 b/dev/deps/spark-deps-hadoop-2.3
index 246d1147bf..4313799da7 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
diff --git a/dev/deps/spark-deps-hadoop-2.4 b/dev/deps/spark-deps-hadoop-2.4
index 0e2cdaf0d2..910ea685f2 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
diff --git a/dev/deps/spark-deps-hadoop-2.6 b/dev/deps/spark-deps-hadoop-2.6
index 1ed15595be..0692f24e47 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
diff --git a/dev/deps/spark-deps-hadoop-2.7 b/dev/deps/spark-deps-hadoop-2.7
index 218631ed6e..e397558e05 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
diff --git a/pom.xml b/pom.xml
index be80e6b80c..e135c92c07 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>