diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-06-25 22:08:19 -0400 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-06-25 22:08:19 -0400 |
| commit | 32370da4e40062b88c921417cd7418d804e16f23 (patch) | |
| tree | 5282556b5f075fade34ec753be1ea9f13e65b6f0 /project/SparkBuild.scala | |
| parent | 9f0d91329516c829c86fc8e95d02071ca7d1f186 (diff) | |
| download | spark-32370da4e40062b88c921417cd7418d804e16f23.tar.gz spark-32370da4e40062b88c921417cd7418d804e16f23.tar.bz2 spark-32370da4e40062b88c921417cd7418d804e16f23.zip | |
Don't use forward slash in exclusion for JAR signature files
Diffstat (limited to 'project/SparkBuild.scala')
| -rw-r--r-- | project/SparkBuild.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 484f97d992..07572201de 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -236,7 +236,7 @@ object SparkBuild extends Build { def extraAssemblySettings() = Seq(test in assembly := {}) ++ Seq( 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 m if m.toLowerCase.matches("meta-inf.*\\.sf$") => MergeStrategy.discard case "reference.conf" => MergeStrategy.concat case _ => MergeStrategy.first } |