From 6cec048b15c91923237e3637a039f65ba76da747 Mon Sep 17 00:00:00 2001 From: Ryan Kurtz Date: Thu, 22 Jan 2026 14:35:08 -0500 Subject: [PATCH 1/2] GP-6364: Upgrading yajsw to 13.18 --- Ghidra/Features/GhidraServer/Module.manifest | 2 +- Ghidra/Features/GhidraServer/build.gradle | 2 +- gradle/support/fetchDependencies.gradle | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Ghidra/Features/GhidraServer/Module.manifest b/Ghidra/Features/GhidraServer/Module.manifest index 070fe00556..58441cbd86 100644 --- a/Ghidra/Features/GhidraServer/Module.manifest +++ b/Ghidra/Features/GhidraServer/Module.manifest @@ -1,2 +1,2 @@ -DATA SEARCH IGNORE DIR: yajsw-stable-13.12 +DATA SEARCH IGNORE DIR: yajsw-stable-13.18 EXCLUDE FROM GHIDRA JAR: true diff --git a/Ghidra/Features/GhidraServer/build.gradle b/Ghidra/Features/GhidraServer/build.gradle index eef2f6ad4b..81226d9628 100644 --- a/Ghidra/Features/GhidraServer/build.gradle +++ b/Ghidra/Features/GhidraServer/build.gradle @@ -21,7 +21,7 @@ apply plugin: 'eclipse' eclipse.project.name = 'Features GhidraServer' -def yajswRelease = "yajsw-stable-13.12" +def yajswRelease = "yajsw-stable-13.18" configurations { runGhidraServer diff --git a/gradle/support/fetchDependencies.gradle b/gradle/support/fetchDependencies.gradle index 3670184abc..fa181034fe 100644 --- a/gradle/support/fetchDependencies.gradle +++ b/gradle/support/fetchDependencies.gradle @@ -90,9 +90,9 @@ ext.deps = [ destination: FLAT_REPO_DIR ], [ - name: "yajsw-stable-13.12.zip", - url: "https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-stable-13.12/yajsw-stable-13.12.zip", - sha256: "c6fc59815d3800d14ec977926a8afd3f606a0ebd74d2cfd60601677466edeaa2", + name: "yajsw-stable-13.18.zip", + url: "https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-stable-13.18/yajsw-stable-13.18.zip", + sha256: "50b34e9817c54b2970fa511ff4584f6556c179f69833aa8b9b1ff6485b61684f", destination: file("${DEPS_DIR}/GhidraServer") ], [ From 58a3f7e502a035349386c15d53fdee6d414f0a4d Mon Sep 17 00:00:00 2001 From: Ryan Kurtz Date: Fri, 23 Jan 2026 07:21:46 -0500 Subject: [PATCH 2/2] GP-6243: Upgrading some jars --- Ghidra/Features/BSim/Module.manifest | 2 +- Ghidra/Features/BSim/build.gradle | 2 +- Ghidra/Framework/Generic/Module.manifest | 6 +++--- Ghidra/Framework/Generic/build.gradle | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Ghidra/Features/BSim/Module.manifest b/Ghidra/Features/BSim/Module.manifest index 7109e133b4..2af39b5e7a 100755 --- a/Ghidra/Features/BSim/Module.manifest +++ b/Ghidra/Features/BSim/Module.manifest @@ -1,6 +1,6 @@ ##MODULE IP: Oxygen Icons - LGPL 3.0 MODULE FILE LICENSE: postgresql-15.13.tar.gz Postgresql License -MODULE FILE LICENSE: lib/postgresql-42.7.6.jar PostgresqlJDBC License +MODULE FILE LICENSE: lib/postgresql-42.7.9.jar PostgresqlJDBC License 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 diff --git a/Ghidra/Features/BSim/build.gradle b/Ghidra/Features/BSim/build.gradle index 47600e5a07..77b3476dca 100755 --- a/Ghidra/Features/BSim/build.gradle +++ b/Ghidra/Features/BSim/build.gradle @@ -32,7 +32,7 @@ dependencies { api project(":Decompiler") api project(":CodeCompare") - api "org.postgresql:postgresql:42.7.6" + api "org.postgresql:postgresql:42.7.9" 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" diff --git a/Ghidra/Framework/Generic/Module.manifest b/Ghidra/Framework/Generic/Module.manifest index 98d75d9ed7..59cfaa5423 100644 --- a/Ghidra/Framework/Generic/Module.manifest +++ b/Ghidra/Framework/Generic/Module.manifest @@ -3,10 +3,10 @@ MODULE FILE LICENSE: lib/commons-codec-1.18.0.jar Apache License 2.0 MODULE FILE LICENSE: lib/guava-32.1.3-jre.jar Apache License 2.0 MODULE FILE LICENSE: lib/failureaccess-1.0.1.jar Apache License 2.0 MODULE FILE LICENSE: lib/jdom-legacy-1.1.3.jar JDOM License -MODULE FILE LICENSE: lib/log4j-api-2.17.1.jar Apache License 2.0 -MODULE FILE LICENSE: lib/log4j-core-2.17.1.jar Apache License 2.0 +MODULE FILE LICENSE: lib/log4j-api-2.25.3.jar Apache License 2.0 +MODULE FILE LICENSE: lib/log4j-core-2.25.3.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.17.0.jar Apache License 2.0 +MODULE FILE LICENSE: lib/commons-lang3-3.20.0.jar Apache License 2.0 MODULE FILE LICENSE: lib/commons-io-2.19.0.jar Apache License 2.0 MODULE FILE LICENSE: lib/commons-text-1.10.0.jar Apache License 2.0 MODULE FILE LICENSE: lib/gson-2.9.0.jar Apache License 2.0 diff --git a/Ghidra/Framework/Generic/build.gradle b/Ghidra/Framework/Generic/build.gradle index 1ff6a60f87..01211c5626 100644 --- a/Ghidra/Framework/Generic/build.gradle +++ b/Ghidra/Framework/Generic/build.gradle @@ -34,12 +34,12 @@ dependencies { } api "com.google.guava:failureaccess:1.0.1" api "org.jdom:jdom-legacy:1.1.3" - api "org.apache.logging.log4j:log4j-api:2.17.1" - api "org.apache.logging.log4j:log4j-core:2.17.1" + api "org.apache.logging.log4j:log4j-api:2.25.3" + api "org.apache.logging.log4j:log4j-core:2.25.3" api "org.apache.commons:commons-collections4:4.1" api "org.apache.commons:commons-compress:1.27.1" // requires commons-codec api "commons-codec:commons-codec:1.18.0" - api "org.apache.commons:commons-lang3:3.17.0" + api "org.apache.commons:commons-lang3:3.20.0" api "org.apache.commons:commons-text:1.10.0" api "commons-io:commons-io:2.19.0" api "com.google.code.gson:gson:2.9.0"