Skip to content

Commit 2da4a80

Browse files
authored
Update merge strategy for META-INF files (#102)
1 parent bd0236a commit 2da4a80

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/workflows/release-java.yml

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ jobs:
2828
- name: sbt validation
2929
run: sbt "dependencyUpdatesFailBuild; unusedCompileDependenciesTest; undeclaredCompileDependenciesTest; test"
3030
- name: Build fat JAR
31-
if: startsWith(github.ref, 'refs/tags/')
3231
run: sbt assembly
3332
- name: Rename fat JAR
3433
if: startsWith(github.ref, 'refs/tags/')

build.sbt

+3-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ val logbackVersion = "1.4.11"
1818
val scalamockVersion = "5.2.0"
1919
val scalatestVersion = "3.2.17"
2020
val shapelessVersion = "2.3.10"
21-
val slf4jVersion = "2.0.9"
22-
val snakeYamlVersion = "2.0"
21+
val slf4jVersion = "2.0.12"
22+
val snakeYamlVersion = "2.2"
2323
val vaultVersion = "3.5.0"
2424

2525
libraryDependencies ++= Seq(
@@ -51,6 +51,7 @@ enablePlugins(JavaAppPackaging)
5151

5252
ThisBuild / assemblyMergeStrategy := {
5353
case "module-info.class" => MergeStrategy.discard
54+
case PathList("META-INF", _*) => MergeStrategy.discard
5455
case x =>
5556
val oldStrategy = (ThisBuild / assemblyMergeStrategy).value
5657
oldStrategy(x)

0 commit comments

Comments
 (0)