aboutsummaryrefslogtreecommitdiff
path: root/assembly
diff options
context:
space:
mode:
authorPatrick Wendell <pwendell@gmail.com>2014-08-29 15:55:30 -0700
committerPatrick Wendell <pwendell@gmail.com>2014-08-29 15:55:30 -0700
commitc4b7ec8dd8d63255451acf7e62383217f1f63bdc (patch)
tree5dc1b5ca51283b5aa0727f93bb167c37b5b22885 /assembly
parent926f171c90d9c3cb83e99c31bccf79c21bd6f5e0 (diff)
downloadspark-c4b7ec8dd8d63255451acf7e62383217f1f63bdc.tar.gz
spark-c4b7ec8dd8d63255451acf7e62383217f1f63bdc.tar.bz2
spark-c4b7ec8dd8d63255451acf7e62383217f1f63bdc.zip
Revert "[maven-release-plugin] prepare release v1.1.0-rc2"
This reverts commit 711aebb329ca28046396af1e34395a0df92b5327.
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>