Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-22 08:13:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
ghidra1
2024-03-26 12:09:26 -04:00
parent 2aea201406 4348e80f71
commit 97c3151fe4
3 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/BSim/Module.manifest
+1 -2
View File
@@ -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
Ghidra/Features/BSim/build.gradle
+1 -2
View File
@@ -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"
}
Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/ingest/BSimLaunchable.java
+4 -9
View File
@@ -44,6 +44,7 @@ import utility.application.ApplicationLayout;
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 class BSimLaunchable implements GhidraLaunchable {
*/
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);