Skip to content

Commit 6ef874c

Browse files
chore: un-exclude slf4j from dependencies (#3279)
1 parent bdc10a9 commit 6ef874c

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

project/Dependencies.scala

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ object Dependencies {
4949

5050
// https://github.com/akka/akka/blob/main/project/Dependencies.scala#L26
5151
val LogbackWithSlf4jV1 = "1.5.7"
52-
val wiremock = ("com.github.tomakehurst" % "wiremock" % "3.0.1" % Test).exclude("org.slf4j", "slf4j-api")
52+
val wiremock = ("com.github.tomakehurst" % "wiremock" % "3.0.1" % Test)
5353

5454
val Common = Seq(
5555
// These libraries are added to all modules via the `Common` AutoPlugin
@@ -206,7 +206,7 @@ object Dependencies {
206206
"commons-net" % "commons-net" % "3.11.1",
207207
// Versions after sshj 0.35.0 depend on SLF4J 2.x
208208
"com.hierynomus" % "sshj" % "0.39.0",
209-
("io.github.hakky54" % "sslcontext-kickstart-for-pem" % "8.3.5" % Test).exclude("org.slf4j", "slf4j-api")
209+
("io.github.hakky54" % "sslcontext-kickstart-for-pem" % "8.3.5" % Test)
210210
)
211211
)
212212

@@ -305,10 +305,10 @@ object Dependencies {
305305
val hadoopVersion = "3.4.0"
306306
Seq(
307307
libraryDependencies ++= Seq(
308-
"org.apache.hbase" % "hbase-shaded-client" % hbaseVersion exclude ("log4j", "log4j") exclude ("org.slf4j", "slf4j-log4j12"), // ApacheV2,
309-
"org.apache.hbase" % "hbase-common" % hbaseVersion exclude ("log4j", "log4j") exclude ("org.slf4j", "slf4j-log4j12"), // ApacheV2,
310-
"org.apache.hadoop" % "hadoop-common" % hadoopVersion exclude ("log4j", "log4j") exclude ("org.slf4j", "slf4j-log4j12"), // ApacheV2,
311-
"org.apache.hadoop" % "hadoop-mapreduce-client-core" % hadoopVersion exclude ("log4j", "log4j") exclude ("org.slf4j", "slf4j-log4j12"), // ApacheV2,
308+
"org.apache.hbase" % "hbase-shaded-client" % hbaseVersion exclude ("log4j", "log4j"), // ApacheV2,
309+
"org.apache.hbase" % "hbase-common" % hbaseVersion exclude ("log4j", "log4j"), // ApacheV2,
310+
"org.apache.hadoop" % "hadoop-common" % hadoopVersion exclude ("log4j", "log4j"), // ApacheV2,
311+
"org.apache.hadoop" % "hadoop-mapreduce-client-core" % hadoopVersion, // ApacheV2,
312312
"org.slf4j" % "log4j-over-slf4j" % log4jOverSlf4jVersion % Test // MIT like: http://www.slf4j.org/license.html
313313
)
314314
)
@@ -317,11 +317,11 @@ object Dependencies {
317317
val HadoopVersion = "3.4.0"
318318
val Hdfs = Seq(
319319
libraryDependencies ++= Seq(
320-
"org.apache.hadoop" % "hadoop-client" % HadoopVersion exclude ("log4j", "log4j") exclude ("org.slf4j", "slf4j-log4j12"), // ApacheV2
320+
"org.apache.hadoop" % "hadoop-client" % HadoopVersion exclude ("log4j", "log4j"), // ApacheV2
321321
"org.typelevel" %% "cats-core" % "2.12.0", // MIT,
322-
"org.apache.hadoop" % "hadoop-hdfs" % HadoopVersion % Test exclude ("log4j", "log4j") exclude ("org.slf4j", "slf4j-log4j12"), // ApacheV2
323-
"org.apache.hadoop" % "hadoop-common" % HadoopVersion % Test exclude ("log4j", "log4j") exclude ("org.slf4j", "slf4j-log4j12"), // ApacheV2
324-
"org.apache.hadoop" % "hadoop-minicluster" % HadoopVersion % Test exclude ("log4j", "log4j") exclude ("org.slf4j", "slf4j-log4j12"), // ApacheV2
322+
"org.apache.hadoop" % "hadoop-hdfs" % HadoopVersion % Test, // ApacheV2
323+
"org.apache.hadoop" % "hadoop-common" % HadoopVersion % Test, // ApacheV2
324+
"org.apache.hadoop" % "hadoop-minicluster" % HadoopVersion % Test, // ApacheV2
325325
"org.slf4j" % "log4j-over-slf4j" % log4jOverSlf4jVersion % Test // MIT like: http://www.slf4j.org/license.html
326326
) ++ Mockito
327327
)
@@ -350,8 +350,8 @@ object Dependencies {
350350
val JakartaJms = Seq(
351351
libraryDependencies ++= Seq(
352352
"jakarta.jms" % "jakarta.jms-api" % "3.1.0", // Eclipse Public License 2.0 + + GPLv2
353-
("org.apache.activemq" % "artemis-jakarta-server" % "2.33.0" % Test).exclude("org.slf4j", "slf4j-api"),
354-
("org.apache.activemq" % "artemis-jakarta-client" % "2.33.0" % Test).exclude("org.slf4j", "slf4j-api")
353+
("org.apache.activemq" % "artemis-jakarta-server" % "2.33.0" % Test),
354+
("org.apache.activemq" % "artemis-jakarta-client" % "2.33.0" % Test)
355355
) ++ Mockito
356356
)
357357

0 commit comments

Comments
 (0)