Skip to content

Default build to Scala 2.11 #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markhamstra merged 1 commit into from
Jul 13, 2016
Merged

Default build to Scala 2.11 #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions assembly/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>1.6.2-csd-1-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>
Expand Down
4 changes: 2 additions & 2 deletions bagel/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>1.6.2-csd-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<groupId>org.apache.spark</groupId>
<artifactId>spark-bagel_2.10</artifactId>
<artifactId>spark-bagel_2.11</artifactId>
<properties>
<sbt.project.name>bagel</sbt.project.name>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>1.6.2-csd-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<groupId>org.apache.spark</groupId>
<artifactId>spark-core_2.10</artifactId>
<artifactId>spark-core_2.11</artifactId>
<properties>
<sbt.project.name>core</sbt.project.name>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions docker-integration-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
<artifactId>spark-parent_2.11</artifactId>
<version>1.6.2-csd-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>spark-docker-integration-tests_2.10</artifactId>
<artifactId>spark-docker-integration-tests_2.11</artifactId>
<packaging>jar</packaging>
<name>Spark Project Docker Integration Tests</name>
<url>http://spark.apache.org/</url>
Expand Down
2 changes: 1 addition & 1 deletion docs/_plugins/copy_api_dirs.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

# Copy over the unified ScalaDoc for all projects to api/scala.
# This directory will be copied over to _site when `jekyll` command is run.
source = "../target/scala-2.10/unidoc"
source = "../target/scala-2.11/unidoc"
dest = "api/scala"

puts "Making directory " + dest
Expand Down
4 changes: 2 additions & 2 deletions examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>1.6.2-csd-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<groupId>org.apache.spark</groupId>
<artifactId>spark-examples_2.10</artifactId>
<artifactId>spark-examples_2.11</artifactId>
<properties>
<sbt.project.name>examples</sbt.project.name>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions external/flume-assembly/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>1.6.2-csd-1-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>
Expand Down
4 changes: 2 additions & 2 deletions external/flume-sink/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>1.6.2-csd-1-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>
Expand Down
4 changes: 2 additions & 2 deletions external/flume/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>1.6.2-csd-1-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>
Expand Down
4 changes: 2 additions & 2 deletions external/kafka-assembly/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>1.6.2-csd-1-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>
Expand Down
4 changes: 2 additions & 2 deletions external/kafka/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>1.6.2-csd-1-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>
Expand Down
4 changes: 2 additions & 2 deletions external/mqtt-assembly/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>1.6.2-csd-1-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>
Expand Down
4 changes: 2 additions & 2 deletions external/mqtt/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>1.6.2-csd-1-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>
Expand Down
4 changes: 2 additions & 2 deletions external/twitter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>1.6.2-csd-1-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>
Expand Down
4 changes: 2 additions & 2 deletions external/zeromq/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>1.6.2-csd-1-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>
Expand Down
4 changes: 2 additions & 2 deletions extras/java8-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,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>1.6.2-csd-1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<groupId>org.apache.spark</groupId>
<artifactId>java8-tests_2.10</artifactId>
<artifactId>java8-tests_2.11</artifactId>
<packaging>pom</packaging>
<name>Spark Project Java8 Tests POM</name>

Expand Down
4 changes: 2 additions & 2 deletions extras/kinesis-asl-assembly/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>1.6.2-csd-1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<groupId>org.apache.spark</groupId>
<artifactId>spark-streaming-kinesis-asl-assembly_2.10</artifactId>
<artifactId>spark-streaming-kinesis-asl-assembly_2.11</artifactId>
<packaging>jar</packaging>
<name>Spark Project Kinesis Assembly</name>
<url>http://spark.apache.org/</url>
Expand Down
4 changes: 2 additions & 2 deletions extras/kinesis-asl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
<artifactId>spark-parent_2.11</artifactId>
<version>1.6.2-csd-1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<!-- Kinesis integration is not included by default due to ASL-licensed code. -->
<groupId>org.apache.spark</groupId>
<artifactId>spark-streaming-kinesis-asl_2.10</artifactId>
<artifactId>spark-streaming-kinesis-asl_2.11</artifactId>
<packaging>jar</packaging>
<name>Spark Kinesis Integration</name>

Expand Down
4 changes: 2 additions & 2 deletions extras/spark-ganglia-lgpl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
<artifactId>spark-parent_2.11</artifactId>
<version>1.6.2-csd-1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<!-- Ganglia integration is not included by default due to LGPL-licensed code -->
<groupId>org.apache.spark</groupId>
<artifactId>spark-ganglia-lgpl_2.10</artifactId>
<artifactId>spark-ganglia-lgpl_2.11</artifactId>
<packaging>jar</packaging>
<name>Spark Ganglia Integration</name>

Expand Down
4 changes: 2 additions & 2 deletions graphx/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>1.6.2-csd-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<groupId>org.apache.spark</groupId>
<artifactId>spark-graphx_2.10</artifactId>
<artifactId>spark-graphx_2.11</artifactId>
<properties>
<sbt.project.name>graphx</sbt.project.name>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions launcher/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>1.6.2-csd-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<groupId>org.apache.spark</groupId>
<artifactId>spark-launcher_2.10</artifactId>
<artifactId>spark-launcher_2.11</artifactId>
<packaging>jar</packaging>
<name>Spark Project Launcher</name>
<url>http://spark.apache.org/</url>
Expand Down
4 changes: 2 additions & 2 deletions mllib/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>1.6.2-csd-1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<groupId>org.apache.spark</groupId>
<artifactId>spark-mllib_2.10</artifactId>
<artifactId>spark-mllib_2.11</artifactId>
<properties>
<sbt.project.name>mllib</sbt.project.name>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions network/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>1.6.2-csd-1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<groupId>org.apache.spark</groupId>
<artifactId>spark-network-common_2.10</artifactId>
<artifactId>spark-network-common_2.11</artifactId>
<packaging>jar</packaging>
<name>Spark Project Networking</name>
<url>http://spark.apache.org/</url>
Expand Down
4 changes: 2 additions & 2 deletions network/shuffle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>1.6.2-csd-1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<groupId>org.apache.spark</groupId>
<artifactId>spark-network-shuffle_2.10</artifactId>
<artifactId>spark-network-shuffle_2.11</artifactId>
<packaging>jar</packaging>
<name>Spark Project Shuffle Streaming Service</name>
<url>http://spark.apache.org/</url>
Expand Down
4 changes: 2 additions & 2 deletions network/yarn/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>1.6.2-csd-1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<groupId>org.apache.spark</groupId>
<artifactId>spark-network-yarn_2.10</artifactId>
<artifactId>spark-network-yarn_2.11</artifactId>
<packaging>jar</packaging>
<name>Spark Project YARN Shuffle Service</name>
<url>http://spark.apache.org/</url>
Expand Down
Loading