Merge branch 'main' into refactor/remove-Ontologies-from-KnoraProject

project/Dependencies.scala

@@ -13,7 +13,7 @@ object Dependencies {
 
   val fusekiImage =
     "daschswiss/apache-jena-fuseki:2.1.5" // should be the same version as in docker-compose.yml, also make sure to use the same version when deploying it (i.e. version in ops-deploy)!
-  val sipiImage = "daschswiss/sipi:3.8.11" // base image the knora-sipi image is created from
+  val sipiImage = "daschswiss/sipi:3.8.12" // base image the knora-sipi image is created from
 
   val ScalaVersion = "2.13.12"
 
@@ -23,7 +23,7 @@ object Dependencies {
   val Rdf4jVersion      = "4.3.9"
 
   val ZioConfigVersion            = "4.0.1"
-  val ZioLoggingVersion           = "2.1.17"
+  val ZioLoggingVersion           = "2.2.0"
   val ZioNioVersion               = "2.0.2"
   val ZioMetricsConnectorsVersion = "2.3.1"
   val ZioPreludeVersion           = "1.0.0-RC23"

webapi/src/main/scala/org/knora/webapi/util/Logger.scala

@@ -4,18 +4,20 @@
  */
 
 package org.knora.webapi.util
+import zio.LogLevel
 import zio.*
+import zio.logging.LogFilter
 import zio.logging.LogFormat.*
 import zio.logging.*
 import zio.logging.slf4j.bridge.Slf4jBridge
 
 object Logger {
 
-  private val logFilter: LogFilter[String] = LogFilter.logLevelByName(
+  private val logFilter = LogFilter.LogLevelByNameConfig(
     LogLevel.Info
-      // Example of how to change log levels for loggers by name
-      // "zio.logging.slf4j" -> LogLevel.Debug,
-      // "SLF4J-LOGGER"      -> LogLevel.Warning
+      // Uncomment the following lines to change the log level for specific loggers:
+      // , ("zio.logging.slf4j", LogLevel.Debug)
+      // , ("SLF4J-LOGGER", LogLevel.Warning)
   )
 
   private val logFormatText: LogFormat =