From 5bcf33b96e5b58c9d7fcb0cd944e88241d99a88e Mon Sep 17 00:00:00 2001 From: sahej Date: Tue, 17 Nov 2026 22:10:09 +0000 Subject: [PATCH 1/3] Bump gRPC to 1.85.1 (CVE-2025-55163) gRPC 1.85 pulls Guava 33.x, which no longer brings checker-qual transitively; declare it directly since chalk-java uses its @Nullable annotations. Relocate org.jspecify (new via Guava) in the shaded jar. Co-Authored-By: Claude Opus 5.5 --- build.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6ee64294..b5059868 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ repositories { } def versions = [ - grpcVersion: '1.64.0', + grpcVersion: '1.85.1', arrowVersion: '17.0.0', jacksonVersion: '2.15.2', protobufVersion: '3.25.1', @@ -36,6 +36,8 @@ dependencies { api "org.apache.arrow:arrow-memory-netty:${versions.arrowVersion}" api "org.apache.arrow:arrow-vector:${versions.arrowVersion}" implementation 'javax.annotation:javax.annotation-api:1.3.2' + // Guava 33.x (via gRPC 1.85) no longer brings checker-qual; chalk-java uses its @Nullable annotations directly. + implementation 'org.checkerframework:checker-qual:3.37.0' // Flink connector (ai.chalk.flink.*). compileOnly => not bundled and NOT exposed transitively, // so plain chalk-java users get no Flink in their tree; the classes only resolve for callers who @@ -68,6 +70,7 @@ shadowJar { relocate 'org.apache.commons', 'ai.chalk.shaded.commons' // codec, io, compress, lang3 relocate 'org.yaml.snakeyaml', 'ai.chalk.shaded.snakeyaml' relocate 'org.checkerframework', 'ai.chalk.shaded.checkerframework' + relocate 'org.jspecify', 'ai.chalk.shaded.jspecify' relocate 'org.codehaus.mojo', 'ai.chalk.shaded.mojo' // Intentionally NOT relocated: // ai.chalk.* -> the public API (consumers import these) From 0bb1814c576e8985f1f29de2790b2b28e566838d Mon Sep 17 00:00:00 2001 From: sahej Date: Tue, 17 Nov 2026 22:20:48 +0000 Subject: [PATCH 2/3] Fix checker-qual comment: dropped in Guava 33.4+ Co-Authored-By: Claude Opus 5.5 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b5059868..ea56bb9f 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,7 @@ dependencies { api "org.apache.arrow:arrow-memory-netty:${versions.arrowVersion}" api "org.apache.arrow:arrow-vector:${versions.arrowVersion}" implementation 'javax.annotation:javax.annotation-api:1.3.2' - // Guava 33.x (via gRPC 1.85) no longer brings checker-qual; chalk-java uses its @Nullable annotations directly. + // Guava 33.4+ (via gRPC 1.85) no longer brings checker-qual; chalk-java uses its @Nullable annotations directly. implementation 'org.checkerframework:checker-qual:3.37.0' // Flink connector (ai.chalk.flink.*). compileOnly => not bundled and NOT exposed transitively, From 9e1be362f5edd5c85a8195227a89e67ca38f7f08 Mon Sep 17 00:00:00 2001 From: sahej Date: Tue, 17 Nov 2026 22:26:21 +0000 Subject: [PATCH 3/3] Mention @NonNull in checker-qual comment Co-Authored-By: Claude Opus 5.5 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ea56bb9f..bda1fd4d 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,7 @@ dependencies { api "org.apache.arrow:arrow-memory-netty:${versions.arrowVersion}" api "org.apache.arrow:arrow-vector:${versions.arrowVersion}" implementation 'javax.annotation:javax.annotation-api:1.3.2' - // Guava 33.4+ (via gRPC 1.85) no longer brings checker-qual; chalk-java uses its @Nullable annotations directly. + // Guava 33.4+ (via gRPC 1.85) no longer brings checker-qual; chalk-java uses its @Nullable/@NonNull annotations directly. implementation 'org.checkerframework:checker-qual:3.37.0' // Flink connector (ai.chalk.flink.*). compileOnly => not bundled and NOT exposed transitively,