diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index f864fe49a..cd6b7abcb 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -61,7 +61,7 @@ object Versions { const val logback = "1.2.5" const val slf4j = "2.0.3" - const val log4j = "2.17.2" + const val log4j = "2.19.0" const val asm = "9.4" const val difflib = "1.3.0" const val netty = "4.1.63.Final" @@ -230,7 +230,7 @@ const val `slf4j-simple` = "org.slf4j:slf4j-simple:" + Versions.slf4j const val `log4j-api` = "org.apache.logging.log4j:log4j-api:" + Versions.log4j const val `log4j-core` = "org.apache.logging.log4j:log4j-core:" + Versions.log4j -const val `log4j-slf4j-impl` = "org.apache.logging.log4j:log4j-slf4j-impl:" + Versions.log4j +const val `log4j-slf4j2-impl` = "org.apache.logging.log4j:log4j-slf4j2-impl:" + Versions.log4j const val `log4j-to-slf4j` = "org.apache.logging.log4j:log4j-to-slf4j:" + Versions.log4j val ATTRIBUTE_MIRAI_TARGET_PLATFORM: Attribute = Attribute.of("mirai.target.platform", String::class.java) diff --git a/logging/mirai-logging-log4j2/build.gradle.kts b/logging/mirai-logging-log4j2/build.gradle.kts index 2f71c7b35..6138264e5 100644 --- a/logging/mirai-logging-log4j2/build.gradle.kts +++ b/logging/mirai-logging-log4j2/build.gradle.kts @@ -26,7 +26,7 @@ dependencies { api(project(":mirai-core-api")) api(`log4j-api`) api(`log4j-core`) - api(`log4j-slf4j-impl`) + api(`log4j-slf4j2-impl`) testImplementation(`slf4j-api`) diff --git a/logging/mirai-logging-slf4j-logback/build.gradle.kts b/logging/mirai-logging-slf4j-logback/build.gradle.kts index 78f520fab..bae15358c 100644 --- a/logging/mirai-logging-slf4j-logback/build.gradle.kts +++ b/logging/mirai-logging-slf4j-logback/build.gradle.kts @@ -26,7 +26,7 @@ dependencies { api(project(":mirai-core-api")) api(project(":mirai-logging-slf4j")) // mirai -> slf4j implementation(project(":mirai-logging-log4j2")) { - exclude("org.apache.logging.log4j", "log4j-slf4j-impl") + exclude("org.apache.logging.log4j", "log4j-slf4j2-impl") } // mirai -> log4j2 api(`slf4j-api`) api(`logback-classic`) diff --git a/logging/mirai-logging-slf4j/build.gradle.kts b/logging/mirai-logging-slf4j/build.gradle.kts index a06e9681f..9a238b8f6 100644 --- a/logging/mirai-logging-slf4j/build.gradle.kts +++ b/logging/mirai-logging-slf4j/build.gradle.kts @@ -25,7 +25,7 @@ kotlin { dependencies { api(project(":mirai-core-api")) implementation(project(":mirai-logging-log4j2")) { - exclude("org.apache.logging.log4j", "log4j-slf4j-impl") + exclude("org.apache.logging.log4j", "log4j-slf4j2-impl") } // mirai -> log4j2 implementation(`log4j-to-slf4j`) // log4j2 -> slf4j api(`slf4j-api`)