From 50b5414033de82f46be23201db50484f36c37d4f Mon Sep 17 00:00:00 2001 From: Marc Hermans Date: Fri, 10 Dec 2021 10:42:53 +0100 Subject: [PATCH] [CVE-2021-44228]: Update Log4J to fix the security issue inside it. (#8269) --- build.gradle | 5 +++-- fmlloader/src/main/resources/log4j2.xml | 16 ++++++++-------- src/fmllauncher/resources/log4j2.xml | 16 ++++++++-------- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index e30a45caf1..4b47ff8b61 100644 --- a/build.gradle +++ b/build.gradle @@ -252,8 +252,9 @@ def sharedDeps = { installer 'org.apache.maven:maven-artifact:3.6.3' installer 'org.apache.commons:commons-lang3:3.8.1' installer 'net.jodah:typetools:0.8.3' - installer 'org.apache.logging.log4j:log4j-api:2.14.1' - installer 'org.apache.logging.log4j:log4j-core:2.14.1' + installer 'org.apache.logging.log4j:log4j-api:2.15.0' //TODO: Unpin in 1.18.1 or when Mojang bumps the Log4J version + installer 'org.apache.logging.log4j:log4j-core:2.15.0' //TODO: Unpin in 1.18.1 or when Mojang bumps the Log4J version + installer 'org.apache.logging.log4j:log4j-slf4j18-impl:2.15.0' //TODO: Unpin in 1.18.1 or when Mojang bumps the Log4J version installer 'net.minecrell:terminalconsoleappender:1.2.0' installer 'org.jline:jline-reader:3.12.+' //Dep of TerminaalConsoleeAppender installer 'org.jline:jline-terminal:3.12.+' //Dep of TerminaalConsoleeAppender diff --git a/fmlloader/src/main/resources/log4j2.xml b/fmlloader/src/main/resources/log4j2.xml index cc980b8647..7e3ae72954 100644 --- a/fmlloader/src/main/resources/log4j2.xml +++ b/fmlloader/src/main/resources/log4j2.xml @@ -20,24 +20,24 @@ - + - - + + - + - - + + - + @@ -45,7 +45,7 @@ - + diff --git a/src/fmllauncher/resources/log4j2.xml b/src/fmllauncher/resources/log4j2.xml index cf06a2029d..0e434457e9 100644 --- a/src/fmllauncher/resources/log4j2.xml +++ b/src/fmllauncher/resources/log4j2.xml @@ -20,24 +20,24 @@ - + - - + + - + - - + + - + @@ -45,7 +45,7 @@ - +