diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/script/BundleHostTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/script/BundleHostTest.java index 4fe9671132..175288d329 100644 --- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/script/BundleHostTest.java +++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/script/BundleHostTest.java @@ -36,7 +36,7 @@ public class BundleHostTest extends AbstractGhidraHeadlessIntegrationTest { private static final String TEMP_NAME_PREFIX = "sourcebundle"; // the version of Guava Ghidra is currently using. - private static final int GUAVA_MAJOR_VERSION = 31; + private static final int GUAVA_MAJOR_VERSION = 32; private BundleHost bundleHost; private CapturingBundleHostListener capturingBundleHostListener; diff --git a/Ghidra/Framework/Generic/Module.manifest b/Ghidra/Framework/Generic/Module.manifest index 13d3d5348b..d42b2be056 100644 --- a/Ghidra/Framework/Generic/Module.manifest +++ b/Ghidra/Framework/Generic/Module.manifest @@ -1,5 +1,5 @@ MODULE FILE LICENSE: lib/commons-compress-1.21.jar Apache License 2.0 -MODULE FILE LICENSE: lib/guava-31.1-jre.jar Apache License 2.0 +MODULE FILE LICENSE: lib/guava-32.1.3-jre.jar Apache License 2.0 MODULE FILE LICENSE: lib/failureaccess-1.0.1.jar Apache License 2.0 MODULE FILE LICENSE: lib/jdom-legacy-1.1.3.jar JDOM License MODULE FILE LICENSE: lib/log4j-api-2.17.1.jar Apache License 2.0 diff --git a/Ghidra/Framework/Generic/build.gradle b/Ghidra/Framework/Generic/build.gradle index 803549e9a9..bf8753aa05 100644 --- a/Ghidra/Framework/Generic/build.gradle +++ b/Ghidra/Framework/Generic/build.gradle @@ -26,8 +26,8 @@ eclipse.project.name = 'Framework Generic' dependencies { api project(':Utility') - api "com.google.guava:guava:31.1-jre" - api 'com.google.guava:failureaccess:1.0.1' + api "com.google.guava:guava:32.1.3-jre" + api "com.google.guava:failureaccess:1.0.1" api "org.jdom:jdom-legacy:1.1.3" api "org.apache.logging.log4j:log4j-api:2.17.1" api "org.apache.logging.log4j:log4j-core:2.17.1" @@ -37,9 +37,9 @@ dependencies { api "org.apache.commons:commons-text:1.10.0" api "commons-io:commons-io:2.11.0" api "com.google.code.gson:gson:2.9.0" - api 'org.bouncycastle:bcpkix-jdk15on:1.69' // requires bcutil and bcprov - api 'org.bouncycastle:bcprov-jdk15on:1.69' - api 'org.bouncycastle:bcutil-jdk15on:1.69' + api "org.bouncycastle:bcpkix-jdk15on:1.69" // requires bcutil and bcprov + api "org.bouncycastle:bcprov-jdk15on:1.69" + api "org.bouncycastle:bcutil-jdk15on:1.69" compileOnly "junit:junit:4.12"