From 2965c49d19f0ab821b400ae1110c3b898cf1a502 Mon Sep 17 00:00:00 2001 From: Ryan Kurtz Date: Wed, 29 Dec 2021 16:05:52 -0500 Subject: [PATCH] GP-1641: Upgrading log4j to 2.17.1 --- Ghidra/Features/Base/build.gradle | 2 +- Ghidra/Framework/Generic/Module.manifest | 4 ++-- Ghidra/Framework/Generic/build.gradle | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Ghidra/Features/Base/build.gradle b/Ghidra/Features/Base/build.gradle index 3779d62813..f31f75a58a 100644 --- a/Ghidra/Features/Base/build.gradle +++ b/Ghidra/Features/Base/build.gradle @@ -54,7 +54,7 @@ dependencies { runtimeOnly "org.slf4j:slf4j-nop:1.7.25" // use this if you want slf4j log messages sent to log4j - // runtimeOnly "org.apache.logging.log4j:log4j-slf4j-impl:2.17.0" + // runtimeOnly "org.apache.logging.log4j:log4j-slf4j-impl:2.17.1" compileOnly "junit:junit:4.12" diff --git a/Ghidra/Framework/Generic/Module.manifest b/Ghidra/Framework/Generic/Module.manifest index 2f96a05370..42ac479ef5 100644 --- a/Ghidra/Framework/Generic/Module.manifest +++ b/Ghidra/Framework/Generic/Module.manifest @@ -1,8 +1,8 @@ MODULE FILE LICENSE: lib/cglib-nodep-2.2.jar Apache License 2.0 MODULE FILE LICENSE: lib/guava-19.0.jar Apache License 2.0 MODULE FILE LICENSE: lib/jdom-legacy-1.1.3.jar JDOM License -MODULE FILE LICENSE: lib/log4j-api-2.17.0.jar Apache License 2.0 -MODULE FILE LICENSE: lib/log4j-core-2.17.0.jar Apache License 2.0 +MODULE FILE LICENSE: lib/log4j-api-2.17.1.jar Apache License 2.0 +MODULE FILE LICENSE: lib/log4j-core-2.17.1.jar Apache License 2.0 MODULE FILE LICENSE: lib/commons-collections4-4.1.jar Apache License 2.0 MODULE FILE LICENSE: lib/commons-lang3-3.9.jar Apache License 2.0 MODULE FILE LICENSE: lib/commons-io-2.6.jar Apache License 2.0 diff --git a/Ghidra/Framework/Generic/build.gradle b/Ghidra/Framework/Generic/build.gradle index ee89c14527..ca0a87a061 100644 --- a/Ghidra/Framework/Generic/build.gradle +++ b/Ghidra/Framework/Generic/build.gradle @@ -29,8 +29,8 @@ dependencies { api "cglib:cglib-nodep:2.2" api "com.google.guava:guava:19.0" api "org.jdom:jdom-legacy:1.1.3" - api "org.apache.logging.log4j:log4j-api:2.17.0" - api "org.apache.logging.log4j:log4j-core:2.17.0" + api "org.apache.logging.log4j:log4j-api:2.17.1" + api "org.apache.logging.log4j:log4j-core:2.17.1" api "org.apache.commons:commons-collections4:4.1" api "org.apache.commons:commons-lang3:3.9" api "org.apache.commons:commons-text:1.6"