mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-19 16:40:38 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-5456_Dan_upgradeProtobuf--SQUASHED'

Browse Source
This commit is contained in:
Ryan Kurtz
2025-06-11 08:13:45 -04:00
parent 6073f01158 f1607b5cfd
commit 34402ed14e
16 changed files with 47 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Ghidra/Extensions/MachineLearning/Module.manifest
View File

@@ -1,6 +1,5 @@
MODULE FILE LICENSE: lib/olcut-config-protobuf-5.2.0.jar BSD-2-ORACLE
MODULE FILE LICENSE: lib/olcut-core-5.2.0.jar BSD-2-ORACLE
MODULE FILE LICENSE: lib/protobuf-java-3.21.8.jar BSD-3-GOOGLE
MODULE FILE LICENSE: lib/tribuo-classification-core-4.2.0.jar Apache License 2.0
MODULE FILE LICENSE: lib/tribuo-classification-tree-4.2.0.jar Apache License 2.0
MODULE FILE LICENSE: lib/tribuo-common-tree-4.2.0.jar Apache License 2.0

10
Ghidra/Extensions/MachineLearning/build.gradle
View File

@@ -21,12 +21,13 @@ apply from: "$rootProject.projectDir/gradle/helpProject.gradle"
apply plugin: 'eclipse'
eclipse.project.name = 'Xtra MachineLearning'
def protobufVersion = getProperty("ghidra.protobuf.java.version")
dependencies {
api project(':Base')
api "com.oracle.labs.olcut:olcut-config-protobuf:5.2.0" //{exclude group: "com.google.protobuf", module: "protobuf-java"}
api ("com.oracle.labs.olcut:olcut-core:5.2.0") {exclude group: "org.jline"}
api "com.google.protobuf:protobuf-java:3.21.8" //only needed for running junits
api "org.tribuo:tribuo-classification-core:4.2.0"
api "org.tribuo:tribuo-classification-tree:4.2.0"
api "org.tribuo:tribuo-common-tree:4.2.0"
@@ -36,10 +37,5 @@ dependencies {
api ("org.tribuo:tribuo-util-onnx:4.2.0") //{exclude group: "com.google.protobuf", module: "protobuf-java"}
testImplementation project(path: ':SoftwareModeling', configuration: 'testArtifacts')
testImplementation "com.google.protobuf:protobuf-java:${protobufVersion}"
}