diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2012-08-24 16:11:44 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2012-08-24 16:11:44 -0700 |
| commit | 5a8015d2dbe1a475a7c921fbf850abe594be5867 (patch) | |
| tree | d52185e847da642e2267ae76bd2edff91d46be78 /project | |
| parent | cae894ee7aefa4cf9b1952038a48be81e1d2a856 (diff) | |
| parent | 2c16ae36d72653fdbebee57b93b9aead070a395c (diff) | |
| download | spark-5a8015d2dbe1a475a7c921fbf850abe594be5867.tar.gz spark-5a8015d2dbe1a475a7c921fbf850abe594be5867.tar.bz2 spark-5a8015d2dbe1a475a7c921fbf850abe594be5867.zip | |
Merge remote-tracking branch 'public/dev' into dev
Diffstat (limited to 'project')
| -rw-r--r-- | project/SparkBuild.scala | 7 | ||||
| -rw-r--r-- | project/plugins.sbt | 8 |
2 files changed, 10 insertions, 5 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index c4ada2bf2a..6a60f10be4 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -2,6 +2,7 @@ import sbt._ import Keys._ import sbtassembly.Plugin._ import AssemblyKeys._ +import twirl.sbt.TwirlPlugin._ object SparkBuild extends Build { // Hadoop version to build against. For example, "0.20.2", "0.20.205.0", or @@ -65,18 +66,17 @@ object SparkBuild extends Build { "com.typesafe.akka" % "akka-actor" % "2.0.2", "com.typesafe.akka" % "akka-remote" % "2.0.2", "com.typesafe.akka" % "akka-slf4j" % "2.0.2", - "org.jboss.netty" % "netty" % "3.2.6.Final", "it.unimi.dsi" % "fastutil" % "6.4.4", "colt" % "colt" % "1.2.0", "cc.spray" % "spray-can" % "1.0-M2.1", "cc.spray" % "spray-server" % "1.0-M2.1" ) - ) ++ assemblySettings ++ extraAssemblySettings + ) ++ assemblySettings ++ extraAssemblySettings ++ Twirl.settings def replSettings = sharedSettings ++ Seq( name := "spark-repl", libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _) - ) ++ assemblySettings ++ extraAssemblySettings + ) ++ assemblySettings ++ extraAssemblySettings def examplesSettings = sharedSettings ++ Seq( name := "spark-examples" @@ -89,6 +89,7 @@ object SparkBuild extends Build { def extraAssemblySettings() = Seq(test in assembly := {}) ++ Seq( mergeStrategy in assembly := { case m if m.toLowerCase.endsWith("manifest.mf") => MergeStrategy.discard + case "reference.conf" => MergeStrategy.concat case _ => MergeStrategy.first } ) diff --git a/project/plugins.sbt b/project/plugins.sbt index 0e2b6d4902..896fa4834f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,9 +1,13 @@ -resolvers += Classpaths.typesafeResolver - resolvers += Resolver.url("artifactory", url("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases"))(Resolver.ivyStylePatterns) +resolvers += "Typesafe Repository" at "http://repo.typesafe.com/typesafe/releases/" + +resolvers += "Spray Repository" at "http://repo.spray.cc/" + addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.8.3") 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") |