Skip to content

Commit 9698a96

Browse files
Richard Antalzabetak
authored andcommitted
[CALCITE-7177] Update Guava from 33.4.0-jre to 33.4.8-jre in Avatica
1 parent 0aec625 commit 9698a96

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ jobs:
142142
name: 'Linux (JDK 11), Newest Guava'
143143
runs-on: ubuntu-latest
144144
env:
145-
GUAVA: 33.4.0-jre # newest supported Guava version
145+
GUAVA: 33.4.8-jre # newest supported Guava version
146146
steps:
147147
- name: 'Set up JDK 11'
148148
uses: actions/setup-java@v4

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ bytebuddy.version=1.15.1
6161
dropwizard-metrics.version=4.0.5
6262
# We support Guava versions as old as 14.0.1 (the version used by Hive)
6363
# but prefer more recent versions.
64-
guava.version=33.4.0-jre
64+
guava.version=33.4.8-jre
6565
hamcrest.version=1.3
6666
hsqldb.version=2.4.1
6767
h2.version=1.4.197

standalone-server/src/test/java/org/apache/calcite/avatica/shadetest/ShadingTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ public class ShadingTest {
3939
"^google/protobuf/", "^about.html$", "^org/eclipse/jetty/", "^jetty-dir.css",
4040
"^com/google/thirdparty/", "^org/checkerframework/", "^javax/annotation/",
4141
"^com/google/errorprone/", "^Log4j-.*\\.xsd$", "^Log4j-.*\\.dtd$", "^Log4j-.*\\.properties$",
42-
"^org/apache/logging/log4j/", "^org/codehaus/mojo/animal_sniffer/", "^org/joou/" };
42+
"^org/apache/logging/log4j/", "^org/codehaus/mojo/animal_sniffer/", "^org/joou/",
43+
"^org/jspecify/annotations/"};
4344

4445
@Test
4546
public void validateShadedJar() throws Exception {

0 commit comments

Comments
 (0)