diff options
| author | Reynold Xin <rxin@cs.berkeley.edu> | 2013-05-14 23:12:00 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@cs.berkeley.edu> | 2013-05-14 23:12:00 -0700 |
| commit | 81ad2fa3319bbe93fae88ce0831a1bc26c0797d2 (patch) | |
| tree | 974342912ce640b4e92ff7a0ab37a9e3d47d88ea /project/SparkBuild.scala | |
| parent | 016ac868303adbffb19165430610869363fa943f (diff) | |
| parent | b16c4896f617f352bb230908b7c08c7c5b028434 (diff) | |
| download | spark-81ad2fa3319bbe93fae88ce0831a1bc26c0797d2.tar.gz spark-81ad2fa3319bbe93fae88ce0831a1bc26c0797d2.tar.bz2 spark-81ad2fa3319bbe93fae88ce0831a1bc26c0797d2.zip | |
Merge branch 'jdbc' of github.com:koeninger/spark
Conflicts:
project/SparkBuild.scala
Diffstat (limited to 'project/SparkBuild.scala')
| -rw-r--r-- | project/SparkBuild.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 190d723435..267008bfa4 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -160,7 +160,8 @@ 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", + "org.apache.derby" % "derby" % "10.4.2.0" % "test" ) ++ ( if (HADOOP_MAJOR_VERSION == "2") { if (HADOOP_YARN) { |