Skip to content

Commit 5526ad1

Browse files
authored
Merge pull request #2633 from exoego/bump-jjwt
Bump jjwt-api
2 parents c82c860 + 7f32b3e commit 5526ad1

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

build.sbt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,12 @@ lazy val core = myCrossProject("core")
132132
// https/repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4.20/kotlin-stdlib-1.4.20.jar:META-INF/versions/9/module-info.class
133133
// https/repo1.maven.org/maven2/org/tukaani/xz/1.9/xz-1.9.jar:META-INF/versions/9/module-info.class
134134
MergeStrategy.first
135+
case PathList("module-info.class") =>
136+
// (core / assembly) deduplicate: different file contents found in the following:
137+
// https/repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.12.6/jackson-annotations-2.12.6.jar:module-info.class
138+
// https/repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.12.6/jackson-core-2.12.6.jar:module-info.class
139+
// 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
140+
MergeStrategy.discard
135141
case otherwise =>
136142
val defaultStrategy = (assembly / assemblyMergeStrategy).value
137143
defaultStrategy(otherwise)

project/Dependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ object Dependencies {
3030
val http4sOkhttpClient = "org.http4s" %% "http4s-okhttp-client" % http4sCore.revision
3131
val log4catsSlf4j = "org.typelevel" %% "log4cats-slf4j" % "2.3.1"
3232
val logbackClassic = "ch.qos.logback" % "logback-classic" % "1.2.11"
33-
val jjwtApi = "io.jsonwebtoken" % "jjwt-api" % "0.11.3"
33+
val jjwtApi = "io.jsonwebtoken" % "jjwt-api" % "0.11.5"
3434
val jjwtImpl = "io.jsonwebtoken" % "jjwt-impl" % jjwtApi.revision
3535
val jjwtJackson = "io.jsonwebtoken" % "jjwt-jackson" % jjwtApi.revision
3636
val millVersion = Def.setting(if (scalaBinaryVersion.value == "2.12") "0.6.3" else "0.10.4")

0 commit comments

Comments
 (0)