Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-22 12:11:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-4550_ryanmkurtz_osgi'

Browse Source
This commit is contained in:
Ryan Kurtz 2024-04-25 06:52:14 -04:00
commit caed8efaf4
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Ghidra/Features/Base/Module.manifest
View File

@ -1,7 +1,7 @@
MODULE FILE LICENSE: lib/biz.aQute.bndlib-6.2.0.jar Apache License 2.0
MODULE FILE LICENSE: lib/biz.aQute.bnd.util-6.2.0.jar Apache License 2.0
MODULE FILE LICENSE: lib/biz.aQute.bndlib-7.0.0.jar Apache License 2.0
MODULE FILE LICENSE: lib/biz.aQute.bnd.util-7.0.0.jar Apache License 2.0
MODULE FILE LICENSE: lib/slf4j-api-1.7.25.jar MIT
MODULE FILE LICENSE: lib/slf4j-nop-1.7.25.jar MIT
MODULE FILE LICENSE: lib/org.apache.felix.framework-7.0.3.jar Apache License 2.0
MODULE FILE LICENSE: lib/org.osgi.util.promise-1.2.0.jar Apache License 2.0
MODULE FILE LICENSE: lib/org.apache.felix.framework-7.0.5.jar Apache License 2.0
MODULE FILE LICENSE: lib/org.osgi.util.promise-1.3.0.jar Apache License 2.0
MODULE FILE LICENSE: lib/phidias-0.3.7.jar Apache License 2.0

8
Ghidra/Features/Base/build.gradle
View File

@ -41,11 +41,11 @@ dependencies {
api project(':SoftwareModeling')
api project(':Emulation')
api 'org.apache.felix:org.apache.felix.framework:7.0.3'
api 'org.apache.felix:org.apache.felix.framework:7.0.5'
api 'com.github.rotty3000:phidias:0.3.7'
api 'biz.aQute.bnd:biz.aQute.bnd.util:6.2.0'
api ('biz.aQute.bnd:biz.aQute.bndlib:6.2.0') {exclude group: 'org.osgi'}
api ('org.osgi:org.osgi.util.promise:1.2.0') {exclude group: 'org.osgi'}
api 'biz.aQute.bnd:biz.aQute.bnd.util:7.0.0'
api ('biz.aQute.bnd:biz.aQute.bndlib:7.0.0') {exclude group: 'org.osgi'}
api ('org.osgi:org.osgi.util.promise:1.3.0') {exclude group: 'org.osgi'}
api 'org.slf4j:slf4j-api:1.7.25'
runtimeOnly "org.slf4j:slf4j-nop:1.7.25"

1
Ghidra/Features/Base/certification.manifest
View File

@ -778,7 +778,6 @@ src/main/resources/images/eclipse.png||GHIDRA||||END|
src/main/resources/images/edit-bomb.png||Oxygen Icons - LGPL 3.0||||END|
src/main/resources/images/editbytes.gif||GHIDRA||||END|
src/main/resources/images/emblem-favorite.png||Tango Icons - Public Domain|||tango|END|
src/main/resources/images/empty8x16.png||GHIDRA||||END|
src/main/resources/images/emptyFragment.gif||GHIDRA||||END|
src/main/resources/images/emptyFragmentInView.gif||GHIDRA||||END|
src/main/resources/images/enum.png||GHIDRA||||END|