Revert "Scoped context (#2438)"

This reverts the changes that introduces `ScopedContext`.

Author: ppkarwasz

log4j-api-test/pom.xml

@@ -37,7 +37,6 @@
     <bnd-module-name>org.apache.logging.log4j.test</bnd-module-name>
     <bnd-extra-package-options>
       org.apache.commons.lang3.*;resolution:=optional,
-      org.assertj.*;resolution:=optional,
       <!-- Both JUnit 4 and JUnit 5 are not required -->
       org.junit.*;resolution:=optional,
       org.hamcrest.*;resolution:=optional,
@@ -49,7 +48,6 @@
     <bnd-extra-module-options>
       <!-- Non-transitive static modules -->
       junit;transitive=false,
-      org.assertj.core;transitive=false,
       org.hamcrest;transitive=false,
       org.junit.jupiter.api;transitive=false,
       org.junitpioneer;transitive=false,
@@ -74,10 +72,6 @@
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
@@ -114,6 +108,11 @@
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
     <!-- Required for JSON support -->
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>

log4j-api-test/src/main/java/org/apache/logging/log4j/test/TestLogger.java

@@ -20,7 +20,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.apache.logging.log4j.Level;
@@ -29,7 +28,6 @@
 import org.apache.logging.log4j.message.Message;
 import org.apache.logging.log4j.message.MessageFactory;
 import org.apache.logging.log4j.spi.AbstractLogger;
-import org.apache.logging.log4j.util.ProviderUtil;
 
 /**
  *
@@ -81,12 +79,7 @@ protected void log(
             sb.append(' ');
         }
         sb.append(message.getFormattedMessage());
-        final Map<String, ?> contextMap =
-                ProviderUtil.getProvider().getScopedContextProvider().getContextMap();
-        final Map<String, String> mdc = new HashMap<>(ThreadContext.getImmutableContext());
-        if (contextMap != null && !contextMap.isEmpty()) {
-            contextMap.forEach((key, value) -> mdc.put(key, value.toString()));
-        }
+        final Map<String, String> mdc = ThreadContext.getImmutableContext();
         if (!mdc.isEmpty()) {
             sb.append(' ');
             sb.append(mdc);