diff --git a/Ghidra/Features/GraphServices/Module.manifest b/Ghidra/Features/GraphServices/Module.manifest index 148da2a754..6cdf923c2e 100644 --- a/Ghidra/Features/GraphServices/Module.manifest +++ b/Ghidra/Features/GraphServices/Module.manifest @@ -2,8 +2,6 @@ EXCLUDE FROM GHIDRA JAR: true MODULE FILE LICENSE: lib/jungrapht-visualization-1.0.jar BSD MODULE FILE LICENSE: lib/jungrapht-layout-1.0.jar BSD -MODULE FILE LICENSE: lib/jgrapht-core-1.5.0.jar LGPL 2.1 -MODULE FILE LICENSE: lib/jgrapht-io-1.5.0.jar LGPL 2.1 MODULE FILE LICENSE: lib/jheaps-0.13.jar Apache License 2.0 MODULE FILE LICENSE: lib/log4j-slf4j-impl-2.12.1.jar Apache License 2.0 MODULE FILE LICENSE: lib/slf4j-api-1.7.25.jar MIT diff --git a/Ghidra/Features/GraphServices/build.gradle b/Ghidra/Features/GraphServices/build.gradle index 01a83e8d79..c41037b56d 100644 --- a/Ghidra/Features/GraphServices/build.gradle +++ b/Ghidra/Features/GraphServices/build.gradle @@ -13,9 +13,7 @@ dependencies { compile "com.github.tomnelson:jungrapht-visualization:1.0" compile "com.github.tomnelson:jungrapht-layout:1.0" - - // not using jgrapht-io code that depends on antlr, so exclude antlr - compile ("org.jgrapht:jgrapht-io:1.5.0") { exclude group: "org.antlr", module: "antlr4-runtime" } + runtime "org.slf4j:slf4j-api:1.7.25" // use this if you want no slf4j log messages runtime "org.slf4j:slf4j-nop:1.7.25" diff --git a/Ghidra/Framework/Graph/Module.manifest b/Ghidra/Framework/Graph/Module.manifest index 0de4877161..53aad8ea72 100644 --- a/Ghidra/Framework/Graph/Module.manifest +++ b/Ghidra/Framework/Graph/Module.manifest @@ -2,4 +2,5 @@ MODULE FILE LICENSE: lib/jung-visualization-2.1.1.jar BSD MODULE FILE LICENSE: lib/jung-algorithms-2.1.1.jar BSD MODULE FILE LICENSE: lib/jung-api-2.1.1.jar BSD MODULE FILE LICENSE: lib/jung-graph-impl-2.1.1.jar BSD -MODULE FILE LICENSE: lib/jgrapht-core-1.4.0.jar LGPL 2.1 +MODULE FILE LICENSE: lib/jgrapht-core-1.5.0.jar LGPL 2.1 +MODULE FILE LICENSE: lib/jgrapht-io-1.5.0.jar LGPL 2.1 diff --git a/Ghidra/Framework/Graph/build.gradle b/Ghidra/Framework/Graph/build.gradle index a1ea99f59d..5299bfee78 100644 --- a/Ghidra/Framework/Graph/build.gradle +++ b/Ghidra/Framework/Graph/build.gradle @@ -19,6 +19,9 @@ dependencies { compile "org.jgrapht:jgrapht-core:1.5.0" + // not using jgrapht-io code that depends on antlr, so exclude antlr + compile ("org.jgrapht:jgrapht-io:1.5.0") { exclude group: "org.antlr", module: "antlr4-runtime" } + // These have abstract test classes and stubs needed by this module testCompile project(path: ':Docking', configuration: 'testArtifacts') } diff --git a/Ghidra/Framework/Graph/certification.manifest b/Ghidra/Framework/Graph/certification.manifest index a98936d747..fce51b0701 100644 --- a/Ghidra/Framework/Graph/certification.manifest +++ b/Ghidra/Framework/Graph/certification.manifest @@ -1,8 +1,8 @@ ##VERSION: 2.0 ##MODULE IP: BSD ##MODULE IP: FAMFAMFAM Icons - CC 2.5 -##MODULE IP: Oxygen Icons - LGPL 3.0 ##MODULE IP: LGPL 2.1 +##MODULE IP: Oxygen Icons - LGPL 3.0 Module.manifest||GHIDRA||||END| build.gradle||GHIDRA||||END| data/ExtensionPoint.manifest||GHIDRA||||END|