Merge pull request #29 from jamezp/JBLOGGING-136

Component upgrades
jboss-logging · Apr 12, 2019 · 3dca1e3 · 3dca1e3
2 parents b295cfc + 84a3467
commit 3dca1e3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 34 deletions.
diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-parent</artifactId>
-        <version>15</version>
+        <version>34</version>
     </parent>
 
     <licenses>
@@ -32,16 +32,9 @@
     <properties>
         <!-- Dependency versions -->
         <version.org.apache.log4j>1.2.16</version.org.apache.log4j>
-        <version.org.apache.logging.log4j>2.0</version.org.apache.logging.log4j>
-        <version.org.jboss.logmanager>1.5.2.Final</version.org.jboss.logmanager>
-        <version.org.sfl4j>1.7.2</version.org.sfl4j>
-
-        <!-- Plugin versions -->
-        <version.org.jboss.apiviz.apiviz>1.3.2.GA</version.org.jboss.apiviz.apiviz>
-
-        <!--  maven-compiler-plugin  -->
-        <maven.compiler.target>1.6</maven.compiler.target>
-        <maven.compiler.source>1.6</maven.compiler.source>
+        <version.org.apache.logging.log4j>2.11.2</version.org.apache.logging.log4j>
+        <version.org.jboss.logmanager>2.1.9.Final</version.org.jboss.logmanager>
+        <version.org.sfl4j>1.7.25</version.org.sfl4j>
     </properties>
 
     <dependencies>
@@ -89,26 +82,6 @@
             <plugin>
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
-            <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <detectJavaApiLink>false</detectJavaApiLink>
-                    <detectLinks>false</detectLinks>
-                    <doclet>net.gleamynode.apiviz.APIviz</doclet>
-                    <docletArtifact>
-                        <groupId>org.jboss.apiviz</groupId>
-                        <artifactId>apiviz</artifactId>
-                        <version>${version.org.jboss.apiviz.apiviz}</version>
-                    </docletArtifact>
-                    <doctitle><![CDATA[JBoss Logging ]]>${project.version}</doctitle>
-                    <header><![CDATA[JBoss Logging ]]>${project.version}</header>
-                    <footer><![CDATA[JBoss Logging ]]>${project.version}</footer>
-                    <bottom><![CDATA[<i>Copyright &#169; 2015 Red Hat, Inc.</i>]]></bottom>
-                    <links>
-                        <link>http://java.sun.com/javase/6/docs/api/</link>
-                    </links>
-                </configuration>
-            </plugin>
             <!-- Adding OSGI metadata to the JAR without changing the packaging type. -->
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>

diff --git a/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java b/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java
@@ -19,6 +19,7 @@
 package org.jboss.logging;
 
 import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.slf4j.LoggerFactory;
@@ -60,9 +61,9 @@ public void removeMdc(final String key) {
         MDC.remove(key);
     }
 
+    @SuppressWarnings("unchecked")
     public Map<String, Object> getMdcMap() {
-        @SuppressWarnings({"unchecked"})
-        final Map<String, Object> map = MDC.getCopyOfContextMap();
-        return map == null ? Collections.<String, Object>emptyMap() : map;
+        final Map copy = MDC.getCopyOfContextMap();
+        return copy == null ? Collections.emptyMap() : new LinkedHashMap<>(copy);
     }
 }