From cda381f88cc03340fdf7b2d681699babbae2a56e Mon Sep 17 00:00:00 2001
From: Mark Grover <mark@apache.org>
Date: Wed, 5 Mar 2014 16:52:58 -0800
Subject: 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
---
 assembly/pom.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'assembly/pom.xml')

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>
-- 
cgit v1.2.3