hadoop-bam clean up completed.

biodatageeks · Sep 22, 2014 · aa58262 · aa58262
1 parent c9b497a
commit aa58262
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/sparkseq-core/build.sbt b/sparkseq-core/build.sbt
@@ -57,9 +57,16 @@ mergeStrategy in assembly <<= (mergeStrategy in assembly) { (old) =>
     case PathList("org", "objectweb", xs @ _*)         => MergeStrategy.last
     case PathList("javax", "xml", xs @ _*)         => MergeStrategy.first
     case PathList("javax", "servlet", xs @ _*)         => MergeStrategy.first
+    case PathList("javax", "activation",xs @ _*)         => MergeStrategy.first
+    case PathList("javax", "transaction",xs @ _*)         => MergeStrategy.first
+    case PathList("javax", "mail", xs @ _*)     => MergeStrategy.first
     case PathList(ps @ _*) if ps.last endsWith ".html" => MergeStrategy.first
     case "application.conf" => MergeStrategy.concat
-    case "unwanted.txt"     => MergeStrategy.discard
+    //case "META-INF/ECLIPSEF.RSA"     => MergeStrategy.discard
+    case "META-INF/mimetypes.default"  => MergeStrategy.first
+    case ("META-INF/ECLIPSEF.RSA") => MergeStrategy.first
+    case ("META-INF/mailcap") => MergeStrategy.first
+    case ("plugin.properties") => MergeStrategy.first
     case x => old(x)
   }
 }