Update log4j to 2.16.0, release 7.4.4

SpongePowered · Dec 14, 2021 · db1a34c · db1a34c
1 parent 127ba87
commit db1a34c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/SpongeCommon b/SpongeCommon
diff --git a/build.gradle b/build.gradle
@@ -94,8 +94,8 @@ dependencies {
     runtime 'org.jline:jline-terminal-jansi:3.12.1'
 
     // log4j 2.15 to avoid nasty exploit
-    runtime 'org.apache.logging.log4j:log4j-api:2.15.0'
-    runtime 'org.apache.logging.log4j:log4j-core:2.15.0'
+    runtime 'org.apache.logging.log4j:log4j-api:2.16.0'
+    runtime 'org.apache.logging.log4j:log4j-core:2.16.0'
 
     shadow 'org.ow2.asm:asm-all:5.2'
 
@@ -149,8 +149,8 @@ shadowJar {
         include dependency('org.jline:jline-reader')
         include dependency('org.fusesource.jansi:jansi')
 
-        include dependency('org.apache.logging.log4j:log4j-api:2.15.0')
-        include dependency('org.apache.logging.log4j:log4j-core:2.15.0')
+        include dependency('org.apache.logging.log4j:log4j-api:2.16.0')
+        include dependency('org.apache.logging.log4j:log4j-core:2.16.0')
 
         include dependency('com.eclipsesource.minimal-json:minimal-json')
     }

diff --git a/src/main/resources/log4j2-test.xml b/src/main/resources/log4j2-test.xml
@@ -3,20 +3,20 @@
     <Appenders>
         <TerminalConsole name="Console">
             <PatternLayout>
-                <LoggerNamePatternSelector defaultPattern="%highlightError{[%d{HH:mm:ss} %level] [%logger]: %minecraftFormatting{%msg}%n%xEx}">
+                <LoggerNamePatternSelector defaultPattern="%highlightError{[%d{HH:mm:ss} %level] [%logger]: %minecraftFormatting{%msg{nolookups}}%n%xEx}">
                     <!-- Log root Minecraft and Mojang without logger prefix -->
                     <PatternMatch key=",net.minecraft.,com.mojang."
-                                  pattern="%highlightError{[%d{HH:mm:ss} %level]: %minecraftFormatting{%msg}%n%xEx}"/>
+                                  pattern="%highlightError{[%d{HH:mm:ss} %level]: %minecraftFormatting{%msg{nolookups}}%n%xEx}"/>
                 </LoggerNamePatternSelector>
             </PatternLayout>
         </TerminalConsole>
 
         <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
             <PatternLayout>
-                <LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss}] [%t/%level] [%logger]: %minecraftFormatting{%msg}{strip}%n">
+                <LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss}] [%t/%level] [%logger]: %minecraftFormatting{%msg{nolookups}}{strip}%n">
                     <!-- Log root Minecraft and Mojang without logger prefix -->
                     <PatternMatch key=",net.minecraft.,com.mojang."
-                                  pattern="[%d{HH:mm:ss}] [%t/%level]: %minecraftFormatting{%msg}{strip}%n"/>
+                                  pattern="[%d{HH:mm:ss}] [%t/%level]: %minecraftFormatting{%msg{nolookups}}{strip}%n"/>
                 </LoggerNamePatternSelector>
             </PatternLayout>
 

diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
@@ -3,20 +3,20 @@
     <Appenders>
         <TerminalConsole name="Console">
             <PatternLayout>
-                <LoggerNamePatternSelector defaultPattern="%highlightError{[%d{HH:mm:ss} %level] [%logger]: %minecraftFormatting{%msg}%n%xEx}">
+                <LoggerNamePatternSelector defaultPattern="%highlightError{[%d{HH:mm:ss} %level] [%logger]: %minecraftFormatting{%msg{nolookups}}%n%xEx}">
                     <!-- Log root Minecraft and Mojang without logger prefix -->
                     <PatternMatch key=",net.minecraft.,com.mojang."
-                                  pattern="%highlightError{[%d{HH:mm:ss} %level]: %minecraftFormatting{%msg}%n%xEx}"/>
+                                  pattern="%highlightError{[%d{HH:mm:ss} %level]: %minecraftFormatting{%msg{nolookups}}%n%xEx}"/>
                 </LoggerNamePatternSelector>
             </PatternLayout>
         </TerminalConsole>
 
         <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
             <PatternLayout>
-                <LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss}] [%t/%level] [%logger]: %minecraftFormatting{%msg}{strip}%n">
+                <LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss}] [%t/%level] [%logger]: %minecraftFormatting{%msg{nolookups}}{strip}%n">
                     <!-- Log root Minecraft and Mojang without logger prefix -->
                     <PatternMatch key=",net.minecraft.,com.mojang."
-                                  pattern="[%d{HH:mm:ss}] [%t/%level]: %minecraftFormatting{%msg}{strip}%n"/>
+                                  pattern="[%d{HH:mm:ss}] [%t/%level]: %minecraftFormatting{%msg{nolookups}}{strip}%n"/>
                 </LoggerNamePatternSelector>
             </PatternLayout>