From 2da4a80c7ee1f3900b9f169ebc07e2d9cd1ed926 Mon Sep 17 00:00:00 2001
From: Nihal Mirpuri <nihal.mirpuri@gmail.com>
Date: Tue, 20 Feb 2024 12:05:46 +0000
Subject: [PATCH] Update merge strategy for META-INF files (#102)

---
 .github/workflows/release-java.yml | 1 -
 build.sbt                          | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release-java.yml b/.github/workflows/release-java.yml
index 68f18dd..aea211e 100644
--- a/.github/workflows/release-java.yml
+++ b/.github/workflows/release-java.yml
@@ -28,7 +28,6 @@ jobs:
       - name: sbt validation
         run: sbt "dependencyUpdatesFailBuild; unusedCompileDependenciesTest; undeclaredCompileDependenciesTest; test"
       - name: Build fat JAR
-        if: startsWith(github.ref, 'refs/tags/')
         run: sbt assembly
       - name: Rename fat JAR
         if: startsWith(github.ref, 'refs/tags/')
diff --git a/build.sbt b/build.sbt
index 071cdac..86252e0 100644
--- a/build.sbt
+++ b/build.sbt
@@ -18,8 +18,8 @@ val logbackVersion = "1.4.11"
 val scalamockVersion = "5.2.0"
 val scalatestVersion = "3.2.17"
 val shapelessVersion = "2.3.10"
-val slf4jVersion = "2.0.9"
-val snakeYamlVersion = "2.0"
+val slf4jVersion = "2.0.12"
+val snakeYamlVersion = "2.2"
 val vaultVersion = "3.5.0"
 
 libraryDependencies ++= Seq(
@@ -51,6 +51,7 @@ enablePlugins(JavaAppPackaging)
 
 ThisBuild / assemblyMergeStrategy := {
   case "module-info.class" => MergeStrategy.discard
+  case PathList("META-INF", _*) => MergeStrategy.discard
   case x =>
     val oldStrategy = (ThisBuild / assemblyMergeStrategy).value
     oldStrategy(x)