Skip to content

Commit acb09dd

Browse files
committed
DSP-11503 fix assembling
1 parent 4e5270f commit acb09dd

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

bin/server_package.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ FILES="job-server-extras/target/scala-$majorVersion/spark-job-server.jar
4848
bin/manager_start.sh
4949
bin/setenv.sh
5050
$CONFIG_DIR/$ENV.conf
51-
config/logback-server.xml
52-
config/shiro.ini"
51+
config/logback-server.xml"
5352

5453
rm -rf $WORK_DIR
5554
mkdir -p $WORK_DIR

build.sbt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11

22
import Dependencies._
33
import JobServerRelease._
4+
import sbtassembly.AssemblyPlugin.autoImport.assemblyMergeStrategy
5+
import sbtassembly.MergeStrategy
46

57
transitiveClassifiers in Global := Seq()
68
lazy val dirSettings = Seq()
@@ -184,7 +186,13 @@ lazy val rootSettings = Seq(
184186
// limit to 1 concurrent test task, even across sub-projects
185187
// Note: some components of tests seem to have the "Untagged" tag rather than "Test" tag.
186188
// So, we limit the sum of "Test", "Untagged" tags to 1 concurrent
187-
Tags.limitSum(1, Tags.Test, Tags.Untagged))
189+
Tags.limitSum(1, Tags.Test, Tags.Untagged)),
190+
assemblyMergeStrategy in assembly := {
191+
case PathList("META-INF", "io.netty.versions.properties") => MergeStrategy.discard
192+
case x =>
193+
val oldStrategy = (assemblyMergeStrategy in assembly).value
194+
oldStrategy(x)
195+
}
188196
)
189197

190198
lazy val revolverSettings = Seq(

0 commit comments

Comments
 (0)