Skip to content

Commit 3b54254

Browse files
committed
Diligently remove transitive Slf4j 2
1 parent 7be5bf1 commit 3b54254

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

project/Dependencies.scala

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ object Dependencies {
4242
// Akka 2.9 expects Slf4j 1.x
4343
// https://github.com/akka/akka/blob/main/project/Dependencies.scala#L28
4444
val LogbackWithSlf4jV1 = "1.2.13"
45-
val LogbackWithSlf4jV2 = "1.5.3"
45+
val wiremock = ("com.github.tomakehurst" % "wiremock" % "3.0.1" % Test).exclude("org.slf4j", "slf4j-api")
4646

4747
val Common = Seq(
4848
// These libraries are added to all modules via the `Common` AutoPlugin
@@ -256,8 +256,7 @@ object Dependencies {
256256
libraryDependencies ++= Seq(
257257
"com.typesafe.akka" %% "akka-http" % AkkaHttpVersion,
258258
"com.typesafe.akka" %% "akka-http-spray-json" % AkkaHttpVersion,
259-
"com.github.tomakehurst" % "wiremock" % "3.0.1" % Test,
260-
"ch.qos.logback" % "logback-classic" % LogbackWithSlf4jV2 % Test
259+
wiremock
261260
) ++ Mockito
262261
)
263262

@@ -339,9 +338,8 @@ object Dependencies {
339338
val JakartaJms = Seq(
340339
libraryDependencies ++= Seq(
341340
"jakarta.jms" % "jakarta.jms-api" % "3.1.0", // Eclipse Public License 2.0 + + GPLv2
342-
"org.apache.activemq" % "artemis-jakarta-server" % "2.33.0" % Test, // ApacheV2
343-
"org.apache.activemq" % "artemis-jakarta-client" % "2.33.0" % Test, // ApacheV2
344-
"ch.qos.logback" % "logback-classic" % LogbackWithSlf4jV2 % Test
341+
("org.apache.activemq" % "artemis-jakarta-server" % "2.33.0" % Test).exclude("org.slf4j", "slf4j-api"),
342+
("org.apache.activemq" % "artemis-jakarta-client" % "2.33.0" % Test).exclude("org.slf4j", "slf4j-api")
345343
) ++ Mockito
346344
)
347345

@@ -445,7 +443,7 @@ object Dependencies {
445443
"software.amazon.awssdk" % "auth" % AwsSdk2Version,
446444
// in-memory filesystem for file related tests
447445
"com.google.jimfs" % "jimfs" % "1.2" % Test, // ApacheV2
448-
"com.github.tomakehurst" % "wiremock-jre8" % "3.0.1" % Test // ApacheV2
446+
wiremock
449447
)
450448
)
451449

@@ -467,8 +465,8 @@ object Dependencies {
467465
val SlickVersion = "3.5.0"
468466
val Slick = Seq(
469467
libraryDependencies ++= Seq(
470-
"com.typesafe.slick" %% "slick" % SlickVersion, // BSD 2-clause "Simplified" License
471-
"com.typesafe.slick" %% "slick-hikaricp" % SlickVersion, // BSD 2-clause "Simplified" License
468+
("com.typesafe.slick" %% "slick" % SlickVersion).exclude("org.slf4j", "slf4j-api"),
469+
("com.typesafe.slick" %% "slick-hikaricp" % SlickVersion).exclude("org.slf4j", "slf4j-api"),
472470
"com.h2database" % "h2" % "2.1.214" % Test // Eclipse Public License 1.0
473471
)
474472
)

0 commit comments

Comments
 (0)