File tree Expand file tree Collapse file tree 1 file changed +10
-2
lines changed Expand file tree Collapse file tree 1 file changed +10
-2
lines changed Original file line number Diff line number Diff line change @@ -108,7 +108,7 @@ object SparkBuild extends Build {
108
108
" colt" % " colt" % " 1.2.0" ,
109
109
" org.apache.mesos" % " mesos" % " 0.9.0-incubating"
110
110
)
111
- ) ++ assemblySettings ++ Seq (test in assembly := {})
111
+ ) ++ assemblySettings ++ extraAssemblySettings ++ Seq (test in assembly := {})
112
112
113
113
def rootSettings = sharedSettings ++ Seq (
114
114
publish := {}
@@ -117,11 +117,19 @@ object SparkBuild extends Build {
117
117
def replSettings = sharedSettings ++ Seq (
118
118
name := " spark-repl" ,
119
119
libraryDependencies <+= scalaVersion(" org.scala-lang" % " scala-compiler" % _)
120
- ) ++ assemblySettings ++ Seq (test in assembly := {})
120
+ )
121
121
122
122
def examplesSettings = sharedSettings ++ Seq (
123
123
name := " spark-examples"
124
124
)
125
125
126
126
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
+ )
127
135
}
You can’t perform that action at this time.
0 commit comments