Repository: spark Updated Branches: refs/heads/branch-1.2 8305e803e -> e1339daec
Revert "Preparing development version 1.2.1-SNAPSHOT" This reverts commit 6c6fd218c83a049c874b8a0ea737333c1899c94a. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/c3fd9aef Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/c3fd9aef Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/c3fd9aef Branch: refs/heads/branch-1.2 Commit: c3fd9aef99134f3f649285c5f013f81b3e8e697e Parents: 8305e80 Author: Patrick Wendell <pwend...@gmail.com> Authored: Sun Nov 16 22:13:29 2014 -0800 Committer: Patrick Wendell <pwend...@gmail.com> Committed: Sun Nov 16 22:13:29 2014 -0800 ---------------------------------------------------------------------- assembly/pom.xml | 4 ++-- bagel/pom.xml | 4 ++-- core/pom.xml | 4 ++-- core/src/main/scala/org/apache/spark/package.scala | 2 +- examples/pom.xml | 4 ++-- external/flume-sink/pom.xml | 4 ++-- external/flume/pom.xml | 4 ++-- external/kafka/pom.xml | 4 ++-- external/mqtt/pom.xml | 4 ++-- external/twitter/pom.xml | 4 ++-- external/zeromq/pom.xml | 4 ++-- extras/java8-tests/pom.xml | 4 ++-- extras/kinesis-asl/pom.xml | 4 ++-- extras/spark-ganglia-lgpl/pom.xml | 4 ++-- graphx/pom.xml | 4 ++-- mllib/pom.xml | 4 ++-- network/common/pom.xml | 4 ++-- network/shuffle/pom.xml | 4 ++-- network/yarn/pom.xml | 4 ++-- pom.xml | 4 ++-- repl/pom.xml | 4 ++-- sql/catalyst/pom.xml | 4 ++-- sql/core/pom.xml | 4 ++-- sql/hive-thriftserver/pom.xml | 4 ++-- sql/hive/pom.xml | 4 ++-- streaming/pom.xml | 4 ++-- tools/pom.xml | 4 ++-- yarn/alpha/pom.xml | 6 +++--- yarn/pom.xml | 4 ++-- yarn/stable/pom.xml | 6 +++--- 30 files changed, 61 insertions(+), 61 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/c3fd9aef/assembly/pom.xml ---------------------------------------------------------------------- diff --git a/assembly/pom.xml b/assembly/pom.xml index 0c79f10..5af17c5 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.1-SNAPSHOT</version> + <version>1.2.0</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-assembly_2.11</artifactId> + <artifactId>spark-assembly_2.10</artifactId> <name>Spark Project Assembly</name> <url>http://spark.apache.org/</url> <packaging>pom</packaging> http://git-wip-us.apache.org/repos/asf/spark/blob/c3fd9aef/bagel/pom.xml ---------------------------------------------------------------------- diff --git a/bagel/pom.xml b/bagel/pom.xml index c968da9..1f43fcc 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.1-SNAPSHOT</version> + <version>1.2.0</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-bagel_2.11</artifactId> + <artifactId>spark-bagel_2.10</artifactId> <properties> <sbt.project.name>bagel</sbt.project.name> </properties> http://git-wip-us.apache.org/repos/asf/spark/blob/c3fd9aef/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 83c0307..15cb382 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.1-SNAPSHOT</version> + <version>1.2.0</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-core_2.11</artifactId> + <artifactId>spark-core_2.10</artifactId> <properties> <sbt.project.name>core</sbt.project.name> </properties> http://git-wip-us.apache.org/repos/asf/spark/blob/c3fd9aef/core/src/main/scala/org/apache/spark/package.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/package.scala b/core/src/main/scala/org/apache/spark/package.scala index b1a511f..873ec3c 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.1-SNAPSHOT" + val SPARK_VERSION = "1.2.0" } http://git-wip-us.apache.org/repos/asf/spark/blob/c3fd9aef/examples/pom.xml ---------------------------------------------------------------------- diff --git a/examples/pom.xml b/examples/pom.xml index 3bc1149..bd3b317 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.1-SNAPSHOT</version> + <version>1.2.0</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-examples_2.11</artifactId> + <artifactId>spark-examples_2.10</artifactId> <properties> <sbt.project.name>examples</sbt.project.name> </properties> http://git-wip-us.apache.org/repos/asf/spark/blob/c3fd9aef/external/flume-sink/pom.xml ---------------------------------------------------------------------- diff --git a/external/flume-sink/pom.xml b/external/flume-sink/pom.xml index 95f8c9e..ff7babc 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.1-SNAPSHOT</version> + <version>1.2.0</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-streaming-flume-sink_2.11</artifactId> + <artifactId>spark-streaming-flume-sink_2.10</artifactId> <properties> <sbt.project.name>streaming-flume-sink</sbt.project.name> </properties> http://git-wip-us.apache.org/repos/asf/spark/blob/c3fd9aef/external/flume/pom.xml ---------------------------------------------------------------------- diff --git a/external/flume/pom.xml b/external/flume/pom.xml index 6b560dd..e3db056 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.1-SNAPSHOT</version> + <version>1.2.0</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-streaming-flume_2.11</artifactId> + <artifactId>spark-streaming-flume_2.10</artifactId> <properties> <sbt.project.name>streaming-flume</sbt.project.name> </properties> http://git-wip-us.apache.org/repos/asf/spark/blob/c3fd9aef/external/kafka/pom.xml ---------------------------------------------------------------------- diff --git a/external/kafka/pom.xml b/external/kafka/pom.xml index f154aca..4e75c85 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.1-SNAPSHOT</version> + <version>1.2.0</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-streaming-kafka_2.11</artifactId> + <artifactId>spark-streaming-kafka_2.10</artifactId> <properties> <sbt.project.name>streaming-kafka</sbt.project.name> </properties> http://git-wip-us.apache.org/repos/asf/spark/blob/c3fd9aef/external/mqtt/pom.xml ---------------------------------------------------------------------- diff --git a/external/mqtt/pom.xml b/external/mqtt/pom.xml index 2478f9c..43cee08 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.1-SNAPSHOT</version> + <version>1.2.0</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-streaming-mqtt_2.11</artifactId> + <artifactId>spark-streaming-mqtt_2.10</artifactId> <properties> <sbt.project.name>streaming-mqtt</sbt.project.name> </properties> http://git-wip-us.apache.org/repos/asf/spark/blob/c3fd9aef/external/twitter/pom.xml ---------------------------------------------------------------------- diff --git a/external/twitter/pom.xml b/external/twitter/pom.xml index b365d0c..80c2240 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.1-SNAPSHOT</version> + <version>1.2.0</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-streaming-twitter_2.11</artifactId> + <artifactId>spark-streaming-twitter_2.10</artifactId> <properties> <sbt.project.name>streaming-twitter</sbt.project.name> </properties> http://git-wip-us.apache.org/repos/asf/spark/blob/c3fd9aef/external/zeromq/pom.xml ---------------------------------------------------------------------- diff --git a/external/zeromq/pom.xml b/external/zeromq/pom.xml index d381d6f..fe529da 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.1-SNAPSHOT</version> + <version>1.2.0</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-streaming-zeromq_2.11</artifactId> + <artifactId>spark-streaming-zeromq_2.10</artifactId> <properties> <sbt.project.name>streaming-zeromq</sbt.project.name> </properties> http://git-wip-us.apache.org/repos/asf/spark/blob/c3fd9aef/extras/java8-tests/pom.xml ---------------------------------------------------------------------- diff --git a/extras/java8-tests/pom.xml b/extras/java8-tests/pom.xml index bd18323..9466e04 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.1-SNAPSHOT</version> + <version>1.2.0</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>java8-tests_2.11</artifactId> + <artifactId>java8-tests_2.10</artifactId> <packaging>pom</packaging> <name>Spark Project Java8 Tests POM</name> http://git-wip-us.apache.org/repos/asf/spark/blob/c3fd9aef/extras/kinesis-asl/pom.xml ---------------------------------------------------------------------- diff --git a/extras/kinesis-asl/pom.xml b/extras/kinesis-asl/pom.xml index bcb6943..c996583 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.1-SNAPSHOT</version> + <version>1.2.0</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.11</artifactId> + <artifactId>spark-streaming-kinesis-asl_2.10</artifactId> <packaging>jar</packaging> <name>Spark Kinesis Integration</name> http://git-wip-us.apache.org/repos/asf/spark/blob/c3fd9aef/extras/spark-ganglia-lgpl/pom.xml ---------------------------------------------------------------------- diff --git a/extras/spark-ganglia-lgpl/pom.xml b/extras/spark-ganglia-lgpl/pom.xml index 0e6db2a..d27ea1d 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.1-SNAPSHOT</version> + <version>1.2.0</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.11</artifactId> + <artifactId>spark-ganglia-lgpl_2.10</artifactId> <packaging>jar</packaging> <name>Spark Ganglia Integration</name> http://git-wip-us.apache.org/repos/asf/spark/blob/c3fd9aef/graphx/pom.xml ---------------------------------------------------------------------- diff --git a/graphx/pom.xml b/graphx/pom.xml index ff445ae..8c8acbf 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.1-SNAPSHOT</version> + <version>1.2.0</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-graphx_2.11</artifactId> + <artifactId>spark-graphx_2.10</artifactId> <properties> <sbt.project.name>graphx</sbt.project.name> </properties> http://git-wip-us.apache.org/repos/asf/spark/blob/c3fd9aef/mllib/pom.xml ---------------------------------------------------------------------- diff --git a/mllib/pom.xml b/mllib/pom.xml index 4a00c2e..3913188 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.1-SNAPSHOT</version> + <version>1.2.0</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-mllib_2.11</artifactId> + <artifactId>spark-mllib_2.10</artifactId> <properties> <sbt.project.name>mllib</sbt.project.name> </properties> http://git-wip-us.apache.org/repos/asf/spark/blob/c3fd9aef/network/common/pom.xml ---------------------------------------------------------------------- diff --git a/network/common/pom.xml b/network/common/pom.xml index 3c86902..169cc64 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.1-SNAPSHOT</version> + <version>1.2.0</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-network-common_2.11</artifactId> + <artifactId>spark-network-common_2.10</artifactId> <packaging>jar</packaging> <name>Spark Project Networking</name> <url>http://spark.apache.org/</url> http://git-wip-us.apache.org/repos/asf/spark/blob/c3fd9aef/network/shuffle/pom.xml ---------------------------------------------------------------------- diff --git a/network/shuffle/pom.xml b/network/shuffle/pom.xml index 90bf498..dea25a2 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.1-SNAPSHOT</version> + <version>1.2.0</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-network-shuffle_2.11</artifactId> + <artifactId>spark-network-shuffle_2.10</artifactId> <packaging>jar</packaging> <name>Spark Project Shuffle Streaming Service</name> <url>http://spark.apache.org/</url> http://git-wip-us.apache.org/repos/asf/spark/blob/c3fd9aef/network/yarn/pom.xml ---------------------------------------------------------------------- diff --git a/network/yarn/pom.xml b/network/yarn/pom.xml index 8bcb281..cc8e828 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.1-SNAPSHOT</version> + <version>1.2.0</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-network-yarn_2.11</artifactId> + <artifactId>spark-network-yarn_2.10</artifactId> <packaging>jar</packaging> <name>Spark Project YARN Shuffle Service</name> <url>http://spark.apache.org/</url> http://git-wip-us.apache.org/repos/asf/spark/blob/c3fd9aef/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4c3dccf..dbb043e 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ </parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.2.0</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.1-SNAPSHOT</version> + <version>1.2.0</version> </dependency> <dependency> <groupId>com.clearspring.analytics</groupId> http://git-wip-us.apache.org/repos/asf/spark/blob/c3fd9aef/repl/pom.xml ---------------------------------------------------------------------- diff --git a/repl/pom.xml b/repl/pom.xml index b72ccb6..36de77a 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.1-SNAPSHOT</version> + <version>1.2.0</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-repl_2.11</artifactId> + <artifactId>spark-repl_2.10</artifactId> <packaging>jar</packaging> <name>Spark Project REPL</name> <url>http://spark.apache.org/</url> http://git-wip-us.apache.org/repos/asf/spark/blob/c3fd9aef/sql/catalyst/pom.xml ---------------------------------------------------------------------- diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml index eddd8da..ac03869 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.1-SNAPSHOT</version> + <version>1.2.0</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-catalyst_2.11</artifactId> + <artifactId>spark-catalyst_2.10</artifactId> <packaging>jar</packaging> <name>Spark Project Catalyst</name> <url>http://spark.apache.org/</url> http://git-wip-us.apache.org/repos/asf/spark/blob/c3fd9aef/sql/core/pom.xml ---------------------------------------------------------------------- diff --git a/sql/core/pom.xml b/sql/core/pom.xml index 307fd23..4a065d3 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.1-SNAPSHOT</version> + <version>1.2.0</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-sql_2.11</artifactId> + <artifactId>spark-sql_2.10</artifactId> <packaging>jar</packaging> <name>Spark Project SQL</name> <url>http://spark.apache.org/</url> http://git-wip-us.apache.org/repos/asf/spark/blob/c3fd9aef/sql/hive-thriftserver/pom.xml ---------------------------------------------------------------------- diff --git a/sql/hive-thriftserver/pom.xml b/sql/hive-thriftserver/pom.xml index 0a4d322..54fd6e4 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.1-SNAPSHOT</version> + <version>1.2.0</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-hive-thriftserver_2.11</artifactId> + <artifactId>spark-hive-thriftserver_2.10</artifactId> <packaging>jar</packaging> <name>Spark Project Hive Thrift Server</name> <url>http://spark.apache.org/</url> http://git-wip-us.apache.org/repos/asf/spark/blob/c3fd9aef/sql/hive/pom.xml ---------------------------------------------------------------------- diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml index b19c4cf..b150ff8 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.1-SNAPSHOT</version> + <version>1.2.0</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-hive_2.11</artifactId> + <artifactId>spark-hive_2.10</artifactId> <packaging>jar</packaging> <name>Spark Project Hive</name> <url>http://spark.apache.org/</url> http://git-wip-us.apache.org/repos/asf/spark/blob/c3fd9aef/streaming/pom.xml ---------------------------------------------------------------------- diff --git a/streaming/pom.xml b/streaming/pom.xml index 6ee75c8..601bd01 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.1-SNAPSHOT</version> + <version>1.2.0</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-streaming_2.11</artifactId> + <artifactId>spark-streaming_2.10</artifactId> <properties> <sbt.project.name>streaming</sbt.project.name> </properties> http://git-wip-us.apache.org/repos/asf/spark/blob/c3fd9aef/tools/pom.xml ---------------------------------------------------------------------- diff --git a/tools/pom.xml b/tools/pom.xml index 2b31d68..a07f888 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.1-SNAPSHOT</version> + <version>1.2.0</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-tools_2.11</artifactId> + <artifactId>spark-tools_2.10</artifactId> <properties> <sbt.project.name>tools</sbt.project.name> </properties> http://git-wip-us.apache.org/repos/asf/spark/blob/c3fd9aef/yarn/alpha/pom.xml ---------------------------------------------------------------------- diff --git a/yarn/alpha/pom.xml b/yarn/alpha/pom.xml index 46df028..2f7f98b 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.11</artifactId> - <version>1.2.1-SNAPSHOT</version> + <artifactId>yarn-parent_2.10</artifactId> + <version>1.2.0</version> <relativePath>../pom.xml</relativePath> </parent> <properties> @@ -28,7 +28,7 @@ </properties> <groupId>org.apache.spark</groupId> - <artifactId>spark-yarn-alpha_2.11</artifactId> + <artifactId>spark-yarn-alpha_2.10</artifactId> <packaging>jar</packaging> <name>Spark Project YARN Alpha API</name> http://git-wip-us.apache.org/repos/asf/spark/blob/c3fd9aef/yarn/pom.xml ---------------------------------------------------------------------- diff --git a/yarn/pom.xml b/yarn/pom.xml index 6383770..7ab7154 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.1-SNAPSHOT</version> + <version>1.2.0</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>yarn-parent_2.11</artifactId> + <artifactId>yarn-parent_2.10</artifactId> <packaging>pom</packaging> <name>Spark Project YARN Parent POM</name> <properties> http://git-wip-us.apache.org/repos/asf/spark/blob/c3fd9aef/yarn/stable/pom.xml ---------------------------------------------------------------------- diff --git a/yarn/stable/pom.xml b/yarn/stable/pom.xml index 3764f4b..7c5499b 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.11</artifactId> - <version>1.2.1-SNAPSHOT</version> + <artifactId>yarn-parent_2.10</artifactId> + <version>1.2.0</version> <relativePath>../pom.xml</relativePath> </parent> <properties> @@ -28,7 +28,7 @@ </properties> <groupId>org.apache.spark</groupId> - <artifactId>spark-yarn_2.11</artifactId> + <artifactId>spark-yarn_2.10</artifactId> <packaging>jar</packaging> <name>Spark Project YARN Stable API</name> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org