Skip to content

Commit 0bb74d2

Browse files
authored
Fix SBT build (#155)
* This PR fixes the docker build pipeline * Also add smoke tests * Fix * Fix * Fix * Fix * Fix * Rollback unwanted changes * Rollback unwanted changes
1 parent d95f21c commit 0bb74d2

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

build.sbt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ lazy val plugin = (project in file("."))
7979

8080
// for javax.activation package take the first one
8181
case PathList("javax", "activation", _*) => MergeStrategy.last
82+
case PathList("javax", "xml", _*) => MergeStrategy.last
8283

8384
// For other files we use the default strategy (deduplicate)
8485
case x => MergeStrategy.deduplicate

0 commit comments

Comments
 (0)