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

Merge remote-tracking branch 'origin/patch'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-01-23 11:43:37 -05:00
parent ef43e1348b 2b5dccaa31
commit 727e7991be
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/BSim/Module.manifest
+1 -1
View File
@@ -1,6 +1,6 @@
##MODULE IP: Oxygen Icons - LGPL 3.0 ##MODULE IP: Oxygen Icons - LGPL 3.0
MODULE FILE LICENSE: postgresql-15.13.tar.gz Postgresql License 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-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-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/commons-logging-1.2.jar Apache License 2.0
Ghidra/Features/BSim/build.gradle
+1 -1
View File
@@ -32,7 +32,7 @@ dependencies {
api project(":Decompiler") api project(":Decompiler")
api project(":CodeCompare") 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-dbcp2:2.9.0"
api "org.apache.commons:commons-pool2:2.11.1" api "org.apache.commons:commons-pool2:2.11.1"
api "commons-logging:commons-logging:1.2" api "commons-logging:commons-logging:1.2"
Ghidra/Features/GhidraServer/Module.manifest
+1 -1
View File
@@ -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 EXCLUDE FROM GHIDRA JAR: true
Ghidra/Features/GhidraServer/build.gradle
+1 -1
View File
@@ -21,7 +21,7 @@ apply plugin: 'eclipse'
eclipse.project.name = 'Features GhidraServer' eclipse.project.name = 'Features GhidraServer'
def yajswRelease = "yajsw-stable-13.12" def yajswRelease = "yajsw-stable-13.18"
configurations { configurations {
runGhidraServer runGhidraServer
Ghidra/Framework/Generic/Module.manifest
+3 -3
View File
@@ -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/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/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/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-api-2.25.3.jar Apache License 2.0
MODULE FILE LICENSE: lib/log4j-core-2.17.1.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-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-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/commons-text-1.10.0.jar Apache License 2.0
MODULE FILE LICENSE: lib/gson-2.9.0.jar Apache License 2.0 MODULE FILE LICENSE: lib/gson-2.9.0.jar Apache License 2.0
Ghidra/Framework/Generic/build.gradle
+3 -3
View File
@@ -34,12 +34,12 @@ dependencies {
} }
api "com.google.guava:failureaccess:1.0.1" api "com.google.guava:failureaccess:1.0.1"
api "org.jdom:jdom-legacy:1.1.3" api "org.jdom:jdom-legacy:1.1.3"
api "org.apache.logging.log4j:log4j-api:2.17.1" api "org.apache.logging.log4j:log4j-api:2.25.3"
api "org.apache.logging.log4j:log4j-core:2.17.1" api "org.apache.logging.log4j:log4j-core:2.25.3"
api "org.apache.commons:commons-collections4:4.1" api "org.apache.commons:commons-collections4:4.1"
api "org.apache.commons:commons-compress:1.27.1" // requires commons-codec api "org.apache.commons:commons-compress:1.27.1" // requires commons-codec
api "commons-codec:commons-codec:1.18.0" 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 "org.apache.commons:commons-text:1.10.0"
api "commons-io:commons-io:2.19.0" api "commons-io:commons-io:2.19.0"
api "com.google.code.gson:gson:2.9.0" api "com.google.code.gson:gson:2.9.0"
gradle/support/fetchDependencies.gradle
+3 -3
View File
@@ -90,9 +90,9 @@ ext.deps = [
destination: FLAT_REPO_DIR destination: FLAT_REPO_DIR
], ],
[ [
name: "yajsw-stable-13.12.zip", name: "yajsw-stable-13.18.zip",
url: "https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-stable-13.12/yajsw-stable-13.12.zip", url: "https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-stable-13.18/yajsw-stable-13.18.zip",
sha256: "c6fc59815d3800d14ec977926a8afd3f606a0ebd74d2cfd60601677466edeaa2", sha256: "50b34e9817c54b2970fa511ff4584f6556c179f69833aa8b9b1ff6485b61684f",
destination: file("${DEPS_DIR}/GhidraServer") destination: file("${DEPS_DIR}/GhidraServer")
], ],
[ [