From a977385187760c01eb0488e898159bd50850289b Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Thu, 11 Jul 2024 15:09:00 -0700 Subject: [PATCH] Upgrade dependencies The GSON upgrade slightly changed an error string, so the test was updated to be less of a change detector. Some OpenTelemetry dependencies are alpha versions, so needed an adjustment in build.gradle to accept the versions. Similarly, Undertow includes Final in its version numbers which needs to be accepted. --- MODULE.bazel | 20 ++--- .../AuthorizationPolicyTranslatorTest.java | 5 +- .../AuthorizationServerInterceptorTest.java | 5 +- build.gradle | 6 ++ .../io/grpc/gradle/CheckForUpdatesTask.java | 12 ++- examples/build.gradle | 2 +- examples/example-alts/build.gradle | 2 +- examples/example-debug/build.gradle | 2 +- examples/example-debug/pom.xml | 13 +--- examples/example-gauth/build.gradle | 4 +- examples/example-gauth/pom.xml | 4 +- .../build.gradle | 6 +- .../example-gcp-observability/build.gradle | 2 +- examples/example-hostname/build.gradle | 2 +- examples/example-hostname/pom.xml | 13 +--- examples/example-jwt-auth/build.gradle | 2 +- examples/example-jwt-auth/pom.xml | 4 +- examples/example-oauth/build.gradle | 4 +- examples/example-oauth/pom.xml | 6 +- examples/example-opentelemetry/build.gradle | 6 +- examples/example-orca/build.gradle | 2 +- examples/example-reflection/build.gradle | 2 +- examples/example-servlet/build.gradle | 2 +- examples/example-tls/build.gradle | 2 +- examples/example-tls/pom.xml | 2 +- examples/example-xds/build.gradle | 2 +- examples/pom.xml | 17 ++-- gradle/libs.versions.toml | 78 ++++++++++--------- repositories.bzl | 20 ++--- 29 files changed, 124 insertions(+), 123 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index ea0521a693e..9bf2389a2ca 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -9,17 +9,17 @@ module( IO_GRPC_GRPC_JAVA_ARTIFACTS = [ "com.google.android:annotations:4.1.1.4", "com.google.api.grpc:proto-google-common-protos:2.29.0", - "com.google.auth:google-auth-library-credentials:1.22.0", - "com.google.auth:google-auth-library-oauth2-http:1.22.0", - "com.google.auto.value:auto-value-annotations:1.10.4", - "com.google.auto.value:auto-value:1.10.4", + "com.google.auth:google-auth-library-credentials:1.23.0", + "com.google.auth:google-auth-library-oauth2-http:1.23.0", + "com.google.auto.value:auto-value-annotations:1.11.0", + "com.google.auto.value:auto-value:1.11.0", "com.google.code.findbugs:jsr305:3.0.2", - "com.google.code.gson:gson:2.10.1", - "com.google.errorprone:error_prone_annotations:2.23.0", + "com.google.code.gson:gson:2.11.0", + "com.google.errorprone:error_prone_annotations:2.28.0", "com.google.guava:failureaccess:1.0.1", - "com.google.guava:guava:32.1.3-android", + "com.google.guava:guava:33.2.1-android", "com.google.re2j:re2j:1.7", - "com.google.truth:truth:1.1.5", + "com.google.truth:truth:1.4.2", "com.squareup.okhttp:okhttp:2.7.5", "com.squareup.okio:okio:2.10.0", # 3.0+ needs swapping to -jvm; need work to avoid flag-day "io.netty:netty-buffer:4.1.100.Final", @@ -38,10 +38,10 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [ "io.netty:netty-transport:4.1.100.Final", "io.opencensus:opencensus-api:0.31.0", "io.opencensus:opencensus-contrib-grpc-metrics:0.31.0", - "io.perfmark:perfmark-api:0.26.0", + "io.perfmark:perfmark-api:0.27.0", "junit:junit:4.13.2", "org.apache.tomcat:annotations-api:6.0.53", - "org.codehaus.mojo:animal-sniffer-annotations:1.23", + "org.codehaus.mojo:animal-sniffer-annotations:1.24", ] # GRPC_DEPS_END diff --git a/authz/src/test/java/io/grpc/authz/AuthorizationPolicyTranslatorTest.java b/authz/src/test/java/io/grpc/authz/AuthorizationPolicyTranslatorTest.java index 557458e97d7..17e6d4fe98b 100644 --- a/authz/src/test/java/io/grpc/authz/AuthorizationPolicyTranslatorTest.java +++ b/authz/src/test/java/io/grpc/authz/AuthorizationPolicyTranslatorTest.java @@ -45,9 +45,8 @@ public void invalidPolicy() throws Exception { AuthorizationPolicyTranslator.translate(policy); fail("exception expected"); } catch (IOException ioe) { - assertThat(ioe).hasMessageThat().isEqualTo( - "Use JsonReader.setLenient(true) to accept malformed JSON" - + " at line 1 column 18 path $.name"); + assertThat(ioe).hasMessageThat().contains("malformed JSON"); + assertThat(ioe).hasMessageThat().contains("at line 1 column 18 path $.name"); } } diff --git a/authz/src/test/java/io/grpc/authz/AuthorizationServerInterceptorTest.java b/authz/src/test/java/io/grpc/authz/AuthorizationServerInterceptorTest.java index b07a71bfb9f..65c08ef247f 100644 --- a/authz/src/test/java/io/grpc/authz/AuthorizationServerInterceptorTest.java +++ b/authz/src/test/java/io/grpc/authz/AuthorizationServerInterceptorTest.java @@ -35,9 +35,8 @@ public void invalidPolicyFailsStaticAuthzInterceptorCreation() throws Exception AuthorizationServerInterceptor.create(policy); fail("exception expected"); } catch (IOException ioe) { - assertThat(ioe).hasMessageThat().isEqualTo( - "Use JsonReader.setLenient(true) to accept malformed JSON" - + " at line 1 column 18 path $.name"); + assertThat(ioe).hasMessageThat().contains("malformed JSON"); + assertThat(ioe).hasMessageThat().contains("at line 1 column 18 path $.name"); } } diff --git a/build.gradle b/build.gradle index a51bdf3c8e3..76449ec0107 100644 --- a/build.gradle +++ b/build.gradle @@ -474,8 +474,14 @@ def isAcceptableVersion(ModuleComponentIdentifier candidate) { return true if (group == 'io.netty' && version.contains('Final')) return true + if (group == 'io.undertow' && version.contains('Final')) + return true if (module == 'android-api-level-19') return true + if (module == 'opentelemetry-exporter-prometheus') + return true + if (module == 'opentelemetry-gcp-resources') + return true return version ==~ /^[0-9]+(\.[0-9]+)+$/ } diff --git a/buildSrc/src/main/java/io/grpc/gradle/CheckForUpdatesTask.java b/buildSrc/src/main/java/io/grpc/gradle/CheckForUpdatesTask.java index 1babd728eb7..9d0156a1b72 100644 --- a/buildSrc/src/main/java/io/grpc/gradle/CheckForUpdatesTask.java +++ b/buildSrc/src/main/java/io/grpc/gradle/CheckForUpdatesTask.java @@ -28,8 +28,10 @@ import org.gradle.api.artifacts.ModuleVersionIdentifier; import org.gradle.api.artifacts.VersionCatalog; import org.gradle.api.artifacts.VersionCatalogsExtension; +import org.gradle.api.artifacts.result.DependencyResult; import org.gradle.api.artifacts.result.ResolvedComponentResult; import org.gradle.api.artifacts.result.ResolvedDependencyResult; +import org.gradle.api.artifacts.result.UnresolvedDependencyResult; import org.gradle.api.provider.Provider; import org.gradle.api.tasks.Input; import org.gradle.api.tasks.Nested; @@ -88,8 +90,14 @@ protected Set getLibraries() { public void checkForUpdates() { for (Library lib : libraries) { String name = lib.getName(); - ModuleVersionIdentifier oldId = ((ResolvedDependencyResult) lib.getOldResult().get() - .getDependencies().iterator().next()).getSelected().getModuleVersion(); + DependencyResult oldResult = lib.getOldResult().get().getDependencies().iterator().next(); + if (oldResult instanceof UnresolvedDependencyResult) { + System.out.println(String.format( + "- Current version of libs.%s not resolved", name)); + continue; + } + ModuleVersionIdentifier oldId = + ((ResolvedDependencyResult) oldResult).getSelected().getModuleVersion(); ModuleVersionIdentifier newId = ((ResolvedDependencyResult) lib.getNewResult().get() .getDependencies().iterator().next()).getSelected().getModuleVersion(); if (oldId != newId) { diff --git a/examples/build.gradle b/examples/build.gradle index 79096232f2d..f27403a4e1f 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -24,7 +24,7 @@ java { // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION -def protobufVersion = '3.25.1' +def protobufVersion = '3.25.3' def protocVersion = protobufVersion dependencies { diff --git a/examples/example-alts/build.gradle b/examples/example-alts/build.gradle index d91bf9ac725..eedae774a9e 100644 --- a/examples/example-alts/build.gradle +++ b/examples/example-alts/build.gradle @@ -25,7 +25,7 @@ java { // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION -def protocVersion = '3.25.1' +def protocVersion = '3.25.3' dependencies { // grpc-alts transitively depends on grpc-netty-shaded, grpc-protobuf, and grpc-stub diff --git a/examples/example-debug/build.gradle b/examples/example-debug/build.gradle index 9b50597c055..7d04156b572 100644 --- a/examples/example-debug/build.gradle +++ b/examples/example-debug/build.gradle @@ -26,7 +26,7 @@ java { // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION -def protobufVersion = '3.25.1' +def protobufVersion = '3.25.3' dependencies { implementation "io.grpc:grpc-protobuf:${grpcVersion}" diff --git a/examples/example-debug/pom.xml b/examples/example-debug/pom.xml index 7d8f3d86768..5aa8065ad31 100644 --- a/examples/example-debug/pom.xml +++ b/examples/example-debug/pom.xml @@ -13,7 +13,7 @@ UTF-8 1.66.0-SNAPSHOT - 3.25.1 + 3.25.3 1.8 1.8 @@ -34,15 +34,15 @@ io.grpc - grpc-protobuf + grpc-services io.grpc - grpc-stub + grpc-protobuf io.grpc - grpc-services + grpc-stub org.apache.tomcat @@ -55,11 +55,6 @@ grpc-netty-shaded runtime - - com.google.guava - guava - 32.1.3-jre - junit junit diff --git a/examples/example-gauth/build.gradle b/examples/example-gauth/build.gradle index 6b39d3ea673..82284164b13 100644 --- a/examples/example-gauth/build.gradle +++ b/examples/example-gauth/build.gradle @@ -25,7 +25,7 @@ java { // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION -def protobufVersion = '3.25.1' +def protobufVersion = '3.25.3' def protocVersion = protobufVersion @@ -34,7 +34,7 @@ dependencies { implementation "io.grpc:grpc-stub:${grpcVersion}" implementation "io.grpc:grpc-auth:${grpcVersion}" compileOnly "org.apache.tomcat:annotations-api:6.0.53" - implementation "com.google.auth:google-auth-library-oauth2-http:1.4.0" + implementation "com.google.auth:google-auth-library-oauth2-http:1.23.0" implementation "com.google.api.grpc:grpc-google-cloud-pubsub-v1:0.1.24" runtimeOnly "io.grpc:grpc-netty-shaded:${grpcVersion}" } diff --git a/examples/example-gauth/pom.xml b/examples/example-gauth/pom.xml index b71d110f9e8..d91eeb15ded 100644 --- a/examples/example-gauth/pom.xml +++ b/examples/example-gauth/pom.xml @@ -13,7 +13,7 @@ UTF-8 1.66.0-SNAPSHOT - 3.25.1 + 3.25.3 1.8 1.8 @@ -63,7 +63,7 @@ com.google.auth google-auth-library-oauth2-http - 1.4.0 + 1.23.0 com.google.api.grpc diff --git a/examples/example-gcp-csm-observability/build.gradle b/examples/example-gcp-csm-observability/build.gradle index b9c6201ad6f..d46a851e6cc 100644 --- a/examples/example-gcp-csm-observability/build.gradle +++ b/examples/example-gcp-csm-observability/build.gradle @@ -26,9 +26,9 @@ java { // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION -def protocVersion = '3.25.1' -def openTelemetryVersion = '1.39.0' -def openTelemetryPrometheusVersion = '1.39.0-alpha' +def protocVersion = '3.25.3' +def openTelemetryVersion = '1.40.0' +def openTelemetryPrometheusVersion = '1.40.0-alpha' dependencies { implementation "io.grpc:grpc-protobuf:${grpcVersion}" diff --git a/examples/example-gcp-observability/build.gradle b/examples/example-gcp-observability/build.gradle index d165d7e8924..34a8b8d08b0 100644 --- a/examples/example-gcp-observability/build.gradle +++ b/examples/example-gcp-observability/build.gradle @@ -26,7 +26,7 @@ java { // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION -def protocVersion = '3.25.1' +def protocVersion = '3.25.3' dependencies { implementation "io.grpc:grpc-protobuf:${grpcVersion}" diff --git a/examples/example-hostname/build.gradle b/examples/example-hostname/build.gradle index e7795d2fdc9..7cf18ef9f0c 100644 --- a/examples/example-hostname/build.gradle +++ b/examples/example-hostname/build.gradle @@ -24,7 +24,7 @@ java { // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION -def protobufVersion = '3.25.1' +def protobufVersion = '3.25.3' dependencies { implementation "io.grpc:grpc-protobuf:${grpcVersion}" diff --git a/examples/example-hostname/pom.xml b/examples/example-hostname/pom.xml index f6c27016061..05131b89978 100644 --- a/examples/example-hostname/pom.xml +++ b/examples/example-hostname/pom.xml @@ -13,7 +13,7 @@ UTF-8 1.66.0-SNAPSHOT - 3.25.1 + 3.25.3 1.8 1.8 @@ -34,15 +34,15 @@ io.grpc - grpc-protobuf + grpc-services io.grpc - grpc-stub + grpc-protobuf io.grpc - grpc-services + grpc-stub org.apache.tomcat @@ -55,11 +55,6 @@ grpc-netty-shaded runtime - - com.google.guava - guava - 32.1.3-jre - junit junit diff --git a/examples/example-jwt-auth/build.gradle b/examples/example-jwt-auth/build.gradle index a676e204146..92ab27b83ce 100644 --- a/examples/example-jwt-auth/build.gradle +++ b/examples/example-jwt-auth/build.gradle @@ -24,7 +24,7 @@ java { // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION -def protobufVersion = '3.25.1' +def protobufVersion = '3.25.3' def protocVersion = protobufVersion dependencies { diff --git a/examples/example-jwt-auth/pom.xml b/examples/example-jwt-auth/pom.xml index 23db72cf192..01cf0edce28 100644 --- a/examples/example-jwt-auth/pom.xml +++ b/examples/example-jwt-auth/pom.xml @@ -14,8 +14,8 @@ UTF-8 1.66.0-SNAPSHOT - 3.25.1 - 3.25.1 + 3.25.3 + 3.25.3 1.8 1.8 diff --git a/examples/example-oauth/build.gradle b/examples/example-oauth/build.gradle index 57987227c26..37612591691 100644 --- a/examples/example-oauth/build.gradle +++ b/examples/example-oauth/build.gradle @@ -24,14 +24,14 @@ java { // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION -def protobufVersion = '3.25.1' +def protobufVersion = '3.25.3' def protocVersion = protobufVersion dependencies { implementation "io.grpc:grpc-protobuf:${grpcVersion}" implementation "io.grpc:grpc-stub:${grpcVersion}" implementation "io.grpc:grpc-auth:${grpcVersion}" - implementation "com.google.auth:google-auth-library-oauth2-http:1.18.0" + implementation "com.google.auth:google-auth-library-oauth2-http:1.23.0" compileOnly "org.apache.tomcat:annotations-api:6.0.53" diff --git a/examples/example-oauth/pom.xml b/examples/example-oauth/pom.xml index ef492e0dcd1..afd45aecd39 100644 --- a/examples/example-oauth/pom.xml +++ b/examples/example-oauth/pom.xml @@ -14,8 +14,8 @@ UTF-8 1.66.0-SNAPSHOT - 3.25.1 - 3.25.1 + 3.25.3 + 3.25.3 1.8 1.8 @@ -60,7 +60,7 @@ com.google.auth google-auth-library-oauth2-http - 1.18.0 + 1.23.0 org.apache.tomcat diff --git a/examples/example-opentelemetry/build.gradle b/examples/example-opentelemetry/build.gradle index d031a366b79..c53f204d7bf 100644 --- a/examples/example-opentelemetry/build.gradle +++ b/examples/example-opentelemetry/build.gradle @@ -25,9 +25,9 @@ java { // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION -def protocVersion = '3.25.1' -def openTelemetryVersion = '1.39.0' -def openTelemetryPrometheusVersion = '1.39.0-alpha' +def protocVersion = '3.25.3' +def openTelemetryVersion = '1.40.0' +def openTelemetryPrometheusVersion = '1.40.0-alpha' dependencies { implementation "io.grpc:grpc-protobuf:${grpcVersion}" diff --git a/examples/example-orca/build.gradle b/examples/example-orca/build.gradle index 0bdaaef267e..39be9b9d388 100644 --- a/examples/example-orca/build.gradle +++ b/examples/example-orca/build.gradle @@ -19,7 +19,7 @@ java { } def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION -def protocVersion = '3.25.1' +def protocVersion = '3.25.3' dependencies { implementation "io.grpc:grpc-protobuf:${grpcVersion}" diff --git a/examples/example-reflection/build.gradle b/examples/example-reflection/build.gradle index 43ff5ee6356..e24100cad79 100644 --- a/examples/example-reflection/build.gradle +++ b/examples/example-reflection/build.gradle @@ -19,7 +19,7 @@ java { } def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION -def protocVersion = '3.25.1' +def protocVersion = '3.25.3' dependencies { implementation "io.grpc:grpc-protobuf:${grpcVersion}" diff --git a/examples/example-servlet/build.gradle b/examples/example-servlet/build.gradle index 1376280e3f8..b73d21fbc4c 100644 --- a/examples/example-servlet/build.gradle +++ b/examples/example-servlet/build.gradle @@ -17,7 +17,7 @@ java { } def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION -def protocVersion = '3.25.1' +def protocVersion = '3.25.3' dependencies { implementation "io.grpc:grpc-protobuf:${grpcVersion}", diff --git a/examples/example-tls/build.gradle b/examples/example-tls/build.gradle index 1dd0b02933e..5d8d0296dc5 100644 --- a/examples/example-tls/build.gradle +++ b/examples/example-tls/build.gradle @@ -25,7 +25,7 @@ java { // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION -def protocVersion = '3.25.1' +def protocVersion = '3.25.3' dependencies { implementation "io.grpc:grpc-protobuf:${grpcVersion}" diff --git a/examples/example-tls/pom.xml b/examples/example-tls/pom.xml index 21730d7a715..1263b347030 100644 --- a/examples/example-tls/pom.xml +++ b/examples/example-tls/pom.xml @@ -13,7 +13,7 @@ UTF-8 1.66.0-SNAPSHOT - 3.25.1 + 3.25.3 1.8 1.8 diff --git a/examples/example-xds/build.gradle b/examples/example-xds/build.gradle index 3009b568b76..22c6141fed5 100644 --- a/examples/example-xds/build.gradle +++ b/examples/example-xds/build.gradle @@ -24,7 +24,7 @@ java { // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION -def protocVersion = '3.25.1' +def protocVersion = '3.25.3' dependencies { implementation "io.grpc:grpc-protobuf:${grpcVersion}" diff --git a/examples/pom.xml b/examples/pom.xml index 7e92c6a669b..a71e9d449c3 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -13,8 +13,8 @@ UTF-8 1.66.0-SNAPSHOT - 3.25.1 - 3.25.1 + 3.25.3 + 3.25.3 1.8 1.8 @@ -35,16 +35,16 @@ io.grpc - grpc-netty-shaded - runtime + grpc-services io.grpc - grpc-protobuf + grpc-netty-shaded + runtime io.grpc - grpc-services + grpc-protobuf io.grpc @@ -55,11 +55,6 @@ protobuf-java-util ${protobuf.version} - - com.google.guava - guava - 32.1.3-jre - org.apache.tomcat annotations-api diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 911c6d2b8eb..5527c6d5c7b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,58 +1,60 @@ [versions] -googleauth = "1.22.0" netty = '4.1.100.Final' # Keep the following references of tcnative version in sync whenever it's updated: # SECURITY.md nettytcnative = '2.0.61.Final' opencensus = "0.31.1" -protobuf = "3.25.1" +# Not upgrading to 4.x as it is not yet ABI compatible. +# https://github.com/protocolbuffers/protobuf/issues/17247 +protobuf = "3.25.3" [libraries] android-annotations = "com.google.android:annotations:4.1.1.4" -androidx-annotation = "androidx.annotation:annotation:1.7.0" -androidx-core = "androidx.core:core:1.12.0" -androidx-lifecycle-common = "androidx.lifecycle:lifecycle-common:2.6.2" -androidx-lifecycle-service = "androidx.lifecycle:lifecycle-service:2.6.2" -androidx-test-core = "androidx.test:core:1.5.0" -androidx-test-ext-junit = "androidx.test.ext:junit:1.1.5" -androidx-test-rules = "androidx.test:rules:1.5.0" -animalsniffer = "org.codehaus.mojo:animal-sniffer:1.23" -animalsniffer-annotations = "org.codehaus.mojo:animal-sniffer-annotations:1.23" -assertj-core = "org.assertj:assertj-core:3.24.2" -auto-value = "com.google.auto.value:auto-value:1.10.4" -auto-value-annotations = "com.google.auto.value:auto-value-annotations:1.10.4" +androidx-annotation = "androidx.annotation:annotation:1.8.0" +androidx-core = "androidx.core:core:1.13.1" +androidx-lifecycle-common = "androidx.lifecycle:lifecycle-common:2.8.3" +androidx-lifecycle-service = "androidx.lifecycle:lifecycle-service:2.8.3" +androidx-test-core = "androidx.test:core:1.6.1" +androidx-test-ext-junit = "androidx.test.ext:junit:1.2.1" +androidx-test-rules = "androidx.test:rules:1.6.1" +animalsniffer = "org.codehaus.mojo:animal-sniffer:1.24" +animalsniffer-annotations = "org.codehaus.mojo:animal-sniffer-annotations:1.24" +assertj-core = "org.assertj:assertj-core:3.26.0" +auto-value = "com.google.auto.value:auto-value:1.11.0" +auto-value-annotations = "com.google.auto.value:auto-value-annotations:1.11.0" checkstyle = "com.puppycrawl.tools:checkstyle:10.17.0" commons-math3 = "org.apache.commons:commons-math3:3.6.1" conscrypt = "org.conscrypt:conscrypt-openjdk-uber:2.5.2" cronet-api = "org.chromium.net:cronet-api:119.6045.31" cronet-embedded = "org.chromium.net:cronet-embedded:119.6045.31" -errorprone-annotations = "com.google.errorprone:error_prone_annotations:2.23.0" +errorprone-annotations = "com.google.errorprone:error_prone_annotations:2.28.0" errorprone-core = "com.google.errorprone:error_prone_core:2.23.0" -google-api-protos = "com.google.api.grpc:proto-google-common-protos:2.29.0" -google-auth-credentials = { module = "com.google.auth:google-auth-library-credentials", version.ref = "googleauth" } -google-auth-oauth2Http = { module = "com.google.auth:google-auth-library-oauth2-http", version.ref = "googleauth" } +google-api-protos = "com.google.api.grpc:proto-google-common-protos:2.41.0" +google-auth-credentials = "com.google.auth:google-auth-library-credentials:1.23.0" +google-auth-oauth2Http = "com.google.auth:google-auth-library-oauth2-http:1.23.0" # Release notes: https://cloud.google.com/logging/docs/release-notes -google-cloud-logging = "com.google.cloud:google-cloud-logging:3.15.14" -gson = "com.google.code.gson:gson:2.10.1" -guava = "com.google.guava:guava:32.1.3-android" +google-cloud-logging = "com.google.cloud:google-cloud-logging:3.19.0" +gson = "com.google.code.gson:gson:2.11.0" +guava = "com.google.guava:guava:33.2.1-android" guava-betaChecker = "com.google.guava:guava-beta-checker:1.0" -guava-testlib = "com.google.guava:guava-testlib:32.1.3-android" +guava-testlib = "com.google.guava:guava-testlib:33.2.1-android" # JRE version is needed for projects where its a transitive dependency, f.e. gcp-observability. # May be different from the -android version. -guava-jre = "com.google.guava:guava:32.1.3-jre" -hdrhistogram = "org.hdrhistogram:HdrHistogram:2.1.12" -j2objc-annotations = " com.google.j2objc:j2objc-annotations:2.8" +guava-jre = "com.google.guava:guava:33.2.1-jre" +hdrhistogram = "org.hdrhistogram:HdrHistogram:2.2.2" +j2objc-annotations = " com.google.j2objc:j2objc-annotations:3.0.0" jakarta-servlet-api = "jakarta.servlet:jakarta.servlet-api:5.0.0" javax-annotation = "org.apache.tomcat:annotations-api:6.0.53" javax-servlet-api = "javax.servlet:javax.servlet-api:4.0.1" jetty-client = "org.eclipse.jetty:jetty-client:10.0.20" -jetty-http2-server = "org.eclipse.jetty.http2:http2-server:11.0.20" +jetty-http2-server = "org.eclipse.jetty.http2:http2-server:11.0.22" jetty-http2-server10 = "org.eclipse.jetty.http2:http2-server:10.0.20" -jetty-servlet = "org.eclipse.jetty:jetty-servlet:11.0.20" +jetty-servlet = "org.eclipse.jetty:jetty-servlet:11.0.22" jetty-servlet10 = "org.eclipse.jetty:jetty-servlet:10.0.20" jsr305 = "com.google.code.findbugs:jsr305:3.0.2" junit = "junit:junit:4.13.2" -lincheck = "org.jetbrains.kotlinx:lincheck:2.14.1" +# 2.17+ require Java 11+ (not mentioned in release notes) +lincheck = "org.jetbrains.kotlinx:lincheck:2.16" # Update notes / 2023-07-19 sergiitk: # Couldn't update to 5.4.0, updated to the last in 4.x line. Version 5.x breaks some tests. # Error log: https://github.com/grpc/grpc-java/pull/10359#issuecomment-1632834435 @@ -75,25 +77,27 @@ opencensus-contrib-grpc-metrics = { module = "io.opencensus:opencensus-contrib-g opencensus-exporter-stats-stackdriver = { module = "io.opencensus:opencensus-exporter-stats-stackdriver", version.ref = "opencensus" } opencensus-exporter-trace-stackdriver = { module = "io.opencensus:opencensus-exporter-trace-stackdriver", version.ref = "opencensus" } opencensus-impl = { module = "io.opencensus:opencensus-impl", version.ref = "opencensus" } -opentelemetry-api = "io.opentelemetry:opentelemetry-api:1.39.0" -opentelemetry-exporter-prometheus = "io.opentelemetry:opentelemetry-exporter-prometheus:1.39.0-alpha" +opentelemetry-api = "io.opentelemetry:opentelemetry-api:1.40.0" +opentelemetry-exporter-prometheus = "io.opentelemetry:opentelemetry-exporter-prometheus:1.40.0-alpha" opentelemetry-gcp-resources = "io.opentelemetry.contrib:opentelemetry-gcp-resources:1.36.0-alpha" -opentelemetry-sdk-extension-autoconfigure = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.39.0" -opentelemetry-sdk-testing = "io.opentelemetry:opentelemetry-sdk-testing:1.39.0" -perfmark-api = "io.perfmark:perfmark-api:0.26.0" +opentelemetry-sdk-extension-autoconfigure = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.40.0" +opentelemetry-sdk-testing = "io.opentelemetry:opentelemetry-sdk-testing:1.40.0" +perfmark-api = "io.perfmark:perfmark-api:0.27.0" protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "protobuf" } protobuf-java-util = { module = "com.google.protobuf:protobuf-java-util", version.ref = "protobuf" } protobuf-javalite = { module = "com.google.protobuf:protobuf-javalite", version.ref = "protobuf" } protobuf-protoc = { module = "com.google.protobuf:protoc", version.ref = "protobuf" } re2j = "com.google.re2j:re2j:1.7" -robolectric = "org.robolectric:robolectric:4.11.1" +robolectric = "org.robolectric:robolectric:4.13" signature-android = "net.sf.androidscents.signature:android-api-level-19:4.4.2_r4" signature-java = "org.codehaus.mojo.signature:java18:1.0" -tomcat-embed-core = "org.apache.tomcat.embed:tomcat-embed-core:10.1.23" +tomcat-embed-core = "org.apache.tomcat.embed:tomcat-embed-core:10.1.25" tomcat-embed-core9 = "org.apache.tomcat.embed:tomcat-embed-core:9.0.89" -truth = "com.google.truth:truth:1.1.5" +# 1.4.3+ causes "unknown enum constant ElementType.MODULE" warning. +# https://github.com/google/truth/issues/1320 +truth = "com.google.truth:truth:1.4.2" undertow-servlet = "io.undertow:undertow-servlet:2.2.32.Final" -undertow-servlet-jakartaee9 = "io.undertow:undertow-servlet:2.3.13.Final" +undertow-servlet-jakartaee9 = "io.undertow:undertow-servlet:2.3.14.Final" # Do not update: Pinned to the last version supporting Java 8. # See https://checkstyle.sourceforge.io/releasenotes.html#Release_10.1 diff --git a/repositories.bzl b/repositories.bzl index 774a95ce998..ebbe666eec2 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -13,17 +13,17 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") IO_GRPC_GRPC_JAVA_ARTIFACTS = [ "com.google.android:annotations:4.1.1.4", "com.google.api.grpc:proto-google-common-protos:2.29.0", - "com.google.auth:google-auth-library-credentials:1.22.0", - "com.google.auth:google-auth-library-oauth2-http:1.22.0", - "com.google.auto.value:auto-value-annotations:1.10.4", - "com.google.auto.value:auto-value:1.10.4", + "com.google.auth:google-auth-library-credentials:1.23.0", + "com.google.auth:google-auth-library-oauth2-http:1.23.0", + "com.google.auto.value:auto-value-annotations:1.11.0", + "com.google.auto.value:auto-value:1.11.0", "com.google.code.findbugs:jsr305:3.0.2", - "com.google.code.gson:gson:2.10.1", - "com.google.errorprone:error_prone_annotations:2.23.0", + "com.google.code.gson:gson:2.11.0", + "com.google.errorprone:error_prone_annotations:2.28.0", "com.google.guava:failureaccess:1.0.1", - "com.google.guava:guava:32.1.3-android", + "com.google.guava:guava:33.2.1-android", "com.google.re2j:re2j:1.7", - "com.google.truth:truth:1.1.5", + "com.google.truth:truth:1.4.2", "com.squareup.okhttp:okhttp:2.7.5", "com.squareup.okio:okio:2.10.0", # 3.0+ needs swapping to -jvm; need work to avoid flag-day "io.netty:netty-buffer:4.1.100.Final", @@ -42,10 +42,10 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [ "io.netty:netty-transport:4.1.100.Final", "io.opencensus:opencensus-api:0.31.0", "io.opencensus:opencensus-contrib-grpc-metrics:0.31.0", - "io.perfmark:perfmark-api:0.26.0", + "io.perfmark:perfmark-api:0.27.0", "junit:junit:4.13.2", "org.apache.tomcat:annotations-api:6.0.53", - "org.codehaus.mojo:animal-sniffer-annotations:1.23", + "org.codehaus.mojo:animal-sniffer-annotations:1.24", ] # GRPC_DEPS_END