This is an automated email from the ASF dual-hosted git repository.
zabetak pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/calcite-avatica.git
The following commit(s) were added to refs/heads/main by this push:
new 9698a96a3 [CALCITE-7177] Update Guava from 33.4.0-jre to 33.4.8-jre in
Avatica
9698a96a3 is described below
commit 9698a96a36275736f48afc0a0b0a81dfaadc77a6
Author: Richard Antal <[email protected]>
AuthorDate: Thu Sep 11 15:33:12 2025 +0200
[CALCITE-7177] Update Guava from 33.4.0-jre to 33.4.8-jre in Avatica
---
.github/workflows/main.yml | 2 +-
gradle.properties | 2 +-
.../test/java/org/apache/calcite/avatica/shadetest/ShadingTest.java | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4e1787f4d..e4f9bee1d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -142,7 +142,7 @@ jobs:
name: 'Linux (JDK 11), Newest Guava'
runs-on: ubuntu-latest
env:
- GUAVA: 33.4.0-jre # newest supported Guava version
+ GUAVA: 33.4.8-jre # newest supported Guava version
steps:
- name: 'Set up JDK 11'
uses: actions/setup-java@v4
diff --git a/gradle.properties b/gradle.properties
index d6abe413b..e4130ae95 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -61,7 +61,7 @@ bytebuddy.version=1.15.1
dropwizard-metrics.version=4.0.5
# We support Guava versions as old as 14.0.1 (the version used by Hive)
# but prefer more recent versions.
-guava.version=33.4.0-jre
+guava.version=33.4.8-jre
hamcrest.version=1.3
hsqldb.version=2.4.1
h2.version=1.4.197
diff --git
a/standalone-server/src/test/java/org/apache/calcite/avatica/shadetest/ShadingTest.java
b/standalone-server/src/test/java/org/apache/calcite/avatica/shadetest/ShadingTest.java
index 5b1a27a61..7c4e63de9 100644
---
a/standalone-server/src/test/java/org/apache/calcite/avatica/shadetest/ShadingTest.java
+++
b/standalone-server/src/test/java/org/apache/calcite/avatica/shadetest/ShadingTest.java
@@ -39,7 +39,8 @@ public class ShadingTest {
"^google/protobuf/", "^about.html$", "^org/eclipse/jetty/",
"^jetty-dir.css",
"^com/google/thirdparty/", "^org/checkerframework/",
"^javax/annotation/",
"^com/google/errorprone/", "^Log4j-.*\\.xsd$", "^Log4j-.*\\.dtd$",
"^Log4j-.*\\.properties$",
- "^org/apache/logging/log4j/", "^org/codehaus/mojo/animal_sniffer/",
"^org/joou/" };
+ "^org/apache/logging/log4j/", "^org/codehaus/mojo/animal_sniffer/",
"^org/joou/",
+ "^org/jspecify/annotations/"};
@Test
public void validateShadedJar() throws Exception {
