This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/2.x by this push:
new 4915165963 Bump org.slf4j:slf4j-api from 2.0.16 to 2.0.17 in
/log4j-to-slf4j (#3500)
4915165963 is described below
commit 491516596385176183fcfa31fb44bbce68d230b1
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Thu Apr 17 19:41:50 2025 +0200
Bump org.slf4j:slf4j-api from 2.0.16 to 2.0.17 in /log4j-to-slf4j (#3500)
* 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] <[email protected]>
* Adapt to package-private field name change
---------
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Piotr P. Karwasz <[email protected]>
Co-authored-by: Piotr P. Karwasz <[email protected]>
---
log4j-to-slf4j/pom.xml | 2 +-
.../java/org/apache/logging/slf4j/MDCContextMapTest.java | 3 +--
.../java/org/{ => apache/logging}/slf4j/MDCTestHelper.java | 14 +++++++++-----
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/log4j-to-slf4j/pom.xml b/log4j-to-slf4j/pom.xml
index 68f305133a..3a6b0d9e85 100644
--- a/log4j-to-slf4j/pom.xml
+++ b/log4j-to-slf4j/pom.xml
@@ -50,7 +50,7 @@
org.jspecify;transitive=false
</bnd-extra-module-options>
- <slf4j2.version>2.0.16</slf4j2.version>
+ <slf4j2.version>2.0.17</slf4j2.version>
</properties>
<dependencyManagement>
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 6673de4597..51b19cc07c 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 static org.mockito.Mockito.when;
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 0256131b8f..8a85a1015d 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;
}
}
