Merge remote-tracking branch 'origin/GP-4449_ghidra1_JarUpdate' into …

…patch
NationalSecurityAgency · Mar 26, 2024 · 97c3151 · 97c3151
2 parents 2aea201 + 4348e80
commit 97c3151
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/Ghidra/Features/BSim/Module.manifest b/Ghidra/Features/BSim/Module.manifest
@@ -1,9 +1,8 @@
 ##MODULE IP: Oxygen Icons - LGPL 3.0
 MODULE FILE LICENSE: postgresql-15.3.tar.gz Postgresql License
-MODULE FILE LICENSE: lib/postgresql-42.6.0.jar PostgresqlJDBC License
+MODULE FILE LICENSE: lib/postgresql-42.6.2.jar PostgresqlJDBC License
 MODULE FILE LICENSE: lib/json-simple-1.1.1.jar Apache License 2.0
 MODULE FILE LICENSE: lib/commons-dbcp2-2.9.0.jar Apache License 2.0
 MODULE FILE LICENSE: lib/commons-pool2-2.11.1.jar Apache License 2.0
 MODULE FILE LICENSE: lib/commons-logging-1.2.jar Apache License 2.0
-MODULE FILE LICENSE: lib/log4j-jcl-2.16.0.jar Apache License 2.0
 MODULE FILE LICENSE: lib/h2-2.2.220.jar H2 Mozilla License 2.0
diff --git a/Ghidra/Features/BSim/build.gradle b/Ghidra/Features/BSim/build.gradle
@@ -32,12 +32,11 @@ dependencies {
 	api project(":Decompiler")
 	api project(":CodeCompare")
 
-	api "org.postgresql:postgresql:42.6.0"
+	api "org.postgresql:postgresql:42.6.2"
     api "com.googlecode.json-simple:json-simple:1.1.1"
     api "org.apache.commons:commons-dbcp2:2.9.0"
     api "org.apache.commons:commons-pool2:2.11.1"
     api "commons-logging:commons-logging:1.2"
-    api "org.apache.logging.log4j:log4j-jcl:2.16.0"
     api "com.h2database:h2:2.2.220"
 }
 

diff --git a/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/ingest/BSimLaunchable.java b/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/ingest/BSimLaunchable.java
@@ -44,6 +44,7 @@
 
 public class BSimLaunchable implements GhidraLaunchable {
 
+	// BSim log4j config file resides at root of resource directory
 	private static final String BSIM_LOGGING_CONFIGURATION_FILE = "bsim.log4j.xml";
 
 	private static final int DEFAULT_LIST_EXE_LIMIT = 20;
@@ -1056,15 +1057,9 @@ public static void initializeApplication(ApplicationLayout layout, int type,
 		 */
 		System.setProperty(SystemUtilities.HEADLESS_PROPERTY, Boolean.TRUE.toString());
 
-		try {
-			URL configFileUrl =
-				BSimLaunchable.class.getClassLoader().getResource(BSIM_LOGGING_CONFIGURATION_FILE);
-			System.setProperty(LoggingInitialization.LOG4J2_CONFIGURATION_PROPERTY,
-				configFileUrl.toURI().toString());
-		}
-		catch (URISyntaxException e) {
-			System.err.println("ERROR: " + e.getMessage());
-		}
+		// Use BSim log config to ensure we get desired console output
+		System.setProperty(LoggingInitialization.LOG4J2_CONFIGURATION_PROPERTY,
+			BSIM_LOGGING_CONFIGURATION_FILE); 
 
 		// Allows handling of old content which did not have a content type property
 		DomainObjectAdapter.setDefaultContentClass(ProgramDB.class);