From 598fd1d668bcb24a934351ca6251cea4473ff01e Mon Sep 17 00:00:00 2001 From: Ryan Kurtz Date: Fri, 10 Dec 2021 07:17:58 -0500 Subject: [PATCH] GP-1588: Upgrading log4j to 2.15.0 --- Ghidra/Framework/Generic/Module.manifest | 4 ++-- Ghidra/Framework/Generic/build.gradle | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Ghidra/Framework/Generic/Module.manifest b/Ghidra/Framework/Generic/Module.manifest index de2c2194e7..8fc3010c6e 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.12.1.jar Apache License 2.0 -MODULE FILE LICENSE: lib/log4j-core-2.12.1.jar Apache License 2.0 +MODULE FILE LICENSE: lib/log4j-api-2.15.0.jar Apache License 2.0 +MODULE FILE LICENSE: lib/log4j-core-2.15.0.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 77daa8fc7a..f5ced2c0b3 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.12.1" - api "org.apache.logging.log4j:log4j-core:2.12.1" + api "org.apache.logging.log4j:log4j-api:2.15.0" + api "org.apache.logging.log4j:log4j-core:2.15.0" api "org.apache.commons:commons-collections4:4.1" api "org.apache.commons:commons-lang3:3.9" api "org.apache.commons:commons-text:1.6"