diff --git a/examples/example-debug/pom.xml b/examples/example-debug/pom.xml index f720880e616..b0750a19e8b 100644 --- a/examples/example-debug/pom.xml +++ b/examples/example-debug/pom.xml @@ -58,7 +58,7 @@ com.google.guava guava - 31.1-jre + 32.0.1-jre junit diff --git a/examples/example-hostname/pom.xml b/examples/example-hostname/pom.xml index 0bcfd56207f..5520ffe201a 100644 --- a/examples/example-hostname/pom.xml +++ b/examples/example-hostname/pom.xml @@ -58,7 +58,7 @@ com.google.guava guava - 31.1-jre + 32.0.1-jre junit diff --git a/examples/pom.xml b/examples/pom.xml index 8733d7dd553..b928e5be074 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -63,7 +63,12 @@ com.google.guava guava - 31.1-jre + 32.0.1-jre + + + com.google.j2objc + j2objc-annotations + 2.8 org.apache.tomcat diff --git a/gcp-observability/build.gradle b/gcp-observability/build.gradle index 6f80ba1f7a4..9cef17fcd84 100644 --- a/gcp-observability/build.gradle +++ b/gcp-observability/build.gradle @@ -59,7 +59,9 @@ dependencies { libraries.animalsniffer.annotations, // Use our newer version libraries.guava.jre, // Use our newer version libraries.protobuf.java.util, // Use our newer version - libraries.re2j // Use our newer version + libraries.re2j, // Use our newer version + libraries.checker.qual, // Explicit dependency to keep in step with version used by guava + libraries.j2objc.annotations // Explicit dependency to keep in step with version used by guava testImplementation testFixtures(project(':grpc-context')), project(':grpc-testing'), diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cc725c4986a..31acfd13432 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ # Compatibility problem with internal version getting onto 1.5.3. # https://github.com/grpc/grpc-java/pull/9118 googleauth = "1.4.0" -guava = "31.1-android" +guava = "32.0.1-android" netty = '4.1.87.Final' nettytcnative = '2.0.56.Final' opencensus = "0.31.1" @@ -21,6 +21,7 @@ animalsniffer = "org.codehaus.mojo:animal-sniffer:1.23" animalsniffer-annotations = "org.codehaus.mojo:animal-sniffer-annotations:1.23" auto-value = "com.google.auto.value:auto-value:1.10.1" auto-value-annotations = "com.google.auto.value:auto-value-annotations:1.10.1" +checker-qual = "org.checkerframework:checker-qual:3.33.0" checkstyle = "com.puppycrawl.tools:checkstyle:8.28" commons-math3 = "org.apache.commons:commons-math3:3.6.1" conscrypt = "org.conscrypt:conscrypt-openjdk-uber:2.5.2" @@ -36,9 +37,10 @@ gson = "com.google.code.gson:gson:2.10.1" guava = { module = "com.google.guava:guava", version.ref = "guava" } guava-betaChecker = "com.google.guava:guava-beta-checker:1.0" guava-testlib = { module = "com.google.guava:guava-testlib", version.ref = "guava" } -guava-jre = "com.google.guava:guava:31.1-jre" +guava-jre = "com.google.guava:guava:32.0.1-jre" hdrhistogram = "org.hdrhistogram:HdrHistogram:2.1.12" javax-annotation = "org.apache.tomcat:annotations-api:6.0.53" +j2objc-annotations = " com.google.j2objc:j2objc-annotations:2.8" jetty-alpn-agent = "org.mortbay.jetty.alpn:jetty-alpn-agent:2.0.10" jsr305 = "com.google.code.findbugs:jsr305:3.0.2" junit = "junit:junit:4.13.2" diff --git a/repositories.bzl b/repositories.bzl index eb393c95a97..7d3bdb49894 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -20,7 +20,7 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [ "com.google.code.gson:gson:2.10.1", "com.google.errorprone:error_prone_annotations:2.18.0", "com.google.guava:failureaccess:1.0.1", - "com.google.guava:guava:31.1-android", + "com.google.guava:guava:32.0.1-android", "com.google.re2j:re2j:1.7", "com.google.truth:truth:1.0.1", "com.squareup.okhttp:okhttp:2.7.5", diff --git a/services/build.gradle b/services/build.gradle index 76a767dce8a..b834fcd2d79 100644 --- a/services/build.gradle +++ b/services/build.gradle @@ -23,7 +23,8 @@ dependencies { implementation libraries.protobuf.java.util, libraries.guava.jre // JRE required by protobuf-java-util - runtimeOnly libraries.errorprone.annotations + runtimeOnly libraries.errorprone.annotations, + libraries.j2objc.annotations // Explicit dependency to keep in step with version used by guava compileOnly libraries.javax.annotation testImplementation project(':grpc-testing'),