diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-04-07 20:54:18 -0400 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-04-07 20:54:18 -0400 |
| commit | 1cb3eb9762439caea10fe817d9c69c01c3c8fb06 (patch) | |
| tree | 8368349ec0419ded144c26eea8c039ff189d0731 /project/SparkBuild.scala | |
| parent | a1586412d647da1a192259a58b10d50b02f02a9c (diff) | |
| parent | aa9134f72a13cdc1fd1a662ec9389724e8e0e35f (diff) | |
| download | spark-1cb3eb9762439caea10fe817d9c69c01c3c8fb06.tar.gz spark-1cb3eb9762439caea10fe817d9c69c01c3c8fb06.tar.bz2 spark-1cb3eb9762439caea10fe817d9c69c01c3c8fb06.zip | |
Merge remote-tracking branch 'kalpit/master'
Conflicts:
project/SparkBuild.scala
Diffstat (limited to 'project/SparkBuild.scala')
| -rw-r--r-- | project/SparkBuild.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 47c333a4e1..08a6c1866e 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -92,10 +92,10 @@ object SparkBuild extends Build { */ libraryDependencies ++= Seq( - "org.eclipse.jetty" % "jetty-server" % "7.5.3.v20111011", + "org.eclipse.jetty" % "jetty-server" % "7.6.8.v20121106", "org.scalatest" %% "scalatest" % "1.9.1" % "test", "org.scalacheck" %% "scalacheck" % "1.10.0" % "test", - "com.novocode" % "junit-interface" % "0.8" % "test", + "com.novocode" % "junit-interface" % "0.9" % "test", "org.easymock" % "easymock" % "3.1" % "test" ), parallelExecution := false, |