Repository: spark
Updated Branches:
  refs/heads/branch-1.0 f9fdf32c0 -> cefc6404a


Optionally include Hive as a dependency of the REPL.

Due to the way spark-shell launches from an assembly jar, I don't think this 
change will affect anyone who isn't trying to launch the shell directly from 
sbt.  That said, it is kinda nice to be able to launch all things directly from 
SBT when developing.

Author: Michael Armbrust <[email protected]>

Closes #801 from marmbrus/hiveRepl and squashes the following commits:

9570571 [Michael Armbrust] Optionally include Hive as a dependency of the REPL.

(cherry picked from commit 7463cd248f81975bce9ff864002932864bd5b649)
Signed-off-by: Aaron Davidson <[email protected]>


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/cefc6404
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/cefc6404
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/cefc6404

Branch: refs/heads/branch-1.0
Commit: cefc6404abb9864f36740870970ea1ceea2646d0
Parents: f9fdf32
Author: Michael Armbrust <[email protected]>
Authored: Sat May 31 12:24:35 2014 -0700
Committer: Aaron Davidson <[email protected]>
Committed: Sat May 31 12:24:50 2014 -0700

----------------------------------------------------------------------
 project/SparkBuild.scala | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/cefc6404/project/SparkBuild.scala
----------------------------------------------------------------------
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 0c67c49..e4baf35 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -59,8 +59,10 @@ object SparkBuild extends Build {
 
   lazy val core = Project("core", file("core"), settings = coreSettings)
 
+  def replDependencies = Seq[ProjectReference](core, graphx, bagel, mllib, 
sql) ++ maybeHiveRef
+
   lazy val repl = Project("repl", file("repl"), settings = replSettings)
-    .dependsOn(core, graphx, bagel, mllib, sql)
+    .dependsOn(replDependencies.map(a => a: 
sbt.ClasspathDep[sbt.ProjectReference]): _*)
 
   lazy val tools = Project("tools", file("tools"), settings = toolsSettings) 
dependsOn(core) dependsOn(streaming)
 

Reply via email to