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 | |
| 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')
| -rw-r--r-- | project/SparkBuild.scala | 4 | ||||
| -rw-r--r-- | project/build.properties | 2 | ||||
| -rw-r--r-- | project/plugins.sbt | 6 |
3 files changed, 6 insertions, 6 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, diff --git a/project/build.properties b/project/build.properties index d4287112c6..66ad72ce2e 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.11.3 +sbt.version=0.12.2 diff --git a/project/plugins.sbt b/project/plugins.sbt index 9cea0b5ee4..d4f2442872 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,11 +4,11 @@ resolvers += "Typesafe Repository" at "http://repo.typesafe.com/typesafe/release resolvers += "Spray Repository" at "http://repo.spray.cc/" -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.8.3") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.8.5") -addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.1.0-RC1") +addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.1.1") -addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.0.0") +addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.2.0") addSbtPlugin("io.spray" %% "sbt-twirl" % "0.6.1") |