diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-04-07 17:15:10 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-04-07 17:15:10 -0700 |
| commit | 4b301902f5f3eb99a3584c0b8fb295f287ffac00 (patch) | |
| tree | 6656c379f1b43e086b246b0a2acd27d0724f7a91 /project | |
| parent | dfe98ca798d84e6847330012f1332d9271156534 (diff) | |
| parent | 5555811bd54ddb84bce11d4ab04b1f818c221a14 (diff) | |
| download | spark-4b301902f5f3eb99a3584c0b8fb295f287ffac00.tar.gz spark-4b301902f5f3eb99a3584c0b8fb295f287ffac00.tar.bz2 spark-4b301902f5f3eb99a3584c0b8fb295f287ffac00.zip | |
Merge pull request #554 from andyk/scala2.9.3
Fixes SPARK-723 - Update build to Scala 2.9.3
Diffstat (limited to 'project')
| -rw-r--r-- | project/SparkBuild.scala | 8 | ||||
| -rw-r--r-- | project/plugins.sbt | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 5f378b2398..b54fa1ebf8 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -36,7 +36,7 @@ object SparkBuild extends Build { def sharedSettings = Defaults.defaultSettings ++ Seq( organization := "org.spark-project", version := "0.7.1-SNAPSHOT", - scalaVersion := "2.9.2", + scalaVersion := "2.9.3", scalacOptions := Seq("-unchecked", "-optimize", "-deprecation"), unmanagedJars in Compile <<= baseDirectory map { base => (base / "lib" ** "*.jar").classpath }, retrieveManaged := true, @@ -93,8 +93,8 @@ object SparkBuild extends Build { libraryDependencies ++= Seq( "org.eclipse.jetty" % "jetty-server" % "7.5.3.v20111011", - "org.scalatest" %% "scalatest" % "1.8" % "test", - "org.scalacheck" %% "scalacheck" % "1.9" % "test", + "org.scalatest" %% "scalatest" % "1.9.1" % "test", + "org.scalacheck" %% "scalacheck" % "1.10.0" % "test", "com.novocode" % "junit-interface" % "0.8" % "test", "org.easymock" % "easymock" % "3.1" % "test" ), @@ -140,7 +140,7 @@ object SparkBuild extends Build { "colt" % "colt" % "1.2.0", "cc.spray" % "spray-can" % "1.0-M2.1", "cc.spray" % "spray-server" % "1.0-M2.1", - "cc.spray" %% "spray-json" % "1.1.1", + "cc.spray" % "spray-json_2.9.2" % "1.1.1", "org.apache.mesos" % "mesos" % "0.9.0-incubating" ) ++ (if (HADOOP_MAJOR_VERSION == "2") Some("org.apache.hadoop" % "hadoop-client" % HADOOP_VERSION) else None).toSeq, unmanagedSourceDirectories in Compile <+= baseDirectory{ _ / ("src/hadoop" + HADOOP_MAJOR_VERSION + "/scala") } diff --git a/project/plugins.sbt b/project/plugins.sbt index 4d0e696a11..9cea0b5ee4 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -10,7 +10,7 @@ addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.1.0-RC1") addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.0.0") -addSbtPlugin("cc.spray" %% "sbt-twirl" % "0.5.2") +addSbtPlugin("io.spray" %% "sbt-twirl" % "0.6.1") // For Sonatype publishing //resolvers += Resolver.url("sbt-plugin-releases", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases/"))(Resolver.ivyStylePatterns) |