You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/05/10 19:15:11 UTC
git commit: [SPARK-1644] The org.datanucleus:* should not be packaged
into spark-assembly-*.jar
Repository: spark
Updated Branches:
refs/heads/master 2f452cbaf -> 561510867
[SPARK-1644] The org.datanucleus:* should not be packaged into spark-assembly-*.jar
Author: witgo <wi...@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
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/56151086
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/56151086
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/56151086
Branch: refs/heads/master
Commit: 561510867a1b79beef57acf9df65c9f88481435d
Parents: 2f452cb
Author: witgo <wi...@qq.com>
Authored: Sat May 10 10:15:04 2014 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Sat May 10 10:15:04 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/56151086/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 7d123fb..6c4d46a 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/56151086/project/SparkBuild.scala
----------------------------------------------------------------------
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 7f9746e..27e9505 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
}
)