Skip to content

Commit

Permalink
chore: upgrade slf4j to 2.0.11 (#5207)
Browse files Browse the repository at this point in the history
  • Loading branch information
soloturn authored Jan 21, 2024
1 parent dbb0dae commit 20da7f2
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions build-logic/src/main/kotlin/terasology-metrics.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ dependencies {
pmd("net.sourceforge.pmd:pmd-core:7.0.0-rc4")
pmd("net.sourceforge.pmd:pmd-java:7.0.0-rc4")

testRuntimeOnly("ch.qos.logback:logback-classic:1.2.12") {
testRuntimeOnly("ch.qos.logback:logback-classic:1.4.14") {
because("runtime: to configure logging during tests with logback.xml")
}
testRuntimeOnly("org.codehaus.janino:janino:3.1.7") {
because("allows use of EvaluatorFilter in logback.xml")
}
testRuntimeOnly("org.slf4j:jul-to-slf4j:1.7.36") {
testRuntimeOnly("org.slf4j:jul-to-slf4j:2.0.11") {
because("redirects java.util.logging (from e.g. junit) through slf4j")
}

Expand Down
2 changes: 1 addition & 1 deletion build-logic/src/main/kotlin/terasology-module.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ if (project.name == "ModuleTestingEnvironment") {
dependencies {
// MTE is a special snowflake, it gets these things as non-test dependencies
implementation(group = "org.terasology.engine", name = "engine-tests", version = moduleMetadata.engineVersion())
implementation("ch.qos.logback:logback-classic:1.2.12")
implementation("ch.qos.logback:logback-classic:1.4.14")
runtimeOnly("org.codehaus.janino:janino:3.1.3") {
because("logback filters")
}
Expand Down
2 changes: 1 addition & 1 deletion engine-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ dependencies {

implementation("org.terasology.joml-ext:joml-test:0.1.0")

testImplementation("ch.qos.logback:logback-classic:1.4.11") {
testImplementation("ch.qos.logback:logback-classic:1.4.14") {
because("implementation: a test directly uses logback.classic classes")
}

Expand Down
4 changes: 2 additions & 2 deletions engine/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,10 @@ dependencies {
implementation("de.matthiasmann.twl:PNGDecoder:1111")

// Logging
implementation("org.slf4j:slf4j-api:1.7.36") {
implementation("org.slf4j:slf4j-api:2.0.11") {
because("a backend-independent Logger")
}
implementation("ch.qos.logback:logback-classic:1.2.12") {
implementation("ch.qos.logback:logback-classic:1.4.14") {
because("telemetry implementation uses logback to send to logstash " +
"and we bundle org.terasology.logback for the regex filter")
}
Expand Down
4 changes: 2 additions & 2 deletions facades/PC/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,13 @@ dependencies {
// TODO: Consider whether we can move the CR dependency back here from the engine, where it is referenced from the main menu
implementation(group = "org.terasology.crashreporter", name = "cr-terasology", version = "5.0.0")

runtimeOnly("ch.qos.logback:logback-classic:1.2.12") {
runtimeOnly("ch.qos.logback:logback-classic:1.4.14") {
because("to configure logging with logback.xml")
}
runtimeOnly("org.codehaus.janino:janino:3.1.7") {
because("allows use of EvaluatorFilter in logback.xml")
}
runtimeOnly("org.slf4j:jul-to-slf4j:1.7.36") {
runtimeOnly("org.slf4j:jul-to-slf4j:2.0.11") {
because("redirects java.util.logging from miscellaneous dependencies through slf4j")
}

Expand Down
4 changes: 2 additions & 2 deletions subsystems/TypeHandlerLibrary/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ configure<SourceSetContainer> {
}

dependencies {
implementation("org.slf4j:slf4j-api:1.7.32")
implementation("org.slf4j:slf4j-api:2.0.11")
implementation("net.sf.trove4j:trove4j:3.0.3")

implementation("org.terasology:reflections:0.9.12-MB")
implementation("org.terasology.nui:nui-reflect:3.0.0")
implementation("org.terasology.gestalt:gestalt-module:7.1.0")
implementation("org.terasology.gestalt:gestalt-asset-core:7.1.0")

testRuntimeOnly("org.slf4j:slf4j-simple:1.7.32") {
testRuntimeOnly("org.slf4j:slf4j-simple:2.0.11") {
because("log output during tests")
}
testImplementation(platform("org.junit:junit-bom:5.10.1")) {
Expand Down

0 comments on commit 20da7f2

Please sign in to comment.