diff options
author | Ubuntu <ubuntu@ip-172-31-5-6.us-west-2.compute.internal> | 2014-11-17 03:09:19 +0000 |
---|---|---|
committer | Ubuntu <ubuntu@ip-172-31-5-6.us-west-2.compute.internal> | 2014-11-17 03:09:19 +0000 |
commit | 6c6fd218c83a049c874b8a0ea737333c1899c94a (patch) | |
tree | a114a2ad46b79fb36cb304378bd5c5c8edfe1070 | |
parent | bc09875799aa373f4320d38b02618173ffa4c96f (diff) | |
download | spark-6c6fd218c83a049c874b8a0ea737333c1899c94a.tar.gz spark-6c6fd218c83a049c874b8a0ea737333c1899c94a.tar.bz2 spark-6c6fd218c83a049c874b8a0ea737333c1899c94a.zip |
Preparing development version 1.2.1-SNAPSHOT
-rw-r--r-- | assembly/pom.xml | 4 | ||||
-rw-r--r-- | bagel/pom.xml | 4 | ||||
-rw-r--r-- | core/pom.xml | 4 | ||||
-rw-r--r-- | core/src/main/scala/org/apache/spark/package.scala | 2 | ||||
-rw-r--r-- | examples/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/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 | ||||
-rw-r--r-- | extras/java8-tests/pom.xml | 4 | ||||
-rw-r--r-- | extras/kinesis-asl/pom.xml | 4 | ||||
-rw-r--r-- | extras/spark-ganglia-lgpl/pom.xml | 4 | ||||
-rw-r--r-- | graphx/pom.xml | 4 | ||||
-rw-r--r-- | mllib/pom.xml | 4 | ||||
-rw-r--r-- | network/common/pom.xml | 4 | ||||
-rw-r--r-- | network/shuffle/pom.xml | 4 | ||||
-rw-r--r-- | network/yarn/pom.xml | 4 | ||||
-rw-r--r-- | pom.xml | 4 | ||||
-rw-r--r-- | repl/pom.xml | 4 | ||||
-rw-r--r-- | sql/catalyst/pom.xml | 4 | ||||
-rw-r--r-- | sql/core/pom.xml | 4 | ||||
-rw-r--r-- | sql/hive-thriftserver/pom.xml | 4 | ||||
-rw-r--r-- | sql/hive/pom.xml | 4 | ||||
-rw-r--r-- | streaming/pom.xml | 4 | ||||
-rw-r--r-- | tools/pom.xml | 4 | ||||
-rw-r--r-- | yarn/alpha/pom.xml | 6 | ||||
-rw-r--r-- | yarn/pom.xml | 4 | ||||
-rw-r--r-- | yarn/stable/pom.xml | 6 |
30 files changed, 61 insertions, 61 deletions
diff --git a/assembly/pom.xml b/assembly/pom.xml index 5af17c5847..0c79f10ab2 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -21,12 +21,12 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.2.0</version> + <version>1.2.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> diff --git a/bagel/pom.xml b/bagel/pom.xml index 1f43fcc2c3..c968da9646 100644 --- a/bagel/pom.xml +++ b/bagel/pom.xml @@ -21,12 +21,12 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.2.0</version> + <version>1.2.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> diff --git a/core/pom.xml b/core/pom.xml index 15cb382888..83c03076de 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,12 +21,12 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.2.0</version> + <version>1.2.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> diff --git a/core/src/main/scala/org/apache/spark/package.scala b/core/src/main/scala/org/apache/spark/package.scala index 873ec3c8fa..b1a511f76c 100644 --- a/core/src/main/scala/org/apache/spark/package.scala +++ b/core/src/main/scala/org/apache/spark/package.scala @@ -44,5 +44,5 @@ package org.apache package object spark { // For package docs only - val SPARK_VERSION = "1.2.0" + val SPARK_VERSION = "1.2.1-SNAPSHOT" } diff --git a/examples/pom.xml b/examples/pom.xml index bd3b317ecb..3bc1149e3d 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,12 +21,12 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.2.0</version> + <version>1.2.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> diff --git a/external/flume-sink/pom.xml b/external/flume-sink/pom.xml index ff7babcd90..95f8c9e813 100644 --- a/external/flume-sink/pom.xml +++ b/external/flume-sink/pom.xml @@ -21,12 +21,12 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.2.0</version> + <version>1.2.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> diff --git a/external/flume/pom.xml b/external/flume/pom.xml index e3db056ee5..6b560dd643 100644 --- a/external/flume/pom.xml +++ b/external/flume/pom.xml @@ -21,12 +21,12 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.2.0</version> + <version>1.2.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> diff --git a/external/kafka/pom.xml b/external/kafka/pom.xml index 4e75c85a8c..f154acaae3 100644 --- a/external/kafka/pom.xml +++ b/external/kafka/pom.xml @@ -21,12 +21,12 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.2.0</version> + <version>1.2.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> diff --git a/external/mqtt/pom.xml b/external/mqtt/pom.xml index 43cee08993..2478f9c2ab 100644 --- a/external/mqtt/pom.xml +++ b/external/mqtt/pom.xml @@ -21,12 +21,12 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.2.0</version> + <version>1.2.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> diff --git a/external/twitter/pom.xml b/external/twitter/pom.xml index 80c2240060..b365d0c2d4 100644 --- a/external/twitter/pom.xml +++ b/external/twitter/pom.xml @@ -21,12 +21,12 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.2.0</version> + <version>1.2.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> diff --git a/external/zeromq/pom.xml b/external/zeromq/pom.xml index fe529daf5a..d381d6fe92 100644 --- a/external/zeromq/pom.xml +++ b/external/zeromq/pom.xml @@ -21,12 +21,12 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.2.0</version> + <version>1.2.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> diff --git a/extras/java8-tests/pom.xml b/extras/java8-tests/pom.xml index 9466e048a0..bd18323848 100644 --- a/extras/java8-tests/pom.xml +++ b/extras/java8-tests/pom.xml @@ -20,12 +20,12 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.2.0</version> + <version>1.2.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> diff --git a/extras/kinesis-asl/pom.xml b/extras/kinesis-asl/pom.xml index c9965832f1..bcb694328e 100644 --- a/extras/kinesis-asl/pom.xml +++ b/extras/kinesis-asl/pom.xml @@ -20,13 +20,13 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.2.0</version> + <version>1.2.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> diff --git a/extras/spark-ganglia-lgpl/pom.xml b/extras/spark-ganglia-lgpl/pom.xml index d27ea1d623..0e6db2a85a 100644 --- a/extras/spark-ganglia-lgpl/pom.xml +++ b/extras/spark-ganglia-lgpl/pom.xml @@ -20,13 +20,13 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.2.0</version> + <version>1.2.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> diff --git a/graphx/pom.xml b/graphx/pom.xml index 8c8acbf903..ff445aeeb0 100644 --- a/graphx/pom.xml +++ b/graphx/pom.xml @@ -21,12 +21,12 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.2.0</version> + <version>1.2.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> diff --git a/mllib/pom.xml b/mllib/pom.xml index 391318803f..4a00c2eecc 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -21,12 +21,12 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.2.0</version> + <version>1.2.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> diff --git a/network/common/pom.xml b/network/common/pom.xml index 169cc640be..3c86902411 100644 --- a/network/common/pom.xml +++ b/network/common/pom.xml @@ -22,12 +22,12 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.2.0</version> + <version>1.2.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> diff --git a/network/shuffle/pom.xml b/network/shuffle/pom.xml index dea25a26e4..90bf498d10 100644 --- a/network/shuffle/pom.xml +++ b/network/shuffle/pom.xml @@ -22,12 +22,12 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.2.0</version> + <version>1.2.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> diff --git a/network/yarn/pom.xml b/network/yarn/pom.xml index cc8e828867..8bcb2816d5 100644 --- a/network/yarn/pom.xml +++ b/network/yarn/pom.xml @@ -22,12 +22,12 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.2.0</version> + <version>1.2.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> @@ -26,7 +26,7 @@ </parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.2.0</version> + <version>1.2.1-SNAPSHOT</version> <packaging>pom</packaging> <name>Spark Project Parent POM</name> <url>http://spark.apache.org/</url> @@ -418,7 +418,7 @@ <dependency> <groupId>net.jpountz.lz4</groupId> <artifactId>lz4</artifactId> - <version>1.2.0</version> + <version>1.2.1-SNAPSHOT</version> </dependency> <dependency> <groupId>com.clearspring.analytics</groupId> diff --git a/repl/pom.xml b/repl/pom.xml index 36de77a728..b72ccb66c6 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -21,12 +21,12 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.2.0</version> + <version>1.2.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-repl_2.10</artifactId> + <artifactId>spark-repl_2.11</artifactId> <packaging>jar</packaging> <name>Spark Project REPL</name> <url>http://spark.apache.org/</url> diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml index ac03869e77..eddd8da6b2 100644 --- a/sql/catalyst/pom.xml +++ b/sql/catalyst/pom.xml @@ -22,12 +22,12 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.2.0</version> + <version>1.2.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-catalyst_2.10</artifactId> + <artifactId>spark-catalyst_2.11</artifactId> <packaging>jar</packaging> <name>Spark Project Catalyst</name> <url>http://spark.apache.org/</url> diff --git a/sql/core/pom.xml b/sql/core/pom.xml index 4a065d34ed..307fd234d7 100644 --- a/sql/core/pom.xml +++ b/sql/core/pom.xml @@ -22,12 +22,12 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.2.0</version> + <version>1.2.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-sql_2.10</artifactId> + <artifactId>spark-sql_2.11</artifactId> <packaging>jar</packaging> <name>Spark Project SQL</name> <url>http://spark.apache.org/</url> diff --git a/sql/hive-thriftserver/pom.xml b/sql/hive-thriftserver/pom.xml index 54fd6e4e6d..0a4d3229ec 100644 --- a/sql/hive-thriftserver/pom.xml +++ b/sql/hive-thriftserver/pom.xml @@ -22,12 +22,12 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.2.0</version> + <version>1.2.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-hive-thriftserver_2.10</artifactId> + <artifactId>spark-hive-thriftserver_2.11</artifactId> <packaging>jar</packaging> <name>Spark Project Hive Thrift Server</name> <url>http://spark.apache.org/</url> diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml index b150ff8c5c..b19c4cf803 100644 --- a/sql/hive/pom.xml +++ b/sql/hive/pom.xml @@ -22,12 +22,12 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.2.0</version> + <version>1.2.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-hive_2.10</artifactId> + <artifactId>spark-hive_2.11</artifactId> <packaging>jar</packaging> <name>Spark Project Hive</name> <url>http://spark.apache.org/</url> diff --git a/streaming/pom.xml b/streaming/pom.xml index 601bd01977..6ee75c8a6d 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -21,12 +21,12 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.2.0</version> + <version>1.2.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-streaming_2.10</artifactId> + <artifactId>spark-streaming_2.11</artifactId> <properties> <sbt.project.name>streaming</sbt.project.name> </properties> diff --git a/tools/pom.xml b/tools/pom.xml index a07f888a1d..2b31d68ab4 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,12 +20,12 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.2.0</version> + <version>1.2.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-tools_2.10</artifactId> + <artifactId>spark-tools_2.11</artifactId> <properties> <sbt.project.name>tools</sbt.project.name> </properties> diff --git a/yarn/alpha/pom.xml b/yarn/alpha/pom.xml index 2f7f98bac8..46df028395 100644 --- a/yarn/alpha/pom.xml +++ b/yarn/alpha/pom.xml @@ -19,8 +19,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>yarn-parent_2.10</artifactId> - <version>1.2.0</version> + <artifactId>yarn-parent_2.11</artifactId> + <version>1.2.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <properties> @@ -28,7 +28,7 @@ </properties> <groupId>org.apache.spark</groupId> - <artifactId>spark-yarn-alpha_2.10</artifactId> + <artifactId>spark-yarn-alpha_2.11</artifactId> <packaging>jar</packaging> <name>Spark Project YARN Alpha API</name> diff --git a/yarn/pom.xml b/yarn/pom.xml index 7ab7154545..6383770e65 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -20,12 +20,12 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.2.0</version> + <version>1.2.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>yarn-parent_2.10</artifactId> + <artifactId>yarn-parent_2.11</artifactId> <packaging>pom</packaging> <name>Spark Project YARN Parent POM</name> <properties> diff --git a/yarn/stable/pom.xml b/yarn/stable/pom.xml index 7c5499bf6d..3764f4b060 100644 --- a/yarn/stable/pom.xml +++ b/yarn/stable/pom.xml @@ -19,8 +19,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>yarn-parent_2.10</artifactId> - <version>1.2.0</version> + <artifactId>yarn-parent_2.11</artifactId> + <version>1.2.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <properties> @@ -28,7 +28,7 @@ </properties> <groupId>org.apache.spark</groupId> - <artifactId>spark-yarn_2.10</artifactId> + <artifactId>spark-yarn_2.11</artifactId> <packaging>jar</packaging> <name>Spark Project YARN Stable API</name> |