aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--assembly/pom.xml4
-rw-r--r--bagel/pom.xml4
-rw-r--r--core/pom.xml4
-rw-r--r--core/src/main/scala/org/apache/spark/package.scala2
-rw-r--r--examples/pom.xml4
-rw-r--r--external/flume-sink/pom.xml4
-rw-r--r--external/flume/pom.xml4
-rw-r--r--external/kafka/pom.xml4
-rw-r--r--external/mqtt/pom.xml4
-rw-r--r--external/twitter/pom.xml4
-rw-r--r--external/zeromq/pom.xml4
-rw-r--r--extras/java8-tests/pom.xml4
-rw-r--r--extras/kinesis-asl/pom.xml4
-rw-r--r--extras/spark-ganglia-lgpl/pom.xml4
-rw-r--r--graphx/pom.xml4
-rw-r--r--mllib/pom.xml4
-rw-r--r--network/common/pom.xml4
-rw-r--r--network/shuffle/pom.xml4
-rw-r--r--network/yarn/pom.xml4
-rw-r--r--pom.xml4
-rw-r--r--repl/pom.xml4
-rw-r--r--sql/catalyst/pom.xml4
-rw-r--r--sql/core/pom.xml4
-rw-r--r--sql/hive-thriftserver/pom.xml4
-rw-r--r--sql/hive/pom.xml4
-rw-r--r--streaming/pom.xml4
-rw-r--r--tools/pom.xml4
-rw-r--r--yarn/alpha/pom.xml6
-rw-r--r--yarn/pom.xml4
-rw-r--r--yarn/stable/pom.xml6
30 files changed, 61 insertions, 61 deletions
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 0c79f10ab2..5af17c5847 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>
diff --git a/bagel/pom.xml b/bagel/pom.xml
index c968da9646..1f43fcc2c3 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>
diff --git a/core/pom.xml b/core/pom.xml
index 83c03076de..15cb382888 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>
diff --git a/core/src/main/scala/org/apache/spark/package.scala b/core/src/main/scala/org/apache/spark/package.scala
index b1a511f76c..873ec3c8fa 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"
}
diff --git a/examples/pom.xml b/examples/pom.xml
index 3bc1149e3d..bd3b317ecb 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>
diff --git a/external/flume-sink/pom.xml b/external/flume-sink/pom.xml
index 95f8c9e813..ff7babcd90 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>
diff --git a/external/flume/pom.xml b/external/flume/pom.xml
index 6b560dd643..e3db056ee5 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>
diff --git a/external/kafka/pom.xml b/external/kafka/pom.xml
index f154acaae3..4e75c85a8c 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>
diff --git a/external/mqtt/pom.xml b/external/mqtt/pom.xml
index 2478f9c2ab..43cee08993 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>
diff --git a/external/twitter/pom.xml b/external/twitter/pom.xml
index b365d0c2d4..80c2240060 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>
diff --git a/external/zeromq/pom.xml b/external/zeromq/pom.xml
index d381d6fe92..fe529daf5a 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>
diff --git a/extras/java8-tests/pom.xml b/extras/java8-tests/pom.xml
index bd18323848..9466e048a0 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>
diff --git a/extras/kinesis-asl/pom.xml b/extras/kinesis-asl/pom.xml
index bcb694328e..c9965832f1 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>
diff --git a/extras/spark-ganglia-lgpl/pom.xml b/extras/spark-ganglia-lgpl/pom.xml
index 0e6db2a85a..d27ea1d623 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>
diff --git a/graphx/pom.xml b/graphx/pom.xml
index ff445aeeb0..8c8acbf903 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>
diff --git a/mllib/pom.xml b/mllib/pom.xml
index 4a00c2eecc..391318803f 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>
diff --git a/network/common/pom.xml b/network/common/pom.xml
index 3c86902411..169cc640be 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>
diff --git a/network/shuffle/pom.xml b/network/shuffle/pom.xml
index 90bf498d10..dea25a26e4 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>
diff --git a/network/yarn/pom.xml b/network/yarn/pom.xml
index 8bcb2816d5..cc8e828867 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>
diff --git a/pom.xml b/pom.xml
index 4c3dccf2fc..dbb043e4fc 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>
diff --git a/repl/pom.xml b/repl/pom.xml
index b72ccb66c6..36de77a728 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>
diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml
index eddd8da6b2..ac03869e77 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>
diff --git a/sql/core/pom.xml b/sql/core/pom.xml
index 307fd234d7..4a065d34ed 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>
diff --git a/sql/hive-thriftserver/pom.xml b/sql/hive-thriftserver/pom.xml
index 0a4d3229ec..54fd6e4e6d 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>
diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml
index b19c4cf803..b150ff8c5c 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>
diff --git a/streaming/pom.xml b/streaming/pom.xml
index 6ee75c8a6d..601bd01977 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>
diff --git a/tools/pom.xml b/tools/pom.xml
index 2b31d68ab4..a07f888a1d 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>
diff --git a/yarn/alpha/pom.xml b/yarn/alpha/pom.xml
index 46df028395..2f7f98bac8 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>
diff --git a/yarn/pom.xml b/yarn/pom.xml
index 6383770e65..7ab7154545 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>
diff --git a/yarn/stable/pom.xml b/yarn/stable/pom.xml
index 3764f4b060..7c5499bf6d 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>
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-29 11:47:38 +0000