mirror of
https://github.com/corda/corda.git
synced 2025-03-14 00:06:45 +00:00
ENT-12507 - Upgrade log4j (#7894)
* Upgrade log4j * Added deprecation suppressions
This commit is contained in:
parent
563001e0ac
commit
40ce095398
@ -34,6 +34,7 @@ fun Message.withErrorCodeFor(error: Throwable?, level: Level): Message {
|
||||
error != null && level.isInRange(Level.FATAL, Level.WARN) -> {
|
||||
val logMessage = this.formattedMessage
|
||||
val message = error.walkExceptionCausedByList().asSequence().mapNotNull(Throwable::message).joinToString(" - ")
|
||||
@Suppress("DEPRECATION")
|
||||
CompositeMessage("$logMessage - $message [errorCode=${error.errorCode()}, moreInformationAt=${error.errorCodeLocationUrl()}]", format, parameters, throwable)
|
||||
}
|
||||
else -> this
|
||||
|
@ -31,6 +31,7 @@ class ExceptionsErrorCodeFunctionsTest {
|
||||
for (i in (0..10)) {
|
||||
assertThat(message.formattedMessage, contains("$EXCEPTION_MESSAGE $i".toRegex()))
|
||||
}
|
||||
@Suppress("DEPRECATION")
|
||||
assertEquals(message.format, originalMessage.format)
|
||||
assertEquals(message.parameters, originalMessage.parameters)
|
||||
assertEquals(message.throwable, originalMessage.throwable)
|
||||
|
@ -51,7 +51,7 @@ jerseyVersion=3.1.6
|
||||
servletVersion=4.0.1
|
||||
assertjVersion=3.12.2
|
||||
slf4JVersion=2.0.12
|
||||
log4JVersion=2.23.1
|
||||
log4JVersion=2.24.2
|
||||
okhttpVersion=4.12.0
|
||||
nettyVersion=4.1.115.Final
|
||||
fileuploadVersion=2.0.0-M1
|
||||
|
Loading…
x
Reference in New Issue
Block a user