ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-18 20:47:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ENT-12507 - Revert Log4j (#7895)

Browse Source 
* Rollback log4j

* Revert Log4j further
This commit is contained in:
Chris Cochrane 2024-12-13 09:32:00 +00:00 committed by GitHub
parent 40ce095398
commit 1c40e969f7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/logging/src/main/kotlin/net/corda/common/logging/ExceptionsErrorCodeFunctions.kt
View File

@ -34,7 +34,6 @@ fun Message.withErrorCodeFor(error: Throwable?, level: Level): Message {
error != null && level.isInRange(Level.FATAL, Level.WARN) -> { error != null && level.isInRange(Level.FATAL, Level.WARN) -> {
val logMessage = this.formattedMessage val logMessage = this.formattedMessage
val message = error.walkExceptionCausedByList().asSequence().mapNotNull(Throwable::message).joinToString(" - ") val message = error.walkExceptionCausedByList().asSequence().mapNotNull(Throwable::message).joinToString(" - ")
@Suppress("DEPRECATION")
CompositeMessage("$logMessage - $message [errorCode=${error.errorCode()}, moreInformationAt=${error.errorCodeLocationUrl()}]", format, parameters, throwable) CompositeMessage("$logMessage - $message [errorCode=${error.errorCode()}, moreInformationAt=${error.errorCodeLocationUrl()}]", format, parameters, throwable)
} }
else -> this else -> this

1
common/logging/src/test/kotlin/net/corda/commmon/logging/ExceptionsErrorCodeFunctionsTest.kt
View File

@ -31,7 +31,6 @@ class ExceptionsErrorCodeFunctionsTest {
for (i in (0..10)) { for (i in (0..10)) {
assertThat(message.formattedMessage, contains("$EXCEPTION_MESSAGE $i".toRegex())) assertThat(message.formattedMessage, contains("$EXCEPTION_MESSAGE $i".toRegex()))
} }
@Suppress("DEPRECATION")
assertEquals(message.format, originalMessage.format) assertEquals(message.format, originalMessage.format)
assertEquals(message.parameters, originalMessage.parameters) assertEquals(message.parameters, originalMessage.parameters)
assertEquals(message.throwable, originalMessage.throwable) assertEquals(message.throwable, originalMessage.throwable)

2
constants.properties
View File

@ -51,7 +51,7 @@ jerseyVersion=3.1.6
servletVersion=4.0.1 servletVersion=4.0.1
assertjVersion=3.12.2 assertjVersion=3.12.2
slf4JVersion=2.0.12 slf4JVersion=2.0.12
log4JVersion=2.24.2 log4JVersion=2.23.0
okhttpVersion=4.12.0 okhttpVersion=4.12.0
nettyVersion=4.1.115.Final nettyVersion=4.1.115.Final
fileuploadVersion=2.0.0-M1 fileuploadVersion=2.0.0-M1