From 63051dd2bcc4bf09d413ff7cf89a37967edc33ba Mon Sep 17 00:00:00 2001 From: Matei Zaharia Date: Thu, 7 Jun 2012 00:25:47 -0700 Subject: Merge in engine improvements from the Spark Streaming project, developed jointly with Tathagata Das and Haoyuan Li. This commit imports the changes and ports them to Mesos 0.9, but does not yet pass unit tests due to various classes not supporting a graceful stop() yet. --- project/SparkBuild.scala | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'project/SparkBuild.scala') diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 08c5a990b4..a2faf7399c 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -33,6 +33,7 @@ object SparkBuild extends Build { "org.scalatest" %% "scalatest" % "1.6.1" % "test", "org.scala-tools.testing" %% "scalacheck" % "1.9" % "test" ), + parallelExecution in Test := false, /* Workaround for issue #206 (fixed after SBT 0.11.0) */ watchTransitiveSources <<= Defaults.inDependencies[Task[Seq[File]]](watchSources.task, const(std.TaskExtra.constant(Nil)), aggregate = true, includeRoot = true) apply { _.join.map(_.flatten) } @@ -57,8 +58,12 @@ object SparkBuild extends Build { "asm" % "asm-all" % "3.3.1", "com.google.protobuf" % "protobuf-java" % "2.4.1", "de.javakaffee" % "kryo-serializers" % "0.9", + "se.scalablesolutions.akka" % "akka-actor" % "1.3.1", + "se.scalablesolutions.akka" % "akka-remote" % "1.3.1", + "se.scalablesolutions.akka" % "akka-slf4j" % "1.3.1", "org.jboss.netty" % "netty" % "3.2.6.Final", - "it.unimi.dsi" % "fastutil" % "6.4.2" + "it.unimi.dsi" % "fastutil" % "6.4.4", + "colt" % "colt" % "1.2.0" ) ) ++ assemblySettings ++ Seq(test in assembly := {}) @@ -68,8 +73,7 @@ object SparkBuild extends Build { ) ++ assemblySettings ++ Seq(test in assembly := {}) def examplesSettings = sharedSettings ++ Seq( - name := "spark-examples", - libraryDependencies += "colt" % "colt" % "1.2.0" + name := "spark-examples" ) def bagelSettings = sharedSettings ++ Seq(name := "spark-bagel") -- cgit v1.2.3