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

Merge remote-tracking branch 'origin/Ghidra_12.1'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-04-26 18:04:46 -04:00
parent 3c95d90d33 38116d99fe
commit 57753ac92f
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Framework/Generic/Module.manifest
+6 -6
View File
@@ -3,13 +3,13 @@ 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/jdom2-2.0.6.1.jar JDOM License MODULE FILE LICENSE: lib/jdom2-2.0.6.1.jar JDOM License
MODULE FILE LICENSE: lib/log4j-api-2.25.3.jar Apache License 2.0 MODULE FILE LICENSE: lib/log4j-api-2.25.4.jar Apache License 2.0
MODULE FILE LICENSE: lib/log4j-core-2.25.3.jar Apache License 2.0 MODULE FILE LICENSE: lib/log4j-core-2.25.4.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.20.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.13.2.jar Apache License 2.0
MODULE FILE LICENSE: lib/bcpkix-jdk18on-1.80.jar Bouncy Castle License MODULE FILE LICENSE: lib/bcpkix-jdk18on-1.84.jar Bouncy Castle License
MODULE FILE LICENSE: lib/bcprov-jdk18on-1.80.jar Bouncy Castle License MODULE FILE LICENSE: lib/bcprov-jdk18on-1.84.jar Bouncy Castle License
MODULE FILE LICENSE: lib/bcutil-jdk18on-1.80.jar Bouncy Castle License MODULE FILE LICENSE: lib/bcutil-jdk18on-1.84.jar Bouncy Castle License
Ghidra/Framework/Generic/build.gradle
+6 -6
View File
@@ -34,18 +34,18 @@ dependencies {
} }
api "com.google.guava:failureaccess:1.0.1" api "com.google.guava:failureaccess:1.0.1"
api "org.jdom:jdom2:2.0.6.1" api "org.jdom:jdom2:2.0.6.1"
api "org.apache.logging.log4j:log4j-api:2.25.3" api "org.apache.logging.log4j:log4j-api:2.25.4"
api "org.apache.logging.log4j:log4j-core:2.25.3" api "org.apache.logging.log4j:log4j-core:2.25.4"
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.20.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.13.2"
api "org.bouncycastle:bcpkix-jdk18on:1.80" // requires bcutil and bcprov api "org.bouncycastle:bcpkix-jdk18on:1.84" // requires bcutil and bcprov
api "org.bouncycastle:bcprov-jdk18on:1.80" api "org.bouncycastle:bcprov-jdk18on:1.84"
api "org.bouncycastle:bcutil-jdk18on:1.80" api "org.bouncycastle:bcutil-jdk18on:1.84"
compileOnly "junit:junit:4.13.2" compileOnly "junit:junit:4.13.2"
compileOnly "org.hamcrest:hamcrest:2.2" compileOnly "org.hamcrest:hamcrest:2.2"
GhidraBuild/BuildFiles/Doclets/build.gradle
+1 -1
View File
@@ -24,7 +24,7 @@ java {
} }
dependencies { dependencies {
api "com.google.code.gson:gson:2.9.0" api "com.google.code.gson:gson:2.13.2"
} }
def jsonTask = rootProject.tasks.findByName("createJsondocs") ?: rootProject.tasks.findByName("createJsonDocs") def jsonTask = rootProject.tasks.findByName("createJsondocs") ?: rootProject.tasks.findByName("createJsonDocs")