diff --git a/build.sbt b/build.sbt index bd28e5e8..791938c1 100644 --- a/build.sbt +++ b/build.sbt @@ -463,7 +463,6 @@ val store = project Dependencies.fs2 ++ Dependencies.databases ++ Dependencies.flyway ++ - Dependencies.loggingApi ++ Dependencies.emil ++ Dependencies.emilDoobie ++ Dependencies.calevCore ++ @@ -532,8 +531,7 @@ val extract = project Dependencies.twelvemonkeys ++ Dependencies.pdfbox ++ Dependencies.poi ++ - Dependencies.commonsIO ++ - Dependencies.julOverSlf4j + Dependencies.commonsIO ) .dependsOn(common, loggingScribe, files % "compile->compile;test->test") @@ -638,7 +636,6 @@ val backend = project .settings( name := "docspell-backend", libraryDependencies ++= - Dependencies.loggingApi ++ Dependencies.fs2 ++ Dependencies.bcrypt ++ Dependencies.http4sClient ++ @@ -654,7 +651,6 @@ val oidc = project .settings( name := "docspell-oidc", libraryDependencies ++= - Dependencies.loggingApi ++ Dependencies.fs2 ++ Dependencies.http4sClient ++ Dependencies.http4sCirce ++ @@ -713,9 +709,7 @@ val joex = project Dependencies.emilMarkdown ++ Dependencies.emilJsoup ++ Dependencies.jsoup ++ - Dependencies.yamusca ++ - Dependencies.loggingApi ++ - Dependencies.logging.map(_ % Runtime), + Dependencies.yamusca, addCompilerPlugin(Dependencies.betterMonadicFor), buildInfoPackage := "docspell.joex", reStart / javaOptions ++= Seq( @@ -767,9 +761,7 @@ val restserver = project Dependencies.pureconfig ++ Dependencies.yamusca ++ Dependencies.kittens ++ - Dependencies.webjars ++ - Dependencies.loggingApi ++ - Dependencies.logging.map(_ % Runtime), + Dependencies.webjars, addCompilerPlugin(Dependencies.betterMonadicFor), buildInfoPackage := "docspell.restserver", Compile / sourceGenerators += Def.task { diff --git a/modules/files/src/test/resources/logback-test.xml b/modules/files/src/test/resources/logback-test.xml deleted file mode 100644 index b1e25720..00000000 --- a/modules/files/src/test/resources/logback-test.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - true - - - level=%-5level thread=%thread logger=%logger{15} message="%replace(%msg){'"', '\\"'}"%n - - - - - - - - diff --git a/modules/joex/src/main/resources/logback.xml b/modules/joex/src/main/resources/logback.xml deleted file mode 100644 index df73c8c6..00000000 --- a/modules/joex/src/main/resources/logback.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - true - - - level=%-5level thread=%thread logger=%logger{15} message="%replace(%msg){'"', '\\"'}"%n - - - - - - - - diff --git a/modules/joex/src/main/resources/reference.conf b/modules/joex/src/main/resources/reference.conf index 5285c282..58347c8c 100644 --- a/modules/joex/src/main/resources/reference.conf +++ b/modules/joex/src/main/resources/reference.conf @@ -22,11 +22,11 @@ docspell.joex { logging { # The format for the log messages. Can be one of: # Json, Logfmt, Fancy or Plain - format = "Json" + format = "Plain" # The minimum level to log. From lowest to highest: # Trace, Debug, Info, Warn, Error - minimumLevel = "Debug" + minimum-level = "Info" } # The database connection. diff --git a/modules/restserver/src/main/resources/logback.xml b/modules/restserver/src/main/resources/logback.xml deleted file mode 100644 index 406afe6e..00000000 --- a/modules/restserver/src/main/resources/logback.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - true - - - level=%-5level thread=%thread logger=%logger{15} message="%replace(%msg){'"', '\\"'}"%n - - - - - - - - - - diff --git a/modules/restserver/src/main/resources/reference.conf b/modules/restserver/src/main/resources/reference.conf index b8341816..afd77ae7 100644 --- a/modules/restserver/src/main/resources/reference.conf +++ b/modules/restserver/src/main/resources/reference.conf @@ -25,11 +25,11 @@ docspell.server { logging { # The format for the log messages. Can be one of: # Json, Logfmt, Fancy or Plain - format = "Json" + format = "Plain" # The minimum level to log. From lowest to highest: # Trace, Debug, Info, Warn, Error - minimumLevel = "Debug" + minimum-level = "Info" } # Where the server binds to. diff --git a/modules/store/src/test/resources/logback-test.xml b/modules/store/src/test/resources/logback-test.xml deleted file mode 100644 index 5a9588a0..00000000 --- a/modules/store/src/test/resources/logback-test.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - true - - - level=%-5level thread=%thread logger=%logger{15} message="%replace(%msg){'"', '\\"'}"%n - - - - - - - - diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 53980918..f997362b 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -119,9 +119,9 @@ object Dependencies { val jclOverSlf4j = Seq( "org.slf4j" % "jcl-over-slf4j" % Slf4jVersion ) - val julOverSlf4j = Seq( - "org.slf4j" % "jul-to-slf4j" % Slf4jVersion - ) + // val julOverSlf4j = Seq( + // "org.slf4j" % "jul-to-slf4j" % Slf4jVersion + // ) val poi = Seq( "org.apache.poi" % "poi" % PoiVersion, @@ -269,14 +269,14 @@ object Dependencies { "io.circe" %% "circe-generic-extras" % CirceVersion ) - // https://github.com/Log4s/log4s;ASL 2.0 - val loggingApi = Seq( - "org.log4s" %% "log4s" % Log4sVersion - ) + // // https://github.com/Log4s/log4s;ASL 2.0 + // val loggingApi = Seq( + // "org.log4s" %% "log4s" % Log4sVersion + // ) - val logging = Seq( - "ch.qos.logback" % "logback-classic" % LogbackVersion - ) + // val logging = Seq( + // "ch.qos.logback" % "logback-classic" % LogbackVersion + // ) // https://github.com/melrief/pureconfig // MPL 2.0 diff --git a/project/TestSettings.scala b/project/TestSettings.scala index c1bace05..cf8909e1 100644 --- a/project/TestSettings.scala +++ b/project/TestSettings.scala @@ -29,7 +29,7 @@ object TestSettingsPlugin extends AutoPlugin { import autoImport._ val testSettings = Seq( - libraryDependencies ++= inTest(Dependencies.munit, Dependencies.logging), + libraryDependencies ++= inTest(Dependencies.munit, Dependencies.scribe), testFrameworks += new TestFramework("munit.Framework") )