From 093ff78316d41292d51c39eaee6db17b1654e81e Mon Sep 17 00:00:00 2001 From: ghidra1 Date: Wed, 20 Mar 2024 12:58:31 -0400 Subject: [PATCH] GP-4449 Removed log4j-jcl jar dependency. Updated postgresql JDBC driver to 42.6.2. --- Ghidra/Features/BSim/Module.manifest | 3 +-- Ghidra/Features/BSim/build.gradle | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Ghidra/Features/BSim/Module.manifest b/Ghidra/Features/BSim/Module.manifest index 9df5107b96..60e6f9f424 100755 --- 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 \ No newline at end of file diff --git a/Ghidra/Features/BSim/build.gradle b/Ghidra/Features/BSim/build.gradle index c57be49e10..f573ad83d9 100755 --- 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" }