aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorhhuang-driver <hhuang@driver.xyz>2017-03-08 14:07:47 -0800
committerGitHub <noreply@github.com>2017-03-08 14:07:47 -0800
commit9b46a7577f333430f9d7a82ffc93f09d7a197205 (patch)
treeedd8782421145a7ac6291e8dd3b9c7e03e7d1331 /src/main
parent801320eff2d9ae0141b638d61b4ca4c35093892d (diff)
parentb80b71a71577287a3dfe0fa3cd79957b00d39b8a (diff)
downloadsbt-settings-9b46a7577f333430f9d7a82ffc93f09d7a197205.tar.gz
sbt-settings-9b46a7577f333430f9d7a82ffc93f09d7a197205.tar.bz2
sbt-settings-9b46a7577f333430f9d7a82ffc93f09d7a197205.zip
Merge pull request #12 from drivergroup/hhuang/PDS-615
Change the assembly strategy for org.slf4j.impl.StaticLoggerBinder
Diffstat (limited to 'src/main')
-rw-r--r--src/main/scala/xyz.driver.sbt/SbtSettings.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/scala/xyz.driver.sbt/SbtSettings.scala b/src/main/scala/xyz.driver.sbt/SbtSettings.scala
index 0a16657..e266f3a 100644
--- a/src/main/scala/xyz.driver.sbt/SbtSettings.scala
+++ b/src/main/scala/xyz.driver.sbt/SbtSettings.scala
@@ -325,7 +325,7 @@ object SbtSettings extends AutoPlugin {
.settings(// for assembly plugin
test in assembly := {},
assemblyMergeStrategy in assembly := {
- case PathList("org", "slf4j", "impl", xs@_*) => MergeStrategy.rename
+ case PathList("org", "slf4j", "impl", xs@_*) => MergeStrategy.first
case "logback.xml" => MergeStrategy.first
case strategy: String =>
val oldStrategy = (assemblyMergeStrategy in assembly).value