Repository: spark Updated Branches: refs/heads/master 51ca7bd70 -> cda381f88
SPARK-1184: Update the distribution tar.gz to include spark-assembly jar See JIRA for details. Author: Mark Grover <[email protected]> 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 Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/cda381f8 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/cda381f8 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/cda381f8 Branch: refs/heads/master Commit: cda381f88cc03340fdf7b2d681699babbae2a56e Parents: 51ca7bd Author: Mark Grover <[email protected]> Authored: Wed Mar 5 16:52:58 2014 -0800 Committer: Patrick Wendell <[email protected]> Committed: Wed Mar 5 16:52:58 2014 -0800 ---------------------------------------------------------------------- assembly/pom.xml | 5 ++++- assembly/src/main/assembly/assembly.xml | 11 +++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/cda381f8/assembly/pom.xml ---------------------------------------------------------------------- diff --git a/assembly/pom.xml b/assembly/pom.xml index 7ce3017..82a5985 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> http://git-wip-us.apache.org/repos/asf/spark/blob/cda381f8/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>
