From 80889110aad54866f113b18f206694148f715a05 Mon Sep 17 00:00:00 2001 From: Patrick Wendell <pwendell@gmail.com> Date: Fri, 16 May 2014 23:10:53 -0700 Subject: [PATCH] Revert "[maven-release-plugin] prepare release v1.0.0-rc8" This reverts commit 80eea0f111c06260ffaa780d2f3f7facd09c17bc. --- assembly/pom.xml | 6 +++--- bagel/pom.xml | 2 +- core/pom.xml | 2 +- examples/pom.xml | 2 +- external/flume/pom.xml | 2 +- external/kafka/pom.xml | 2 +- external/mqtt/pom.xml | 2 +- external/twitter/pom.xml | 2 +- external/zeromq/pom.xml | 2 +- extras/spark-ganglia-lgpl/pom.xml | 2 +- graphx/pom.xml | 2 +- mllib/pom.xml | 2 +- pom.xml | 4 ++-- repl/pom.xml | 2 +- sql/catalyst/pom.xml | 2 +- sql/core/pom.xml | 2 +- sql/hive/pom.xml | 2 +- streaming/pom.xml | 2 +- tools/pom.xml | 2 +- yarn/pom.xml | 2 +- yarn/stable/pom.xml | 2 +- 21 files changed, 24 insertions(+), 24 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 79b1b1f0e0..abd8935339 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.0.0</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -122,8 +122,8 @@ <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> <resource>log4j.properties</resource> </transformer> - <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" /> - <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer" /> + <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/> + <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"/> </transformers> </configuration> </execution> diff --git a/bagel/pom.xml b/bagel/pom.xml index 08932bbb17..355f437c5b 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.0.0</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/core/pom.xml b/core/pom.xml index 3e226419b5..bab50f5ce2 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.0.0</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/examples/pom.xml b/examples/pom.xml index 006757a1ed..874bcd7916 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.0.0</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/external/flume/pom.xml b/external/flume/pom.xml index 3ba984eee1..6aec215687 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.0.0</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/external/kafka/pom.xml b/external/kafka/pom.xml index cb4dd47a0c..979eb0ca62 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.0.0</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/external/mqtt/pom.xml b/external/mqtt/pom.xml index b10916d4d6..7b2dc5ba1d 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.0.0</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/external/twitter/pom.xml b/external/twitter/pom.xml index f33b583c3c..5766d3a0d4 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.0.0</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/external/zeromq/pom.xml b/external/zeromq/pom.xml index a137112563..4ed4196bd8 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.0.0</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/extras/spark-ganglia-lgpl/pom.xml b/extras/spark-ganglia-lgpl/pom.xml index 86d893d5b9..11ac827ed5 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.0.0</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/graphx/pom.xml b/graphx/pom.xml index 2a07d8a48c..dc108d2fe7 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.0.0</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/mllib/pom.xml b/mllib/pom.xml index 3b5c7e8121..cdd33dbb79 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.0.0</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/pom.xml b/pom.xml index 3b59091ca0..41be1a937e 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ </parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.0.0</version> + <version>1.0.0-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.0.0-rc8</tag> + <tag>HEAD</tag> </scm> <developers> <developer> diff --git a/repl/pom.xml b/repl/pom.xml index debf058891..b761a176ce 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.0.0</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml index 903001de74..615ce810c2 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.0.0</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/sql/core/pom.xml b/sql/core/pom.xml index b7b7b58711..25a5b92440 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.0.0</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml index 4ba82def29..41a974fafe 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.0.0</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/streaming/pom.xml b/streaming/pom.xml index f48ff8f9ea..6435224a14 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.0.0</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/tools/pom.xml b/tools/pom.xml index 7e8f2d3385..1875c497bc 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.0.0</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/yarn/pom.xml b/yarn/pom.xml index 5b2fcea2ec..6993c89525 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.0.0</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/yarn/stable/pom.xml b/yarn/stable/pom.xml index b12b591d72..0780f251b5 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.0.0</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> -- GitLab