diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index c55a7d41..d28b2cb5 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -13,7 +13,7 @@ fun Project.baseProject() { kotlinProject() dependencies { - "implementation"("io.github.microutils:kotlin-logging:${Versions.kotlinLogging}") + "implementation"("io.github.oshai:kotlin-logging:${Versions.kotlinLogging}") "testImplementation"("org.junit.jupiter:junit-jupiter-api:${Versions.junit}") "testImplementation"("org.junit.jupiter:junit-jupiter-params:${ Versions.junit }") diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 9a00957c..68647098 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,6 +1,6 @@ object Versions { const val kotlin = "1.6.21" - const val kotlinLogging = "3.0.1" + const val kotlinLogging = "4.0.2" const val logbackClassic = "1.3.3" const val junit = "5.7.0" const val testcontainers = "1.17.4" diff --git a/modules/cli/src/main/kotlin/datamaintain/cli/app/utils/LogUtils.kt b/modules/cli/src/main/kotlin/datamaintain/cli/app/utils/LogUtils.kt index 5a1f97e8..38bb9c1d 100644 --- a/modules/cli/src/main/kotlin/datamaintain/cli/app/utils/LogUtils.kt +++ b/modules/cli/src/main/kotlin/datamaintain/cli/app/utils/LogUtils.kt @@ -1,5 +1,5 @@ package datamaintain.cli.app.utils -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging val logger = KotlinLogging.logger {} \ No newline at end of file diff --git a/modules/core/src/main/kotlin/datamaintain/core/Datamaintain.kt b/modules/core/src/main/kotlin/datamaintain/core/Datamaintain.kt index c506c214..122aba3f 100644 --- a/modules/core/src/main/kotlin/datamaintain/core/Datamaintain.kt +++ b/modules/core/src/main/kotlin/datamaintain/core/Datamaintain.kt @@ -9,7 +9,7 @@ import datamaintain.core.step.check.CheckerData import datamaintain.core.step.executor.Executor import datamaintain.core.step.sort.Sorter import datamaintain.domain.report.Report -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging private val logger = KotlinLogging.logger {} diff --git a/modules/core/src/main/kotlin/datamaintain/core/config/DatamaintainConfig.kt b/modules/core/src/main/kotlin/datamaintain/core/config/DatamaintainConfig.kt index 2f8ae2f4..85452ddb 100644 --- a/modules/core/src/main/kotlin/datamaintain/core/config/DatamaintainConfig.kt +++ b/modules/core/src/main/kotlin/datamaintain/core/config/DatamaintainConfig.kt @@ -9,7 +9,7 @@ import datamaintain.core.script.TagMatcher import datamaintain.core.step.executor.ExecutionMode import datamaintain.domain.script.ScriptAction import datamaintain.domain.script.Tag -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import java.io.File import java.io.InputStream import java.nio.file.Path diff --git a/modules/core/src/main/kotlin/datamaintain/core/report/Report.kt b/modules/core/src/main/kotlin/datamaintain/core/report/Report.kt index 01c4229c..f83756aa 100644 --- a/modules/core/src/main/kotlin/datamaintain/core/report/Report.kt +++ b/modules/core/src/main/kotlin/datamaintain/core/report/Report.kt @@ -2,7 +2,7 @@ package datamaintain.core.report import datamaintain.core.step.Step import datamaintain.domain.report.Report -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging private val logger = KotlinLogging.logger {} diff --git a/modules/core/src/main/kotlin/datamaintain/core/step/Filter.kt b/modules/core/src/main/kotlin/datamaintain/core/step/Filter.kt index e99706f9..6c8111f3 100644 --- a/modules/core/src/main/kotlin/datamaintain/core/step/Filter.kt +++ b/modules/core/src/main/kotlin/datamaintain/core/step/Filter.kt @@ -4,7 +4,7 @@ import datamaintain.core.Context import datamaintain.core.exception.DatamaintainBaseException import datamaintain.core.exception.DatamaintainException import datamaintain.domain.script.ScriptWithContent -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging private val logger = KotlinLogging.logger {} diff --git a/modules/core/src/main/kotlin/datamaintain/core/step/Pruner.kt b/modules/core/src/main/kotlin/datamaintain/core/step/Pruner.kt index b4416864..1d781aeb 100644 --- a/modules/core/src/main/kotlin/datamaintain/core/step/Pruner.kt +++ b/modules/core/src/main/kotlin/datamaintain/core/step/Pruner.kt @@ -5,7 +5,7 @@ import datamaintain.core.exception.DatamaintainBaseException import datamaintain.core.exception.DatamaintainException import datamaintain.domain.script.ScriptAction import datamaintain.domain.script.ScriptWithContent -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging private val logger = KotlinLogging.logger {} diff --git a/modules/core/src/main/kotlin/datamaintain/core/step/Scanner.kt b/modules/core/src/main/kotlin/datamaintain/core/step/Scanner.kt index 8ccb48b9..bb4deae9 100644 --- a/modules/core/src/main/kotlin/datamaintain/core/step/Scanner.kt +++ b/modules/core/src/main/kotlin/datamaintain/core/step/Scanner.kt @@ -7,7 +7,7 @@ import datamaintain.core.exception.DatamaintainException import datamaintain.core.script.FileScript import datamaintain.domain.script.ScriptWithContent import datamaintain.domain.script.Tag -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import java.io.File import java.nio.file.Path diff --git a/modules/core/src/main/kotlin/datamaintain/core/step/check/Checker.kt b/modules/core/src/main/kotlin/datamaintain/core/step/check/Checker.kt index fdf905d6..a31e9c61 100644 --- a/modules/core/src/main/kotlin/datamaintain/core/step/check/Checker.kt +++ b/modules/core/src/main/kotlin/datamaintain/core/step/check/Checker.kt @@ -14,7 +14,7 @@ import datamaintain.core.step.check.rules.implementations.SameScriptsAsExecutedC import datamaintain.domain.CheckRule import datamaintain.domain.ScriptType import datamaintain.domain.script.ScriptWithContent -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging private val logger = KotlinLogging.logger {} diff --git a/modules/core/src/main/kotlin/datamaintain/core/step/executor/Executor.kt b/modules/core/src/main/kotlin/datamaintain/core/step/executor/Executor.kt index 08768d85..44d3e104 100644 --- a/modules/core/src/main/kotlin/datamaintain/core/step/executor/Executor.kt +++ b/modules/core/src/main/kotlin/datamaintain/core/step/executor/Executor.kt @@ -8,7 +8,7 @@ import datamaintain.core.step.Step import datamaintain.domain.report.Report import datamaintain.domain.script.* import datamaintain.core.util.exception.DatamaintainQueryException -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import kotlin.system.measureTimeMillis private val logger = KotlinLogging.logger {} diff --git a/modules/core/src/main/kotlin/datamaintain/core/step/sort/Sorter.kt b/modules/core/src/main/kotlin/datamaintain/core/step/sort/Sorter.kt index 018c802d..871087c3 100644 --- a/modules/core/src/main/kotlin/datamaintain/core/step/sort/Sorter.kt +++ b/modules/core/src/main/kotlin/datamaintain/core/step/sort/Sorter.kt @@ -6,7 +6,7 @@ import datamaintain.core.exception.DatamaintainException import datamaintain.core.step.Step import datamaintain.domain.script.Script import datamaintain.domain.script.ScriptWithContent -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging private val logger = KotlinLogging.logger {} diff --git a/modules/driver-jdbc/src/main/kotlin/datamaintain/db/driver/jdbc/JdbcDriverConfig.kt b/modules/driver-jdbc/src/main/kotlin/datamaintain/db/driver/jdbc/JdbcDriverConfig.kt index 29757bd5..55e12e5c 100644 --- a/modules/driver-jdbc/src/main/kotlin/datamaintain/db/driver/jdbc/JdbcDriverConfig.kt +++ b/modules/driver-jdbc/src/main/kotlin/datamaintain/db/driver/jdbc/JdbcDriverConfig.kt @@ -6,7 +6,7 @@ import datamaintain.core.db.driver.DBType import datamaintain.core.db.driver.DatamaintainDriverConfig import datamaintain.core.db.driver.DriverConfigKey import datamaintain.core.exception.DatamaintainBuilderMandatoryException -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import java.util.* private val logger = KotlinLogging.logger {} diff --git a/modules/driver-mongo/src/main/kotlin/datamaintain/db/driver/mongo/MongoDriver.kt b/modules/driver-mongo/src/main/kotlin/datamaintain/db/driver/mongo/MongoDriver.kt index 68ec3524..45eeba90 100644 --- a/modules/driver-mongo/src/main/kotlin/datamaintain/db/driver/mongo/MongoDriver.kt +++ b/modules/driver-mongo/src/main/kotlin/datamaintain/db/driver/mongo/MongoDriver.kt @@ -10,7 +10,7 @@ import datamaintain.domain.script.ExecutedScript import datamaintain.domain.script.ExecutionStatus import datamaintain.domain.script.LightExecutedScript import datamaintain.domain.script.ScriptWithContent -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import java.io.InputStream import java.nio.file.Path import kotlin.streams.asSequence diff --git a/modules/driver-mongo/src/main/kotlin/datamaintain/db/driver/mongo/MongoDriverConfig.kt b/modules/driver-mongo/src/main/kotlin/datamaintain/db/driver/mongo/MongoDriverConfig.kt index 5dbfda6b..7af53628 100644 --- a/modules/driver-mongo/src/main/kotlin/datamaintain/db/driver/mongo/MongoDriverConfig.kt +++ b/modules/driver-mongo/src/main/kotlin/datamaintain/db/driver/mongo/MongoDriverConfig.kt @@ -6,7 +6,7 @@ import datamaintain.core.db.driver.DatamaintainDriverConfig import datamaintain.core.db.driver.DriverConfigKey import datamaintain.core.exception.DatamaintainBuilderMandatoryException import datamaintain.db.driver.mongo.exception.DatamaintainMongoClientNotFound -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import java.nio.file.Files import java.nio.file.Path import java.nio.file.Paths