From 1c40e969f7134922c66994f34da027c3107a15a7 Mon Sep 17 00:00:00 2001
From: Chris Cochrane <78791827+chriscochrane@users.noreply.github.com>
Date: Fri, 13 Dec 2024 09:32:00 +0000
Subject: [PATCH] ENT-12507 - Revert Log4j (#7895)

* Rollback log4j

* Revert Log4j further
---
 .../net/corda/common/logging/ExceptionsErrorCodeFunctions.kt    | 1 -
 .../corda/commmon/logging/ExceptionsErrorCodeFunctionsTest.kt   | 1 -
 constants.properties                                            | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/common/logging/src/main/kotlin/net/corda/common/logging/ExceptionsErrorCodeFunctions.kt b/common/logging/src/main/kotlin/net/corda/common/logging/ExceptionsErrorCodeFunctions.kt
index 8f9fd3a539..3064fce1cc 100644
--- a/common/logging/src/main/kotlin/net/corda/common/logging/ExceptionsErrorCodeFunctions.kt
+++ b/common/logging/src/main/kotlin/net/corda/common/logging/ExceptionsErrorCodeFunctions.kt
@@ -34,7 +34,6 @@ 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
diff --git a/common/logging/src/test/kotlin/net/corda/commmon/logging/ExceptionsErrorCodeFunctionsTest.kt b/common/logging/src/test/kotlin/net/corda/commmon/logging/ExceptionsErrorCodeFunctionsTest.kt
index c84a01c341..971f02c13e 100644
--- a/common/logging/src/test/kotlin/net/corda/commmon/logging/ExceptionsErrorCodeFunctionsTest.kt
+++ b/common/logging/src/test/kotlin/net/corda/commmon/logging/ExceptionsErrorCodeFunctionsTest.kt
@@ -31,7 +31,6 @@ 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)
diff --git a/constants.properties b/constants.properties
index 04cde79c7e..97602c1d30 100644
--- a/constants.properties
+++ b/constants.properties
@@ -51,7 +51,7 @@ jerseyVersion=3.1.6
 servletVersion=4.0.1
 assertjVersion=3.12.2
 slf4JVersion=2.0.12
-log4JVersion=2.24.2
+log4JVersion=2.23.0
 okhttpVersion=4.12.0
 nettyVersion=4.1.115.Final
 fileuploadVersion=2.0.0-M1