diff options
| author | Reynold Xin <rxin@cs.berkeley.edu> | 2013-06-01 00:48:27 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@cs.berkeley.edu> | 2013-06-01 00:48:27 -0700 |
| commit | b0403d3f2bf53755b654be61cf8dcce2f9939ce6 (patch) | |
| tree | 142d71f7dc5e5650e1aae3e441ed07fedf401e10 /project/SparkBuild.scala | |
| parent | 0c24305b8dbda5278c2f03d02bbee49e1df5ee44 (diff) | |
| parent | 84530ba6d9fa47ee2863bb50c23742ecfa2a6a64 (diff) | |
| download | spark-b0403d3f2bf53755b654be61cf8dcce2f9939ce6.tar.gz spark-b0403d3f2bf53755b654be61cf8dcce2f9939ce6.tar.bz2 spark-b0403d3f2bf53755b654be61cf8dcce2f9939ce6.zip | |
Merge branch 'master' of github.com:mesos/spark into graph
Conflicts:
run
Diffstat (limited to 'project/SparkBuild.scala')
| -rw-r--r-- | project/SparkBuild.scala | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 78e4652ebc..0728ad7fb6 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -144,7 +144,6 @@ object SparkBuild extends Build { ), libraryDependencies ++= Seq( - "io.netty" % "netty" % "3.5.3.Final", "com.google.guava" % "guava" % "11.0.1", "log4j" % "log4j" % "1.2.16", "org.slf4j" % "slf4j-api" % slf4jVersion, @@ -162,7 +161,9 @@ object SparkBuild extends Build { "cc.spray" % "spray-can" % "1.0-M2.1" excludeAll(excludeNetty), "cc.spray" % "spray-server" % "1.0-M2.1" excludeAll(excludeNetty), "cc.spray" % "spray-json_2.9.2" % "1.1.1" excludeAll(excludeNetty), - "org.apache.mesos" % "mesos" % "0.9.0-incubating" + "org.apache.mesos" % "mesos" % "0.9.0-incubating", + "io.netty" % "netty-all" % "4.0.0.Beta2", + "org.apache.derby" % "derby" % "10.4.2.0" % "test" ) ++ ( if (HADOOP_MAJOR_VERSION == "2") { if (HADOOP_YARN) { |