Skip to content

Commit 4915165

Browse files
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]>
1 parent 4042ec8 commit 4915165

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

log4j-to-slf4j/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
org.jspecify;transitive=false
5151
</bnd-extra-module-options>
5252

53-
<slf4j2.version>2.0.16</slf4j2.version>
53+
<slf4j2.version>2.0.17</slf4j2.version>
5454
</properties>
5555

5656
<dependencyManagement>

log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/MDCContextMapTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,13 @@
2626
import org.apache.logging.log4j.spi.ThreadContextMap;
2727
import org.junit.jupiter.api.Test;
2828
import org.junitpioneer.jupiter.Issue;
29-
import org.slf4j.MDCTestHelper;
3029
import org.slf4j.spi.MDCAdapter;
3130

3231
class MDCContextMapTest {
3332

3433
@Test
3534
@Issue("https://github.com/apache/logging-log4j2/issues/1426")
36-
void nonNullGetCopy() {
35+
void nonNullGetCopy() throws Exception {
3736
final ThreadContextMap contextMap = new MDCContextMap();
3837
final MDCAdapter mockAdapter = mock(MDCAdapter.class);
3938
when(mockAdapter.getCopyOfContextMap()).thenReturn(null);

log4j-to-slf4j/src/test/java/org/slf4j/MDCTestHelper.java renamed to log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/MDCTestHelper.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,19 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.slf4j;
17+
package org.apache.logging.slf4j;
1818

19+
import java.lang.reflect.Field;
20+
import org.slf4j.MDC;
1921
import org.slf4j.spi.MDCAdapter;
2022

21-
public class MDCTestHelper {
23+
class MDCTestHelper {
2224

23-
public static MDCAdapter replaceMDCAdapter(final MDCAdapter adapter) {
24-
final MDCAdapter old = MDC.mdcAdapter;
25-
MDC.mdcAdapter = adapter;
25+
static MDCAdapter replaceMDCAdapter(final MDCAdapter adapter) throws Exception {
26+
Field mdcAdapterField = MDC.class.getDeclaredField("MDC_ADAPTER");
27+
mdcAdapterField.setAccessible(true);
28+
final MDCAdapter old = (MDCAdapter) mdcAdapterField.get(null);
29+
mdcAdapterField.set(null, adapter);
2630
return old;
2731
}
2832
}

0 commit comments

Comments
 (0)