diff options
author | Andrew Or <andrew@databricks.com> | 2014-11-12 00:08:20 -0800 |
---|---|---|
committer | Andrew Or <andrew@databricks.com> | 2014-11-12 00:08:20 -0800 |
commit | 4ac56796b5cb49bd1002c30f7be5c3b94a836130 (patch) | |
tree | b64a8a6c5d74382267740d01b313c9601aba5430 | |
parent | 9d13735fb5d199bc6e2fb744b689d2f2dcacdb89 (diff) | |
download | spark-4ac56796b5cb49bd1002c30f7be5c3b94a836130.tar.gz spark-4ac56796b5cb49bd1002c30f7be5c3b94a836130.tar.bz2 spark-4ac56796b5cb49bd1002c30f7be5c3b94a836130.zip |
Revert "[maven-release-plugin] prepare release v1.1.1-rc1"
This reverts commit f3e62ffa4ccea62911207b918ef1c23c1f50467f.
Conflicts:
pom.xml
-rw-r--r-- | assembly/pom.xml | 2 | ||||
-rw-r--r-- | bagel/pom.xml | 2 | ||||
-rw-r--r-- | core/pom.xml | 2 | ||||
-rw-r--r-- | examples/pom.xml | 2 | ||||
-rw-r--r-- | external/flume-sink/pom.xml | 2 | ||||
-rw-r--r-- | external/flume/pom.xml | 2 | ||||
-rw-r--r-- | external/kafka/pom.xml | 2 | ||||
-rw-r--r-- | external/mqtt/pom.xml | 2 | ||||
-rw-r--r-- | external/twitter/pom.xml | 2 | ||||
-rw-r--r-- | external/zeromq/pom.xml | 2 | ||||
-rw-r--r-- | extras/kinesis-asl/pom.xml | 2 | ||||
-rw-r--r-- | extras/spark-ganglia-lgpl/pom.xml | 2 | ||||
-rw-r--r-- | graphx/pom.xml | 2 | ||||
-rw-r--r-- | mllib/pom.xml | 2 | ||||
-rw-r--r-- | pom.xml | 4 | ||||
-rw-r--r-- | repl/pom.xml | 2 | ||||
-rw-r--r-- | sql/catalyst/pom.xml | 2 | ||||
-rw-r--r-- | sql/core/pom.xml | 2 | ||||
-rw-r--r-- | sql/hive-thriftserver/pom.xml | 2 | ||||
-rw-r--r-- | sql/hive/pom.xml | 2 | ||||
-rw-r--r-- | streaming/pom.xml | 2 | ||||
-rw-r--r-- | tools/pom.xml | 2 | ||||
-rw-r--r-- | yarn/pom.xml | 2 | ||||
-rw-r--r-- | yarn/stable/pom.xml | 2 |
24 files changed, 25 insertions, 25 deletions
diff --git a/assembly/pom.xml b/assembly/pom.xml index e79d29b999..0531fb7b37 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.1.1</version> + <version>1.1.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/bagel/pom.xml b/bagel/pom.xml index f1c2b2171e..f29540b239 100644 --- a/bagel/pom.xml +++ b/bagel/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.1.1</version> + <version>1.1.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/core/pom.xml b/core/pom.xml index 96effdb711..0b9486fac5 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.1.1</version> + <version>1.1.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/examples/pom.xml b/examples/pom.xml index aa748c6de0..6124cf8552 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.1.1</version> + <version>1.1.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/external/flume-sink/pom.xml b/external/flume-sink/pom.xml index c443eaa238..17d0fe2338 100644 --- a/external/flume-sink/pom.xml +++ b/external/flume-sink/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.1.1</version> + <version>1.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/external/flume/pom.xml b/external/flume/pom.xml index 6d06a2da64..402af35315 100644 --- a/external/flume/pom.xml +++ b/external/flume/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.1.1</version> + <version>1.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/external/kafka/pom.xml b/external/kafka/pom.xml index 09602f6725..5123d05546 100644 --- a/external/kafka/pom.xml +++ b/external/kafka/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.1.1</version> + <version>1.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/external/mqtt/pom.xml b/external/mqtt/pom.xml index 462079cbf2..9c00bfc842 100644 --- a/external/mqtt/pom.xml +++ b/external/mqtt/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.1.1</version> + <version>1.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/external/twitter/pom.xml b/external/twitter/pom.xml index c1628831bf..1b9ef4af0c 100644 --- a/external/twitter/pom.xml +++ b/external/twitter/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.1.1</version> + <version>1.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/external/zeromq/pom.xml b/external/zeromq/pom.xml index 7670646bc6..60292a2683 100644 --- a/external/zeromq/pom.xml +++ b/external/zeromq/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.1.1</version> + <version>1.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/extras/kinesis-asl/pom.xml b/extras/kinesis-asl/pom.xml index 2433818b07..58b995c5e7 100644 --- a/extras/kinesis-asl/pom.xml +++ b/extras/kinesis-asl/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.1.1</version> + <version>1.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/extras/spark-ganglia-lgpl/pom.xml b/extras/spark-ganglia-lgpl/pom.xml index b6f4875f9d..02c9676fb0 100644 --- a/extras/spark-ganglia-lgpl/pom.xml +++ b/extras/spark-ganglia-lgpl/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.1.1</version> + <version>1.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/graphx/pom.xml b/graphx/pom.xml index cb3d09038e..656478583f 100644 --- a/graphx/pom.xml +++ b/graphx/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.1.1</version> + <version>1.1.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/mllib/pom.xml b/mllib/pom.xml index 9443f6118b..74f528f030 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.1.1</version> + <version>1.1.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -25,7 +25,7 @@ </parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.1.1</version> + <version>1.1.1-SNAPSHOT</version> <packaging>pom</packaging> <name>Spark Project Parent POM</name> <url>http://spark.apache.org/</url> @@ -40,7 +40,7 @@ <connection>scm:git:git@github.com:apache/spark.git</connection> <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/spark.git</developerConnection> <url>scm:git:git@github.com:apache/spark.git</url> - <tag>v1.1.1-rc1</tag> + <tag>HEAD</tag> </scm> <developers> <developer> diff --git a/repl/pom.xml b/repl/pom.xml index b0b9196bc7..8748ada36f 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.1.1</version> + <version>1.1.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml index 19ca3044f9..e2356381c0 100644 --- a/sql/catalyst/pom.xml +++ b/sql/catalyst/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.1.1</version> + <version>1.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/sql/core/pom.xml b/sql/core/pom.xml index 148a521d6e..3efea9ab8b 100644 --- a/sql/core/pom.xml +++ b/sql/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.1.1</version> + <version>1.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/sql/hive-thriftserver/pom.xml b/sql/hive-thriftserver/pom.xml index c3c2f552f2..c264ff4ec9 100644 --- a/sql/hive-thriftserver/pom.xml +++ b/sql/hive-thriftserver/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.1.1</version> + <version>1.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml index ff01bc6dc7..1e689e6d6d 100644 --- a/sql/hive/pom.xml +++ b/sql/hive/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.1.1</version> + <version>1.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/streaming/pom.xml b/streaming/pom.xml index 9b56e32764..c0ce0d7c74 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.1.1</version> + <version>1.1.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/tools/pom.xml b/tools/pom.xml index a2bb5af01d..c601fd5fbb 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.1.1</version> + <version>1.1.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/yarn/pom.xml b/yarn/pom.xml index 2fad21bb08..18f27b827f 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.1.1</version> + <version>1.1.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/yarn/stable/pom.xml b/yarn/stable/pom.xml index 74a30ae8a7..2ba3baf0e3 100644 --- a/yarn/stable/pom.xml +++ b/yarn/stable/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>yarn-parent_2.10</artifactId> - <version>1.1.1</version> + <version>1.1.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <properties> |