diff options
| author | Reynold Xin <rxin@apache.org> | 2013-11-25 15:47:47 +0800 |
|---|---|---|
| committer | Reynold Xin <rxin@apache.org> | 2013-11-25 15:47:47 +0800 |
| commit | 6bcac986b20477fcb8cc011ecff19f482e033794 (patch) | |
| tree | 2e00f338535e7516b3d30475373c4647c688d281 /project | |
| parent | 2c39d809d635f175a0f5aa2a88d508973b81cb57 (diff) | |
| parent | 62889c419cfddb1cea2d260e9b530349d9f8eeda (diff) | |
| download | spark-6bcac986b20477fcb8cc011ecff19f482e033794.tar.gz spark-6bcac986b20477fcb8cc011ecff19f482e033794.tar.bz2 spark-6bcac986b20477fcb8cc011ecff19f482e033794.zip | |
Merge branch 'master' of github.com:apache/incubator-spark
Diffstat (limited to 'project')
| -rw-r--r-- | project/SparkBuild.scala | 8 | ||||
| -rw-r--r-- | project/plugins.sbt | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index d6d34d00f1..47906ada74 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -172,7 +172,8 @@ object SparkBuild extends Build { "org.scalatest" %% "scalatest" % "1.9.1" % "test", "org.scalacheck" %% "scalacheck" % "1.10.0" % "test", "com.novocode" % "junit-interface" % "0.9" % "test", - "org.easymock" % "easymock" % "3.1" % "test" + "org.easymock" % "easymock" % "3.1" % "test", + "org.mockito" % "mockito-all" % "1.8.5" % "test" ), /* Workaround for issue #206 (fixed after SBT 0.11.0) */ watchTransitiveSources <<= Defaults.inDependencies[Task[Seq[File]]](watchSources.task, @@ -231,6 +232,7 @@ object SparkBuild extends Build { "com.codahale.metrics" % "metrics-jvm" % "3.0.0", "com.codahale.metrics" % "metrics-json" % "3.0.0", "com.codahale.metrics" % "metrics-ganglia" % "3.0.0", + "com.codahale.metrics" % "metrics-graphite" % "3.0.0", "com.twitter" % "chill_2.9.3" % "0.3.1", "com.twitter" % "chill-java" % "0.3.1" ) @@ -267,7 +269,7 @@ object SparkBuild extends Build { def toolsSettings = sharedSettings ++ Seq( name := "spark-tools" - ) + ) ++ assemblySettings ++ extraAssemblySettings def graphSettings = sharedSettings ++ Seq( name := "spark-graphx" @@ -333,7 +335,7 @@ object SparkBuild extends Build { case m if m.toLowerCase.endsWith("manifest.mf") => MergeStrategy.discard case m if m.toLowerCase.matches("meta-inf.*\\.sf$") => MergeStrategy.discard case "log4j.properties" => MergeStrategy.discard - case "META-INF/services/org.apache.hadoop.fs.FileSystem" => MergeStrategy.concat + case m if m.toLowerCase.startsWith("meta-inf/services/") => MergeStrategy.filterDistinctLines case "reference.conf" => MergeStrategy.concat case _ => MergeStrategy.first } diff --git a/project/plugins.sbt b/project/plugins.sbt index cfcd85082a..4ba0e4280a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,7 +4,7 @@ resolvers += "Typesafe Repository" at "http://repo.typesafe.com/typesafe/release resolvers += "Spray Repository" at "http://repo.spray.cc/" -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.9.1") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.9.2") addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.2.0") |