Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade slf4j-2.0, permit passing suppliers to loggers, and thus lazy… #5174

Merged
merged 1 commit into from
Nov 17, 2023
Merged

upgrade slf4j-2.0, permit passing suppliers to loggers, and thus lazy… #5174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build-logic/src/main/kotlin/terasology-metrics.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ dependencies {
pmd("net.sourceforge.pmd:pmd-core:6.55.0")
pmd("net.sourceforge.pmd:pmd-java:6.55.0")

testRuntimeOnly("ch.qos.logback:logback-classic:1.2.11") {
testRuntimeOnly("ch.qos.logback:logback-classic:1.2.12") {
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.9") {
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
View file
Open in desktop
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.3")
implementation("ch.qos.logback:logback-classic:1.2.12")
runtimeOnly("org.codehaus.janino:janino:3.1.3") {
because("logback filters")
}
Expand Down
4 changes: 2 additions & 2 deletions engine-tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ dependencies {

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

implementation('org.slf4j:slf4j-api:1.7.36') {
implementation('org.slf4j:slf4j-api:2.0.9') {
because('a backend-independent Logger')
}

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

Expand Down
6 changes: 3 additions & 3 deletions engine/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,10 @@ dependencies {
implementation group: 'de.matthiasmann.twl', name: 'PNGDecoder', version: '1111'

// Logging
implementation('org.slf4j:slf4j-api:1.7.36') {
implementation('org.slf4j:slf4j-api:2.0.9') {
because('a backend-independent Logger')
}
implementation("ch.qos.logback:logback-classic:1.2.11") {
implementation("ch.qos.logback:logback-classic:1.2.12") {
because("telemetry implementation uses logback to send to logstash " +
"and we bundle org.terasology.logback for the regex filter")
}
Expand All @@ -133,7 +133,7 @@ dependencies {
implementation(group: 'com.snowplowanalytics', name: 'snowplow-java-tracker', version: '0.12.1') {
exclude group: 'org.slf4j', module: 'slf4j-simple'
}
implementation group: 'net.logstash.logback', name: 'logstash-logback-encoder', version: '7.2'
implementation group: 'net.logstash.logback', name: 'logstash-logback-encoder', version: '7.4'

// Our developed libs
api group: 'org.terasology.gestalt', name: 'gestalt-asset-core', version: '7.2.0-SNAPSHOT'
Expand Down
2 changes: 1 addition & 1 deletion engine/src/main/resources/org/terasology/engine/logback/setup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
<newRule pattern="*/appender/denyRegex" actionClass="org.terasology.logback.RegexFilterAction" />
<newRule pattern="*/appender/requireRegex" actionClass="org.terasology.logback.RegexFilterAction" />

<!-- allow include inside appenders (logback 1.2.11 only enabled Include on the root config by default.) -->
<!-- allow include inside appenders (logback 1.2 only enabled Include on the root config by default.) -->
<newRule pattern="*/appender/include" actionClass="ch.qos.logback.core.joran.action.IncludeAction" />
</included>
2 changes: 1 addition & 1 deletion facades/PC/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ 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.11") {
runtimeOnly("ch.qos.logback:logback-classic:1.2.12") {
because("to configure logging with logback.xml")
}
runtimeOnly("org.codehaus.janino:janino:3.1.7") {
Expand Down
Loading