Skip to content

Commit

Permalink
Update merge strategy for META-INF files (#102)
Browse files Browse the repository at this point in the history
  • Loading branch information
nylonee authored Feb 20, 2024
1 parent bd0236a commit 2da4a80
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
1 change: 0 additions & 1 deletion .github/workflows/release-java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/')
Expand Down
5 changes: 3 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 2da4a80

Please sign in to comment.