aboutsummaryrefslogtreecommitdiff
path: root/assembly
diff options
context:
space:
mode:
authorPatrick Wendell <pwendell@gmail.com>2014-08-28 17:18:28 -0700
committerPatrick Wendell <pwendell@gmail.com>2014-08-28 17:18:28 -0700
commitfb2b40a52f3cf1a6c638d84951119aeb2c61b29d (patch)
tree041c68864e51dc259028270e120a2e472a05481f /assembly
parent587dff2133945e07bb0e3f0a3b4746f337187bbe (diff)
downloadspark-fb2b40a52f3cf1a6c638d84951119aeb2c61b29d.tar.gz
spark-fb2b40a52f3cf1a6c638d84951119aeb2c61b29d.tar.bz2
spark-fb2b40a52f3cf1a6c638d84951119aeb2c61b29d.zip
Revert "[maven-release-plugin] prepare release v1.1.0-rc1"
This reverts commit f07183249b74dd857069028bf7d570b35f265585.
Diffstat (limited to 'assembly')
-rw-r--r--assembly/pom.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 799f8d9b3c..9fbb037115 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.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -124,8 +124,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>