yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 17:59:46 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-1632_ryanmkurtz_PR-3802_bhaskarvilles_gson' into patch

Browse source
This commit is contained in:
ghidra1 2022-01-04 18:57:24 -05:00
commit c6d89deacf
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Framework/Generic/Module.manifest
View file

@ -7,7 +7,7 @@ MODULE FILE LICENSE: lib/commons-collections4-4.1.jar Apache License 2.0
MODULE FILE LICENSE: lib/commons-lang3-3.9.jar Apache License 2.0 MODULE FILE LICENSE: lib/commons-lang3-3.9.jar Apache License 2.0
MODULE FILE LICENSE: lib/commons-io-2.6.jar Apache License 2.0 MODULE FILE LICENSE: lib/commons-io-2.6.jar Apache License 2.0
MODULE FILE LICENSE: lib/commons-text-1.6.jar Apache License 2.0 MODULE FILE LICENSE: lib/commons-text-1.6.jar Apache License 2.0
MODULE FILE LICENSE: lib/gson-2.8.6.jar Apache License 2.0 MODULE FILE LICENSE: lib/gson-2.8.9.jar Apache License 2.0
MODULE FILE LICENSE: lib/bcpkix-jdk15on-1.69.jar Bouncy Castle License MODULE FILE LICENSE: lib/bcpkix-jdk15on-1.69.jar Bouncy Castle License
MODULE FILE LICENSE: lib/bcprov-jdk15on-1.69.jar Bouncy Castle License MODULE FILE LICENSE: lib/bcprov-jdk15on-1.69.jar Bouncy Castle License
MODULE FILE LICENSE: lib/bcutil-jdk15on-1.69.jar Bouncy Castle License MODULE FILE LICENSE: lib/bcutil-jdk15on-1.69.jar Bouncy Castle License

2
Ghidra/Framework/Generic/build.gradle
View file

@ -35,7 +35,7 @@ dependencies {
api "org.apache.commons:commons-lang3:3.9" api "org.apache.commons:commons-lang3:3.9"
api "org.apache.commons:commons-text:1.6" api "org.apache.commons:commons-text:1.6"
api "commons-io:commons-io:2.6" api "commons-io:commons-io:2.6"
api "com.google.code.gson:gson:2.8.6" api "com.google.code.gson:gson:2.8.9"
api 'org.bouncycastle:bcpkix-jdk15on:1.69' // requires bcutil and bcprov api 'org.bouncycastle:bcpkix-jdk15on:1.69' // requires bcutil and bcprov
api 'org.bouncycastle:bcprov-jdk15on:1.69' api 'org.bouncycastle:bcprov-jdk15on:1.69'
api 'org.bouncycastle:bcutil-jdk15on:1.69' api 'org.bouncycastle:bcutil-jdk15on:1.69'

2
GhidraBuild/BuildFiles/JsonDoclet/build.gradle
View file

@ -19,7 +19,7 @@ eclipse.project.name = '_JsonDoclet'
apply plugin: 'java-library' apply plugin: 'java-library'
dependencies { dependencies {
api "com.google.code.gson:gson:2.8.6" api "com.google.code.gson:gson:2.8.9"
} }
rootProject.createJsondocs.dependsOn jar rootProject.createJsondocs.dependsOn jar