From 0487a233b9057ae400d2e649a39cf14fda011b5a Mon Sep 17 00:00:00 2001
From: Mark Hamstra <markhamstra@gmail.com>
Date: Fri, 9 Oct 2015 10:48:10 -0700
Subject: [PATCH 1/2] Added thriftserver jar to debian package

---
 assembly/pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/assembly/pom.xml b/assembly/pom.xml
index f75bcdb68bbf4..ddb2bfcec61b4 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -322,6 +322,16 @@
                         <prefix>${deb.install.path}/lib</prefix>
                       </mapper>
                     </data>
+                    <data>
+                      <src>${basedir}/../sql/hive-thriftserver/target/spark-hive-thriftserver_${scala.binary.version}-${project.version}.jar</src>
+                      <type>file</type>
+                      <mapper>
+                        <type>perm</type>
+                        <user>${deb.user}</user>
+                        <group>${deb.user}</group>
+                        <prefix>${deb.install.path}/lib</prefix>
+                      </mapper>
+                    </data>
                     <data>
                       <src>${basedir}/../lib_managed/jars</src>
                       <type>directory</type>

From bbc43ed8da4e3bcf231d3b550d0a3fd7ec67ebc9 Mon Sep 17 00:00:00 2001
From: Mark Hamstra <markhamstra@gmail.com>
Date: Fri, 9 Oct 2015 11:04:15 -0700
Subject: [PATCH 2/2] refactored assembly POM

---
 assembly/pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/assembly/pom.xml b/assembly/pom.xml
index ddb2bfcec61b4..3acab67b0f596 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -36,6 +36,8 @@
     <spark.jar.dir>scala-${scala.binary.version}</spark.jar.dir>
     <spark.jar.basename>spark-assembly-${project.version}-hadoop${hadoop.version}.jar</spark.jar.basename>
     <spark.jar>${project.build.directory}/${spark.jar.dir}/${spark.jar.basename}</spark.jar>
+    <thriftserver.target.dir>${basedir}/../sql/hive-thriftserver/target</thriftserver.target.dir>
+    <thriftserver.jar>spark-hive-thriftserver_${scala.binary.version}-${project.version}.jar</thriftserver.jar>
     <deb.pkg.name>spark</deb.pkg.name>
     <deb.install.path>/usr/share/spark</deb.install.path>
     <deb.user>root</deb.user>
@@ -323,7 +325,7 @@
                       </mapper>
                     </data>
                     <data>
-                      <src>${basedir}/../sql/hive-thriftserver/target/spark-hive-thriftserver_${scala.binary.version}-${project.version}.jar</src>
+                      <src>${thriftserver.target.dir}/${thriftserver.jar}</src>
                       <type>file</type>
                       <mapper>
                         <type>perm</type>