Skip to content

Commit 9be27cb

Browse files
authored
Merge pull request #2742 from exoego/update/coursier-2.1.0-M7
2 parents b7774c6 + d540780 commit 9be27cb

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

build.sbt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,11 @@ lazy val core = myCrossProject("core")
138138
// https/repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.12.6/jackson-core-2.12.6.jar:module-info.class
139139
// https/repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.12.6.1/jackson-databind-2.12.6.1.jar:module-info.class
140140
MergeStrategy.discard
141+
case PathList("META-INF", "sisu", "javax.inject.Named") =>
142+
// (core / assembly) deduplicate: different file contents found in the following:
143+
// https/repo1.maven.org/maven2/org/codehaus/plexus/plexus-archiver/4.5.0/plexus-archiver-4.5.0.jar:META-INF/sisu/javax.inject.Named
144+
// https/repo1.maven.org/maven2/org/codehaus/plexus/plexus-io/3.4.0/plexus-io-3.4.0.jar:META-INF/sisu/javax.inject.Named
145+
MergeStrategy.first
141146
case otherwise =>
142147
val defaultStrategy = (assembly / assemblyMergeStrategy).value
143148
defaultStrategy(otherwise)

project/Dependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ object Dependencies {
1616
val circeParser = "io.circe" %% "circe-parser" % circeGeneric.revision
1717
val circeRefined = "io.circe" %% "circe-refined" % circeGeneric.revision
1818
val commonsIo = "commons-io" % "commons-io" % "2.11.0"
19-
val coursierCore = "io.get-coursier" %% "coursier" % "2.1.0-M6"
19+
val coursierCore = "io.get-coursier" %% "coursier" % "2.1.0-M7"
2020
val cron4sCore = "com.github.alonsodomin.cron4s" %% "cron4s-core" % "0.6.1"
2121
val decline = "com.monovore" %% "decline" % "2.3.1"
2222
val disciplineMunit = "org.typelevel" %% "discipline-munit" % "1.0.9"

0 commit comments

Comments
 (0)