Repository: spark
Updated Branches:
refs/heads/branch-0.9 7ea89ec45 -> 0fc0fdb12
SPARK-1184: Update the distribution tar.gz to include spark-assembly jar
See JIRA for details.
Author: Mark Grover <m...@apache.org>
Closes #78 from markgrover/SPARK-1184 and squashes the following commits:
12b78e6 [Mark Grover] SPARK-1184: Update the distribution tar.gz to include
spark-assembly jar
(cherry picked from commit cda381f88cc03340fdf7b2d681699babbae2a56e)
Conflicts:
assembly/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/0fc0fdb1
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/0fc0fdb1
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/0fc0fdb1
Branch: refs/heads/branch-0.9
Commit: 0fc0fdb127f244edd75e5200a6905fb3185e3b2e
Parents: 7ea89ec
Author: Mark Grover <m...@apache.org>
Authored: Wed Mar 5 16:52:58 2014 -0800
Committer: Patrick Wendell <pwend...@gmail.com>
Committed: Wed Mar 5 16:55:36 2014 -0800
----------------------------------------------------------------------
assembly/pom.xml | 7 +++++--
assembly/src/main/assembly/assembly.xml | 11 +++++++++++
2 files changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/0fc0fdb1/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 3303d32..5273309 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -28,10 +28,13 @@
<groupId>org.apache.spark</groupId>
<artifactId>spark-assembly_2.10</artifactId>
<name>Spark Project Assembly</name>
- <url>http://spark.incubator.apache.org/</url>
+ <url>http://spark.apache.org/</url>
+ <packaging>pom</packaging>
<properties>
-
<spark.jar>${project.build.directory}/scala-${scala.binary.version}/${project.artifactId}-${project.version}-hadoop${hadoop.version}.jar</spark.jar>
+ <spark.jar.dir>scala-${scala.binary.version}</spark.jar.dir>
+
<spark.jar.basename>${project.artifactId}-${project.version}-hadoop${hadoop.version}.jar</spark.jar.basename>
+
<spark.jar>${project.build.directory}/${spark.jar.dir}/${spark.jar.basename}</spark.jar>
<deb.pkg.name>spark</deb.pkg.name>
<deb.install.path>/usr/share/spark</deb.install.path>
<deb.user>root</deb.user>
http://git-wip-us.apache.org/repos/asf/spark/blob/0fc0fdb1/assembly/src/main/assembly/assembly.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/assembly/assembly.xml
b/assembly/src/main/assembly/assembly.xml
index 6af383d..7111563 100644
--- a/assembly/src/main/assembly/assembly.xml
+++ b/assembly/src/main/assembly/assembly.xml
@@ -55,6 +55,15 @@
<include>**/*</include>
</includes>
</fileSet>
+ <fileSet>
+ <directory>
+ ${project.parent.basedir}/assembly/target/${spark.jar.dir}
+ </directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>${spark.jar.basename}</include>
+ </includes>
+ </fileSet>
</fileSets>
<dependencySets>
@@ -75,6 +84,8 @@
<excludes>
<exclude>org.apache.hadoop:*:jar</exclude>
<exclude>org.apache.spark:*:jar</exclude>
+ <exclude>org.apache.zookeeper:*:jar</exclude>
+ <exclude>org.apache.avro:*:jar</exclude>
</excludes>
</dependencySet>
</dependencySets>
