diff options
| author | witgo <witgo@qq.com> | 2014-05-10 10:15:04 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-05-10 10:15:04 -0700 |
| commit | 561510867a1b79beef57acf9df65c9f88481435d (patch) | |
| tree | c39504eb863e2f7461e2b69f0f9be6d7698c2ac2 /project/SparkBuild.scala | |
| parent | 2f452cbaf35dbc609ab48ec0ee5e3dd7b6b9b790 (diff) | |
| download | spark-561510867a1b79beef57acf9df65c9f88481435d.tar.gz spark-561510867a1b79beef57acf9df65c9f88481435d.tar.bz2 spark-561510867a1b79beef57acf9df65c9f88481435d.zip | |
[SPARK-1644] The org.datanucleus:* should not be packaged into spark-assembly-*.jar
Author: witgo <witgo@qq.com>
Closes #688 from witgo/SPARK-1644 and squashes the following commits:
56ad6ac [witgo] review commit
87c03e4 [witgo] Merge branch 'master' of https://github.com/apache/spark into SPARK-1644
6ffa7e4 [witgo] review commit
a597414 [witgo] The org.datanucleus:* should not be packaged into spark-assembly-*.jar
Diffstat (limited to 'project/SparkBuild.scala')
| -rw-r--r-- | project/SparkBuild.scala | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 7f9746ec4a..27e9505ec9 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -579,12 +579,13 @@ object SparkBuild extends Build { def extraAssemblySettings() = Seq( test in assembly := {}, mergeStrategy in assembly := { - 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 PathList("org", "datanucleus", xs @ _*) => MergeStrategy.discard + 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 m if m.toLowerCase.startsWith("meta-inf/services/") => MergeStrategy.filterDistinctLines - case "reference.conf" => MergeStrategy.concat - case _ => MergeStrategy.first + case "reference.conf" => MergeStrategy.concat + case _ => MergeStrategy.first } ) |