Merge pull request #621 from scala-steward/update/main/logstash-logba…

…ck-encoder-7.4 logstash-logback-encoder 7.4 (was 7.3)
playframework · Feb 22, 2025 · 4bf74f7 · 4bf74f7
2 parents f0dd5a0 + c23fe2a
commit 4bf74f7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/scala/chatroom/build.sbt b/scala/chatroom/build.sbt
@@ -15,7 +15,8 @@ lazy val root = (project in file("."))
       "org.webjars" %% "webjars-play" % "3.1.0-M1",
       "org.webjars" % "flot" % "0.8.3-1",
       "org.webjars" % "bootstrap" % "3.3.7-1",
-      "net.logstash.logback" % "logstash-logback-encoder" % "7.3",
+      ("net.logstash.logback" % "logstash-logback-encoder" % "7.4")
+        .excludeAll(ExclusionRule("com.fasterxml.jackson.core")), // Avoid conflicts with Play's Jackson dependency
       "org.jsoup" % "jsoup" % "1.17.2",
       "ch.qos.logback" % "logback-classic" % "1.5.6",
       "org.apache.pekko" %% "pekko-slf4j" % pekkoVersion,

diff --git a/scala/rest-api/build.sbt b/scala/rest-api/build.sbt
@@ -15,7 +15,8 @@ lazy val root = (project in file("."))
     crossScalaVersions := Seq(scala213, scala3),
     libraryDependencies ++= Seq(
       guice,
-      "net.logstash.logback" % "logstash-logback-encoder" % "7.3",
+      ("net.logstash.logback" % "logstash-logback-encoder" % "7.4")
+        .excludeAll(ExclusionRule("com.fasterxml.jackson.core")), // Avoid conflicts with Play's Jackson dependency
       "io.lemonlabs" %% "scala-uri" % "4.0.3",
       "net.codingwell" %% "scala-guice" % "7.0.0",
       "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M1" % Test