diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-07-06 15:51:41 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-07-06 15:51:41 -0700 |
| commit | 1ffadb2d9e87169ccc406cd34dab6bd7beda70f1 (patch) | |
| tree | cb5439f40df3865ec71d285700e377d9d5822c7d /project | |
| parent | 94871e4703d8566359a405da58c60f411b14857a (diff) | |
| parent | 37abe84212c6dad6fb87a3b47666d6a3c14c1f66 (diff) | |
| download | spark-1ffadb2d9e87169ccc406cd34dab6bd7beda70f1.tar.gz spark-1ffadb2d9e87169ccc406cd34dab6bd7beda70f1.tar.bz2 spark-1ffadb2d9e87169ccc406cd34dab6bd7beda70f1.zip | |
Merge remote-tracking branch 'pwendell/ui-updates'
Conflicts:
core/src/main/scala/spark/scheduler/DAGScheduler.scala
core/src/main/scala/spark/util/AkkaUtils.scala
pom.xml
Diffstat (limited to 'project')
| -rw-r--r-- | project/SparkBuild.scala | 7 | ||||
| -rw-r--r-- | project/plugins.sbt | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index c487f34d4a..700fa4c250 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -4,7 +4,6 @@ import sbt.Classpaths.publishTask import Keys._ import sbtassembly.Plugin._ import AssemblyKeys._ -import twirl.sbt.TwirlPlugin._ // For Sonatype publishing //import com.jsuereth.pgp.sbtplugin.PgpKeys._ @@ -158,9 +157,7 @@ object SparkBuild extends Build { "com.typesafe.akka" % "akka-slf4j" % "2.0.3" excludeAll(excludeNetty), "it.unimi.dsi" % "fastutil" % "6.4.4", "colt" % "colt" % "1.2.0", - "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), + "net.liftweb" % "lift-json_2.9.2" % "2.5", "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" @@ -190,7 +187,7 @@ object SparkBuild extends Build { "src/hadoop" + HADOOP_MAJOR_VERSION + "/scala" } ) } - ) ++ assemblySettings ++ extraAssemblySettings ++ Twirl.settings + ) ++ assemblySettings ++ extraAssemblySettings def rootSettings = sharedSettings ++ Seq( publish := {} diff --git a/project/plugins.sbt b/project/plugins.sbt index f806e66481..1b0f879b94 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -10,8 +10,6 @@ addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.1.1") addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.2.0") -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) |