Logback & slf4j version bump.

tofu-tf · Nov 22, 2023 · 1c1efaa · 1c1efaa
1 parent 79fc2ae
commit 1c1efaa
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 17 deletions.
diff --git a/modules/interop/zio2/logging/src/test/scala-2/tofu/logging/zlogs/TestStuff.scala b/modules/interop/zio2/logging/src/test/scala-2/tofu/logging/zlogs/TestStuff.scala
@@ -4,7 +4,6 @@ import ch.qos.logback.classic.Logger
 import ch.qos.logback.classic.spi.ILoggingEvent
 import ch.qos.logback.core.read.ListAppender
 import derevo.derive
-import ch.qos.logback.classic.LoggerContext
 import org.slf4j.LoggerFactory
 import tofu.logging.derivation.loggable
 import zio.{Clock, FiberRef, LogSpan, ULayer, ZIO, ZLayer}

diff --git a/modules/logging/layout/src/main/scala-2/tofu/logging/logback/ConsoleContextLayout.scala b/modules/logging/layout/src/main/scala-2/tofu/logging/logback/ConsoleContextLayout.scala
@@ -5,6 +5,7 @@ import java.util
 import ch.qos.logback.classic.{Level, PatternLayout}
 import ch.qos.logback.classic.spi.{ILoggingEvent, IThrowableProxy, LoggerContextVO}
 import org.slf4j.Marker
+import org.slf4j.event.KeyValuePair
 import tofu.logging.LoggedValue
 import tofu.logging.impl.ContextMarker
 
@@ -38,18 +39,21 @@ class WrappedEvent(event: ILoggingEvent) extends ILoggingEvent {
     map
   }
 
-  def getThreadName: String                   = event.getThreadName
-  def getLevel: Level                         = event.getLevel
-  def getMessage: String                      = event.getMessage
-  def getArgumentArray: Array[AnyRef]         = event.getArgumentArray
-  def getFormattedMessage: String             = event.getFormattedMessage
-  def getLoggerName: String                   = event.getLoggerName
-  def getLoggerContextVO: LoggerContextVO     = event.getLoggerContextVO
-  def getThrowableProxy: IThrowableProxy      = event.getThrowableProxy
-  def getCallerData: Array[StackTraceElement] = event.getCallerData
-  def hasCallerData: Boolean                  = event.hasCallerData
-  def getMarker: Marker                       = event.getMarker
-  def getMdc: util.Map[String, String]        = getMDCPropertyMap
-  def getTimeStamp: Long                      = event.getTimeStamp
-  def prepareForDeferredProcessing(): Unit    = event.prepareForDeferredProcessing()
+  def getThreadName: String                     = event.getThreadName
+  def getLevel: Level                           = event.getLevel
+  def getMessage: String                        = event.getMessage
+  def getArgumentArray: Array[AnyRef]           = event.getArgumentArray
+  def getFormattedMessage: String               = event.getFormattedMessage
+  def getLoggerName: String                     = event.getLoggerName
+  def getLoggerContextVO: LoggerContextVO       = event.getLoggerContextVO
+  def getThrowableProxy: IThrowableProxy        = event.getThrowableProxy
+  def getCallerData: Array[StackTraceElement]   = event.getCallerData
+  def hasCallerData: Boolean                    = event.hasCallerData
+  def getMarkerList: util.List[Marker]          = event.getMarkerList
+  def getMdc: util.Map[String, String]          = getMDCPropertyMap
+  def getTimeStamp: Long                        = event.getTimeStamp
+  def getNanoseconds: Int                       = event.getNanoseconds
+  def getSequenceNumber: Long                   = event.getSequenceNumber
+  def getKeyValuePairs: util.List[KeyValuePair] = event.getKeyValuePairs
+  def prepareForDeferredProcessing(): Unit      = event.prepareForDeferredProcessing()
 }
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -30,13 +30,13 @@ object Dependencies {
 
     val derevo = "0.13.0"
 
-    val slf4j = "1.7.36"
+    val slf4j = "2.0.9"
 
     val fs2 = "2.5.11"
 
     val fs2CE3 = "3.7.0"
 
-    val logback = "1.2.12"
+    val logback = "1.4.11"
 
     val monix = "3.4.1"