Skip to content

Commit 388a111

Browse files
committed
Fix sbt assembly's merge rules
1 parent cce5683 commit 388a111

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

project/SparkBuild.scala

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ object SparkBuild extends Build {
108108
"colt" % "colt" % "1.2.0",
109109
"org.apache.mesos" % "mesos" % "0.9.0-incubating"
110110
)
111-
) ++ assemblySettings ++ Seq(test in assembly := {})
111+
) ++ assemblySettings ++ extraAssemblySettings ++ Seq(test in assembly := {})
112112

113113
def rootSettings = sharedSettings ++ Seq(
114114
publish := {}
@@ -117,11 +117,19 @@ object SparkBuild extends Build {
117117
def replSettings = sharedSettings ++ Seq(
118118
name := "spark-repl",
119119
libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _)
120-
) ++ assemblySettings ++ Seq(test in assembly := {})
120+
)
121121

122122
def examplesSettings = sharedSettings ++ Seq(
123123
name := "spark-examples"
124124
)
125125

126126
def bagelSettings = sharedSettings ++ Seq(name := "spark-bagel")
127+
128+
def extraAssemblySettings() = Seq(test in assembly := {}) ++ Seq(
129+
mergeStrategy in assembly := {
130+
case m if m.toLowerCase.endsWith("manifest.mf") => MergeStrategy.discard
131+
case "reference.conf" => MergeStrategy.concat
132+
case _ => MergeStrategy.first
133+
}
134+
)
127135
}

0 commit comments

Comments
 (0)