diff options
author | Josh Rosen <joshrosen@databricks.com> | 2016-01-30 00:20:28 -0800 |
---|---|---|
committer | Reynold Xin <rxin@databricks.com> | 2016-01-30 00:20:28 -0800 |
commit | 289373b28cd2546165187de2e6a9185a1257b1e7 (patch) | |
tree | b541a6e52a4ff20604689efafbfa0df7ad0901f5 /external | |
parent | dab246f7e4664d36073ec49d9df8a11c5e998cdb (diff) | |
download | spark-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 'external')
-rw-r--r-- | external/akka/pom.xml | 4 | ||||
-rw-r--r-- | external/flume-assembly/pom.xml | 4 | ||||
-rw-r--r-- | external/flume-sink/pom.xml | 4 | ||||
-rw-r--r-- | external/flume/pom.xml | 4 | ||||
-rw-r--r-- | external/kafka-assembly/pom.xml | 4 | ||||
-rw-r--r-- | external/kafka/pom.xml | 4 | ||||
-rw-r--r-- | external/mqtt-assembly/pom.xml | 4 | ||||
-rw-r--r-- | external/mqtt/pom.xml | 4 | ||||
-rw-r--r-- | external/twitter/pom.xml | 4 | ||||
-rw-r--r-- | external/zeromq/pom.xml | 4 |
10 files changed, 20 insertions, 20 deletions
diff --git a/external/akka/pom.xml b/external/akka/pom.xml index 06c8e8aaab..bbe644e3b3 100644 --- a/external/akka/pom.xml +++ b/external/akka/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-streaming-akka_2.10</artifactId> + <artifactId>spark-streaming-akka_2.11</artifactId> <properties> <sbt.project.name>streaming-akka</sbt.project.name> </properties> diff --git a/external/flume-assembly/pom.xml b/external/flume-assembly/pom.xml index b2c377fe4c..ac15b93c04 100644 --- a/external/flume-assembly/pom.xml +++ b/external/flume-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-streaming-flume-assembly_2.10</artifactId> + <artifactId>spark-streaming-flume-assembly_2.11</artifactId> <packaging>jar</packaging> <name>Spark Project External Flume Assembly</name> <url>http://spark.apache.org/</url> diff --git a/external/flume-sink/pom.xml b/external/flume-sink/pom.xml index 4b6485ee0a..e4effe158c 100644 --- a/external/flume-sink/pom.xml +++ b/external/flume-sink/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-streaming-flume-sink_2.10</artifactId> + <artifactId>spark-streaming-flume-sink_2.11</artifactId> <properties> <sbt.project.name>streaming-flume-sink</sbt.project.name> </properties> diff --git a/external/flume/pom.xml b/external/flume/pom.xml index a79656c6f7..d650dd034d 100644 --- a/external/flume/pom.xml +++ b/external/flume/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-streaming-flume_2.10</artifactId> + <artifactId>spark-streaming-flume_2.11</artifactId> <properties> <sbt.project.name>streaming-flume</sbt.project.name> </properties> diff --git a/external/kafka-assembly/pom.xml b/external/kafka-assembly/pom.xml index 0c466b3c4a..62818f5e8f 100644 --- a/external/kafka-assembly/pom.xml +++ b/external/kafka-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-streaming-kafka-assembly_2.10</artifactId> + <artifactId>spark-streaming-kafka-assembly_2.11</artifactId> <packaging>jar</packaging> <name>Spark Project External Kafka Assembly</name> <url>http://spark.apache.org/</url> diff --git a/external/kafka/pom.xml b/external/kafka/pom.xml index 5180ab6dba..68d52e9339 100644 --- a/external/kafka/pom.xml +++ b/external/kafka/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-streaming-kafka_2.10</artifactId> + <artifactId>spark-streaming-kafka_2.11</artifactId> <properties> <sbt.project.name>streaming-kafka</sbt.project.name> </properties> diff --git a/external/mqtt-assembly/pom.xml b/external/mqtt-assembly/pom.xml index c4a1ae26ea..ac2a3f65ed 100644 --- a/external/mqtt-assembly/pom.xml +++ b/external/mqtt-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-streaming-mqtt-assembly_2.10</artifactId> + <artifactId>spark-streaming-mqtt-assembly_2.11</artifactId> <packaging>jar</packaging> <name>Spark Project External MQTT Assembly</name> <url>http://spark.apache.org/</url> diff --git a/external/mqtt/pom.xml b/external/mqtt/pom.xml index d3a2bf5825..d0d968782c 100644 --- a/external/mqtt/pom.xml +++ b/external/mqtt/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-streaming-mqtt_2.10</artifactId> + <artifactId>spark-streaming-mqtt_2.11</artifactId> <properties> <sbt.project.name>streaming-mqtt</sbt.project.name> </properties> diff --git a/external/twitter/pom.xml b/external/twitter/pom.xml index 7b628b09ea..5d4053afcb 100644 --- a/external/twitter/pom.xml +++ b/external/twitter/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-streaming-twitter_2.10</artifactId> + <artifactId>spark-streaming-twitter_2.11</artifactId> <properties> <sbt.project.name>streaming-twitter</sbt.project.name> </properties> diff --git a/external/zeromq/pom.xml b/external/zeromq/pom.xml index 7781aaeed9..f16bc0f319 100644 --- a/external/zeromq/pom.xml +++ b/external/zeromq/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-streaming-zeromq_2.10</artifactId> + <artifactId>spark-streaming-zeromq_2.11</artifactId> <properties> <sbt.project.name>streaming-zeromq</sbt.project.name> </properties> |