Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix sbt assembly's merge rules

  • Loading branch information...
commit 388a11115353108557b10515bcda6abd34062a85 1 parent cce5683
@mateiz mateiz authored
Showing with 10 additions and 2 deletions.
  1. +10 −2 project/SparkBuild.scala
View
12 project/SparkBuild.scala
@@ -108,7 +108,7 @@ object SparkBuild extends Build {
"colt" % "colt" % "1.2.0",
"org.apache.mesos" % "mesos" % "0.9.0-incubating"
)
- ) ++ assemblySettings ++ Seq(test in assembly := {})
+ ) ++ assemblySettings ++ extraAssemblySettings ++ Seq(test in assembly := {})
def rootSettings = sharedSettings ++ Seq(
publish := {}
@@ -117,11 +117,19 @@ object SparkBuild extends Build {
def replSettings = sharedSettings ++ Seq(
name := "spark-repl",
libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _)
- ) ++ assemblySettings ++ Seq(test in assembly := {})
+ )
def examplesSettings = sharedSettings ++ Seq(
name := "spark-examples"
)
def bagelSettings = sharedSettings ++ Seq(name := "spark-bagel")
+
+ 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
+ }
+ )
}
Please sign in to comment.
Something went wrong with that request. Please try again.