aboutsummaryrefslogtreecommitdiff
path: root/assembly
diff options
context:
space:
mode:
authorJosh Rosen <joshrosen@databricks.com>2016-01-30 00:20:28 -0800
committerReynold Xin <rxin@databricks.com>2016-01-30 00:20:28 -0800
commit289373b28cd2546165187de2e6a9185a1257b1e7 (patch)
treeb541a6e52a4ff20604689efafbfa0df7ad0901f5 /assembly
parentdab246f7e4664d36073ec49d9df8a11c5e998cdb (diff)
downloadspark-289373b28cd2546165187de2e6a9185a1257b1e7.tar.gz
spark-289373b28cd2546165187de2e6a9185a1257b1e7.tar.bz2
spark-289373b28cd2546165187de2e6a9185a1257b1e7.zip
[SPARK-6363][BUILD] Make Scala 2.11 the default Scala version
This patch changes Spark's build to make Scala 2.11 the default Scala version. To be clear, this does not mean that Spark will stop supporting Scala 2.10: users will still be able to compile Spark for Scala 2.10 by following the instructions on the "Building Spark" page; however, it does mean that Scala 2.11 will be the default Scala version used by our CI builds (including pull request builds). The Scala 2.11 compiler is faster than 2.10, so I think we'll be able to look forward to a slight speedup in our CI builds (it looks like it's about 2X faster for the Maven compile-only builds, for instance). After this patch is merged, I'll update Jenkins to add new compile-only jobs to ensure that Scala 2.10 compilation doesn't break. Author: Josh Rosen <joshrosen@databricks.com> Closes #10608 from JoshRosen/SPARK-6363.
Diffstat (limited to 'assembly')
-rw-r--r--assembly/pom.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 6c79f91897..477d4931c3 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -20,13 +20,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-parent_2.10</artifactId>
+ <artifactId>spark-parent_2.11</artifactId>
<version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-assembly_2.10</artifactId>
+ <artifactId>spark-assembly_2.11</artifactId>
<name>Spark Project Assembly</name>
<url>http://spark.apache.org/</url>
<packaging>pom</packaging>