From b354af13a6fdfd50bc70a000e2006e7c78476727 Mon Sep 17 00:00:00 2001 From: Andreas Marek Date: Fri, 13 Nov 2026 20:31:51 +1000 Subject: [PATCH 1/2] Upgrade Guava to 33.8.0-jre on 26.x for CVE-2026-102554 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 10d7ee52a4..63b270b154 100644 --- a/build.gradle +++ b/build.gradle @@ -176,7 +176,7 @@ def getDevelopmentVersion() { def reactiveStreamsVersion = '1.0.3' def releaseVersion = System.env.RELEASE_VERSION def antlrVersion = '4.13.2' // https://mvnrepository.com/artifact/org.antlr/antlr4-runtime -def guavaVersion = '32.1.2-jre' +def guavaVersion = '33.8.0-jre' version = releaseVersion ? releaseVersion : getDevelopmentVersion() group = 'com.graphql-java' From d96aeb4583845c6957b252610e048eb7da464db2 Mon Sep 17 00:00:00 2001 From: Andreas Marek Date: Fri, 13 Nov 2026 20:38:52 +1000 Subject: [PATCH 2/2] Remove RestrictedApi annotations from shaded Guava --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 63b270b154..eed56eb477 100644 --- a/build.gradle +++ b/build.gradle @@ -406,6 +406,7 @@ def annotationsToRemoveFromShadedJar = [ 'Lcom/google/errorprone/annotations/ForOverride;', 'Lcom/google/errorprone/annotations/InlineMe;', 'Lcom/google/errorprone/annotations/InlineMeValidationDisabled;', + 'Lcom/google/errorprone/annotations/RestrictedApi;', 'Lcom/google/errorprone/annotations/concurrent/GuardedBy;', 'Lcom/google/j2objc/annotations/RetainedWith;', 'Lcom/google/j2objc/annotations/Weak;',