diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2012-06-28 23:51:28 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2012-06-28 23:51:28 -0700 |
| commit | 3920189932e95f78f84ab400e3e779c1601f90f1 (patch) | |
| tree | 451cd1144a25821839037fe0e5b9a5d7e1c446c1 /project | |
| parent | ede615d71965e9aaa0c7019ecb05777f7ca905f2 (diff) | |
| download | spark-3920189932e95f78f84ab400e3e779c1601f90f1.tar.gz spark-3920189932e95f78f84ab400e3e779c1601f90f1.tar.bz2 spark-3920189932e95f78f84ab400e3e779c1601f90f1.zip | |
Upgraded to Akka 2 and fixed test execution (which was still parallel
across projects).
Diffstat (limited to 'project')
| -rw-r--r-- | project/SparkBuild.scala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 985de3cde3..10380e9397 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -33,7 +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, + parallelExecution := 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) } @@ -58,9 +58,9 @@ 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", + "com.typesafe.akka" % "akka-actor" % "2.0.2", + "com.typesafe.akka" % "akka-remote" % "2.0.2", + "com.typesafe.akka" % "akka-slf4j" % "2.0.2", "org.jboss.netty" % "netty" % "3.2.6.Final", "it.unimi.dsi" % "fastutil" % "6.4.4", "colt" % "colt" % "1.2.0" |