diff options
| author | Mark Grover <mark@apache.org> | 2014-03-05 16:52:58 -0800 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-03-05 16:52:58 -0800 |
| commit | cda381f88cc03340fdf7b2d681699babbae2a56e (patch) | |
| tree | 199af23f1e9406c3d539ad8702187c725b859c95 /assembly | |
| parent | 51ca7bd7038dd5f66327d5b15692a1ccaab42129 (diff) | |
| download | spark-cda381f88cc03340fdf7b2d681699babbae2a56e.tar.gz spark-cda381f88cc03340fdf7b2d681699babbae2a56e.tar.bz2 spark-cda381f88cc03340fdf7b2d681699babbae2a56e.zip | |
SPARK-1184: Update the distribution tar.gz to include spark-assembly jar
See JIRA for details.
Author: Mark Grover <mark@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
Diffstat (limited to 'assembly')
| -rw-r--r-- | assembly/pom.xml | 5 | ||||
| -rw-r--r-- | assembly/src/main/assembly/assembly.xml | 11 |
2 files changed, 15 insertions, 1 deletions
diff --git a/assembly/pom.xml b/assembly/pom.xml index 7ce30179e9..82a5985504 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -29,9 +29,12 @@ <artifactId>spark-assembly_2.10</artifactId> <name>Spark Project Assembly</name> <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> diff --git a/assembly/src/main/assembly/assembly.xml b/assembly/src/main/assembly/assembly.xml index 6af383db65..711156337b 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> |