cleanup

MAIF · Aug 31, 2023 · 3fae0d8 · 3fae0d8
1 parent b624283
commit 3fae0d8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/docker/build/build.sh b/docker/build/build.sh
@@ -116,7 +116,7 @@ case "${1}" in
   build-and-push-dev)
     OTO_VERSION="dev"
     copy_build
-    build_and_push_jar_template_version_multi_arch_temurin "$OTO_VERSION" "20"
+    build_and_push_jar_template_version_multi_arch_temurin "$OTO_VERSION" "17"
     cleanup
     ;;
   build-and-push-snapshot)
@@ -158,4 +158,4 @@ case "${1}" in
     ;;
 esac
 
-exit ${?}
+exit ${?}
diff --git a/otoroshi/build.sbt b/otoroshi/build.sbt
@@ -280,7 +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("akka/stream")                           => MergeStrategy.first
   case path if path.contains("org/bouncycastle")                      => MergeStrategy.first
   case PathList("javax", xs @ _*)                                     => MergeStrategy.first
   case x                                                              =>