Skip to content

Commit 0394783

Browse files
committed
fix sl4j conflict
1 parent 4555541 commit 0394783

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

core/build.sbt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,12 @@ val mockito = Seq(
3232

3333
// Parquet & Avro
3434
val avro = Seq(
35-
"org.apache.parquet" % "parquet-avro" % "1.15.2",
36-
"org.apache.avro" % "avro" % "1.11.4",
37-
"org.apache.hadoop" % "hadoop-common" % "3.4.2",
35+
"org.apache.parquet" % "parquet-avro" % "1.15.2" excludeAll (excludeSlf4jAndLog4j *),
36+
"org.apache.avro" % "avro" % "1.11.4" excludeAll (excludeSlf4jAndLog4j *),
37+
"org.apache.hadoop" % "hadoop-common" % "3.4.2" excludeAll (excludeSlf4jAndLog4j *)
3838
)
3939

4040
libraryDependencies ++= akka ++ typesafeConfig ++ http ++
4141
json4s ++ mockito ++ avro :+ "com.google.code.gson" % "gson" % Versions.gson :+
42-
"com.typesafe.scala-logging" %% "scala-logging" % Versions.scalaLogging :+
43-
"org.scalatest" %% "scalatest" % Versions.scalatest % Test
44-
42+
"com.typesafe.scala-logging" %% "scala-logging" % Versions.scalaLogging :+
43+
"org.scalatest" %% "scalatest" % Versions.scalatest % Test

project/SoftClient4es.scala

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@ trait SoftClient4es {
2727
)
2828
)
2929

30+
lazy val excludeSlf4jAndLog4j: Seq[ExclusionRule] = Seq(
31+
ExclusionRule(organization = "org.slf4j", name = "slf4j-log4j12"),
32+
ExclusionRule(organization = "org.slf4j", name = "slf4j-reload4j"),
33+
ExclusionRule(organization = "log4j", name = "log4j"),
34+
ExclusionRule(organization = "org.apache.logging.log4j")
35+
)
36+
3037
def jacksonDependencies(esVersion: String): Seq[ModuleID] = {
3138
val jackson2_19 = "2.19.0"
3239
val jackson2_13 = "2.13.3"

0 commit comments

Comments
 (0)