diff options
| author | hhuang-driver <hhuang@driver.xyz> | 2017-03-08 14:07:47 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-08 14:07:47 -0800 |
| commit | 9b46a7577f333430f9d7a82ffc93f09d7a197205 (patch) | |
| tree | edd8782421145a7ac6291e8dd3b9c7e03e7d1331 | |
| parent | 801320eff2d9ae0141b638d61b4ca4c35093892d (diff) | |
| parent | b80b71a71577287a3dfe0fa3cd79957b00d39b8a (diff) | |
| download | sbt-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
| -rw-r--r-- | build.sbt | 2 | ||||
| -rw-r--r-- | src/main/scala/xyz.driver.sbt/SbtSettings.scala | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -17,7 +17,7 @@ addSbtPlugin("io.spray" % "sbt-revolver" % "0.8.0") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.6.1") addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.8.5") addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.1.4") -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.3") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.4") addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.3") addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.4.0") 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 |