Repository: spark Updated Branches: refs/heads/branch-1.0 adf8cdd0b -> 2a878dab6
[SPARK-1644] The org.datanucleus:* should not be packaged into spark-assembly-*.jar Author: witgo <[email protected]> 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 (cherry picked from commit 561510867a1b79beef57acf9df65c9f88481435d) Signed-off-by: Patrick Wendell <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/2a878dab Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/2a878dab Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/2a878dab Branch: refs/heads/branch-1.0 Commit: 2a878dab6a04e39c1ff50a322a61abbc9a08d5db Parents: adf8cdd Author: witgo <[email protected]> Authored: Sat May 10 10:15:04 2014 -0700 Committer: Patrick Wendell <[email protected]> Committed: Sat May 10 10:15:16 2014 -0700 ---------------------------------------------------------------------- assembly/pom.xml | 1 + project/SparkBuild.scala | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/2a878dab/assembly/pom.xml ---------------------------------------------------------------------- diff --git a/assembly/pom.xml b/assembly/pom.xml index 4a5df66..208794f 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -96,6 +96,7 @@ <filter> <artifact>*:*</artifact> <excludes> + <exclude>org.datanucleus:*</exclude> <exclude>META-INF/*.SF</exclude> <exclude>META-INF/*.DSA</exclude> <exclude>META-INF/*.RSA</exclude> http://git-wip-us.apache.org/repos/asf/spark/blob/2a878dab/project/SparkBuild.scala ---------------------------------------------------------------------- diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 79c1972..d0b5409 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 } )
