From 71cfe617813fc1d8910f1567b2ee31613cd1720e Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 5 May 2024 22:22:49 +0000 Subject: [PATCH 1/2] logstash-logback-encoder 7.4 (was 7.3) --- scala/chatroom/build.sbt | 2 +- scala/rest-api/build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scala/chatroom/build.sbt b/scala/chatroom/build.sbt index a450b451a..d18d48744 100644 --- a/scala/chatroom/build.sbt +++ b/scala/chatroom/build.sbt @@ -15,7 +15,7 @@ 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", "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 index bba022c72..c76081ce7 100644 --- a/scala/rest-api/build.sbt +++ b/scala/rest-api/build.sbt @@ -15,7 +15,7 @@ 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", "io.lemonlabs" %% "scala-uri" % "4.0.3", "net.codingwell" %% "scala-guice" % "7.0.0", "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M1" % Test From c23fe2ae131b21ba6788d282ade36db340069c9b Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Sat, 22 Feb 2025 10:29:47 +0100 Subject: [PATCH 2/2] logstash should avoid conflicts with Play's Jackson dependency --- scala/chatroom/build.sbt | 3 ++- scala/rest-api/build.sbt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scala/chatroom/build.sbt b/scala/chatroom/build.sbt index d18d48744..5287e8c34 100644 --- 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.4", + ("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 index c76081ce7..285585636 100644 --- 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.4", + ("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