Merge remote-tracking branch 'origin/patch'

Author: ghidra1

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.16.0" 
+	//	runtimeOnly "org.apache.logging.log4j:log4j-slf4j-impl:2.17.0" 
 
    	compileOnly "junit:junit:4.12"
 

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.16.0.jar Apache License 2.0
-MODULE FILE LICENSE: lib/log4j-core-2.16.0.jar Apache License 2.0
+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/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.16.0"
-	api "org.apache.logging.log4j:log4j-core:2.16.0"
+	api "org.apache.logging.log4j:log4j-api:2.17.0"
+	api "org.apache.logging.log4j:log4j-core:2.17.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"

Ghidra/Framework/Generic/certification.manifest

@@ -71,7 +71,6 @@ src/main/resources/log4j-appender-logpanel.xml||GHIDRA||||END|
 src/main/resources/log4j-appender-rolling-file-scripts.xml||GHIDRA||||END|
 src/main/resources/log4j-appender-rolling-file.xml||GHIDRA||||END|
 src/main/resources/log4j-appender-test-console-with-links.xml||GHIDRA||||END|
-src/main/resources/log4j2.xml||GHIDRA||||END|
 src/test/resources/ddtest/B||GHIDRA||||END|
 src/test/resources/ddtest/a||GHIDRA||||END|
 src/test/resources/ddtest/c||GHIDRA||||END|