mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2025-10-03 09:49:23 +02:00
Merge remote-tracking branch 'origin/GP-5534_BSim_protobuf_upgrade'
This commit is contained in:
commit
b319b3df7f
2 changed files with 4 additions and 4 deletions
|
@ -1,6 +1,6 @@
|
||||||
MODULE FILE LICENSE: lib/olcut-config-protobuf-5.2.0.jar BSD-2-ORACLE
|
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/olcut-core-5.2.0.jar BSD-2-ORACLE
|
||||||
MODULE FILE LICENSE: lib/protobuf-java-3.17.3.jar BSD-3-GOOGLE
|
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-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-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
|
MODULE FILE LICENSE: lib/tribuo-common-tree-4.2.0.jar Apache License 2.0
|
||||||
|
|
|
@ -4,9 +4,9 @@
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
* You may obtain a copy of the License at
|
* You may obtain a copy of the License at
|
||||||
*
|
*
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
*
|
*
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
@ -26,7 +26,7 @@ dependencies {
|
||||||
|
|
||||||
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-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.oracle.labs.olcut:olcut-core:5.2.0") {exclude group: "org.jline"}
|
||||||
api "com.google.protobuf:protobuf-java:3.17.3" //only needed for running junits
|
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-core:4.2.0"
|
||||||
api "org.tribuo:tribuo-classification-tree:4.2.0"
|
api "org.tribuo:tribuo-classification-tree:4.2.0"
|
||||||
api "org.tribuo:tribuo-common-tree:4.2.0"
|
api "org.tribuo:tribuo-common-tree:4.2.0"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue