From 0a70a94223c90c1820c6b5cb00698d06526bca51 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Feb 2025 11:29:26 +0000 Subject: [PATCH 1/2] Bump org.slf4j:slf4j-api from 2.0.16 to 2.0.17 in /log4j-to-slf4j Bumps org.slf4j:slf4j-api from 2.0.16 to 2.0.17. --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- log4j-to-slf4j/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/log4j-to-slf4j/pom.xml b/log4j-to-slf4j/pom.xml index 68f305133aa..3a6b0d9e850 100644 --- a/log4j-to-slf4j/pom.xml +++ b/log4j-to-slf4j/pom.xml @@ -50,7 +50,7 @@ org.jspecify;transitive=false - 2.0.16 + 2.0.17 From 8cefa09eb74c2b53876723336fe637e33ef6c8b7 Mon Sep 17 00:00:00 2001 From: "Piotr P. Karwasz" Date: Mon, 17 Mar 2025 10:05:29 +0100 Subject: [PATCH 2/2] Adapt to package-private field name change --- .../apache/logging/slf4j/MDCContextMapTest.java | 3 +-- .../{ => apache/logging}/slf4j/MDCTestHelper.java | 14 +++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) rename log4j-to-slf4j/src/test/java/org/{ => apache/logging}/slf4j/MDCTestHelper.java (66%) diff --git a/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/MDCContextMapTest.java b/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/MDCContextMapTest.java index 6673de4597a..51b19cc07ce 100644 --- a/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/MDCContextMapTest.java +++ b/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/MDCContextMapTest.java @@ -26,14 +26,13 @@ import org.apache.logging.log4j.spi.ThreadContextMap; import org.junit.jupiter.api.Test; import org.junitpioneer.jupiter.Issue; -import org.slf4j.MDCTestHelper; import org.slf4j.spi.MDCAdapter; class MDCContextMapTest { @Test @Issue("https://github.com/apache/logging-log4j2/issues/1426") - void nonNullGetCopy() { + void nonNullGetCopy() throws Exception { final ThreadContextMap contextMap = new MDCContextMap(); final MDCAdapter mockAdapter = mock(MDCAdapter.class); when(mockAdapter.getCopyOfContextMap()).thenReturn(null); diff --git a/log4j-to-slf4j/src/test/java/org/slf4j/MDCTestHelper.java b/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/MDCTestHelper.java similarity index 66% rename from log4j-to-slf4j/src/test/java/org/slf4j/MDCTestHelper.java rename to log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/MDCTestHelper.java index 0256131b8f2..8a85a1015dd 100644 --- a/log4j-to-slf4j/src/test/java/org/slf4j/MDCTestHelper.java +++ b/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/MDCTestHelper.java @@ -14,15 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.slf4j; +package org.apache.logging.slf4j; +import java.lang.reflect.Field; +import org.slf4j.MDC; import org.slf4j.spi.MDCAdapter; -public class MDCTestHelper { +class MDCTestHelper { - public static MDCAdapter replaceMDCAdapter(final MDCAdapter adapter) { - final MDCAdapter old = MDC.mdcAdapter; - MDC.mdcAdapter = adapter; + static MDCAdapter replaceMDCAdapter(final MDCAdapter adapter) throws Exception { + Field mdcAdapterField = MDC.class.getDeclaredField("MDC_ADAPTER"); + mdcAdapterField.setAccessible(true); + final MDCAdapter old = (MDCAdapter) mdcAdapterField.get(null); + mdcAdapterField.set(null, adapter); return old; } }