From 487d4be9d8325629e434947317ff94b144b5a75a Mon Sep 17 00:00:00 2001 From: Mathieu Ancelin Date: Wed, 30 Aug 2023 10:10:32 +0200 Subject: [PATCH] fix #1695 --- otoroshi/build.sbt | 1 + 1 file changed, 1 insertion(+) diff --git a/otoroshi/build.sbt b/otoroshi/build.sbt index 74bc1da42f..cd8f74a720 100644 --- a/otoroshi/build.sbt +++ b/otoroshi/build.sbt @@ -280,6 +280,7 @@ assemblyMergeStrategy in assembly := { case PathList(ps @ _*) if ps.contains("jna") => MergeStrategy.first case PathList(ps @ _*) if ps.contains("findbugsExclude.xml") => MergeStrategy.first case PathList(ps @ _*) if ps.contains("okio.kotlin_module") => MergeStrategy.first + case path if path.contains("akka/stream") => MergeStrategy.first case path if path.contains("org/bouncycastle") => MergeStrategy.first case PathList("javax", xs @ _*) => MergeStrategy.first case x =>