aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorShivaram Venkataraman <shivaram@eecs.berkeley.edu>2013-07-30 14:03:15 -0700
committerShivaram Venkataraman <shivaram@eecs.berkeley.edu>2013-07-30 14:03:15 -0700
commit48851d4dd90184fdeee836caef5ad77b0dc643be (patch)
tree878ea4c714a5b2f34f85e9b7239ecdd1e8e0be9c /project
parent8aee11821673d4822dbc79bddd1da53696216108 (diff)
downloadspark-48851d4dd90184fdeee836caef5ad77b0dc643be.tar.gz
spark-48851d4dd90184fdeee836caef5ad77b0dc643be.tar.bz2
spark-48851d4dd90184fdeee836caef5ad77b0dc643be.zip
Add bagel, mllib to SBT assembly.
Also add jblas dependency to mllib pom.xml
Diffstat (limited to 'project')
-rw-r--r--project/SparkBuild.scala6
1 files changed, 4 insertions, 2 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 9920e00a67..0fdd291aac 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -242,14 +242,16 @@ object SparkBuild extends Build {
name := "spark-tools"
)
- def bagelSettings = sharedSettings ++ Seq(name := "spark-bagel")
+ def bagelSettings = sharedSettings ++ Seq(
+ name := "spark-bagel"
+ ) ++ assemblySettings ++ extraAssemblySettings
def mllibSettings = sharedSettings ++ Seq(
name := "spark-mllib",
libraryDependencies ++= Seq(
"org.jblas" % "jblas" % "1.2.3"
)
- )
+ ) ++ assemblySettings ++ extraAssemblySettings
def streamingSettings = sharedSettings ++ Seq(
name := "spark-streaming",