Merge remote-tracking branch 'origin/GP-1588_ryanmkurtz_log4j' into

Ghidra_10.1 (Closes #3736)

Author: ryanmkurtz

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

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"