From 11694edd564495c354301efbe4cb9477c4b947f1 Mon Sep 17 00:00:00 2001 From: Jin Seop Kim Date: Wed, 29 Apr 2026 14:49:17 -0400 Subject: [PATCH 1/4] deps: upgrade opentelemetry --- java-bigquery/samples/install-without-bom/pom.xml | 2 +- .../gapic-generator-java-pom-parent/pom.xml | 2 +- sdk-platform-java/gax-java/dependencies.properties | 12 ++++++------ .../third-party-dependencies/pom.xml | 10 +++++----- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/java-bigquery/samples/install-without-bom/pom.xml b/java-bigquery/samples/install-without-bom/pom.xml index cfcf9c503fe8..eacf89529788 100644 --- a/java-bigquery/samples/install-without-bom/pom.xml +++ b/java-bigquery/samples/install-without-bom/pom.xml @@ -37,7 +37,7 @@ 1.8 1.8 UTF-8 - 1.52.0 + 1.57.0 diff --git a/sdk-platform-java/gapic-generator-java-pom-parent/pom.xml b/sdk-platform-java/gapic-generator-java-pom-parent/pom.xml index bc94e6e4ea61..b8c10b8668d2 100644 --- a/sdk-platform-java/gapic-generator-java-pom-parent/pom.xml +++ b/sdk-platform-java/gapic-generator-java-pom-parent/pom.xml @@ -31,7 +31,7 @@ 2.12.1 33.5.0-jre 4.33.2 - 1.51.0 + 1.57.0 2.45.0 3.1 1.7.0 diff --git a/sdk-platform-java/gax-java/dependencies.properties b/sdk-platform-java/gax-java/dependencies.properties index 17f3ec490bee..4a4c3e41cf66 100644 --- a/sdk-platform-java/gax-java/dependencies.properties +++ b/sdk-platform-java/gax-java/dependencies.properties @@ -39,8 +39,8 @@ maven.com_google_api_grpc_proto_google_common_protos=com.google.api.grpc:proto-g maven.com_google_api_grpc_grpc_google_common_protos=com.google.api.grpc:grpc-google-common-protos:2.63.2 maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:1.46.0 maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:1.46.0 -maven.io_opentelemetry_opentelemetry_api=io.opentelemetry:opentelemetry-api:1.51.0 -maven.io_opentelemetry_opentelemetry_context=io.opentelemetry:opentelemetry-context:1.51.0 +maven.io_opentelemetry_opentelemetry_api=io.opentelemetry:opentelemetry-api:1.57.0 +maven.io_opentelemetry_opentelemetry_context=io.opentelemetry:opentelemetry-context:1.57.0 maven.io_opencensus_opencensus_api=io.opencensus:opencensus-api:0.31.1 maven.io_opencensus_opencensus_contrib_grpc_metrics=io.opencensus:opencensus-contrib-grpc-metrics:0.31.1 maven.io_opencensus_opencensus_contrib_http_util=io.opencensus:opencensus-contrib-http-util:0.31.1 @@ -91,8 +91,8 @@ maven.net_bytebuddy_byte_buddy=net.bytebuddy:byte-buddy:1.17.0 maven.org_objenesis_objenesis=org.objenesis:objenesis:2.6 maven.org_junit_jupiter_junit_jupiter_api=org.junit.jupiter:junit-jupiter-api:5.11.4 maven.org_junit_jupiter_junit_jupiter_params=org.junit.jupiter:junit-jupiter-params:5.11.4 -maven.io_opentelemetry_opentelemetry_sdk_testing=io.opentelemetry:opentelemetry-sdk-testing:1.51.0 -maven.io_opentelemetry_opentelemetry_sdk=io.opentelemetry:opentelemetry-sdk:1.51.0 -maven.io_opentelemetry_opentelemetry_sdk_common=io.opentelemetry:opentelemetry-sdk-common:1.51.0 -maven.io_opentelemetry_opentelemetry_sdk_metrics=io.opentelemetry:opentelemetry-sdk-metrics:1.51.0 +maven.io_opentelemetry_opentelemetry_sdk_testing=io.opentelemetry:opentelemetry-sdk-testing:1.57.0 +maven.io_opentelemetry_opentelemetry_sdk=io.opentelemetry:opentelemetry-sdk:1.57.0 +maven.io_opentelemetry_opentelemetry_sdk_common=io.opentelemetry:opentelemetry-sdk-common:1.57.0 +maven.io_opentelemetry_opentelemetry_sdk_metrics=io.opentelemetry:opentelemetry-sdk-metrics:1.57.0 maven.com_google_guava_guava_testlib=com.google.guava:guava-testlib:32.1.3-jre diff --git a/sdk-platform-java/java-shared-dependencies/third-party-dependencies/pom.xml b/sdk-platform-java/java-shared-dependencies/third-party-dependencies/pom.xml index b372ed8aa93d..bce2b6bbaa03 100644 --- a/sdk-platform-java/java-shared-dependencies/third-party-dependencies/pom.xml +++ b/sdk-platform-java/java-shared-dependencies/third-party-dependencies/pom.xml @@ -36,14 +36,14 @@ 3.49.0 0.27.0 - 0.33.0 - 2.1.0-alpha - 1.29.0-alpha + 0.36.0 + 2.23.0-alpha + 1.37.0 0.8 17.0.0 0.6.0 1.16.0 - 1.45.0-alpha + 1.52.0-alpha 20250517 @@ -161,7 +161,7 @@ io.opentelemetry opentelemetry-semconv - 1.26.0-alpha + 1.30.1-alpha com.google.cloud.opentelemetry From d4b68f7b2b6a5ac34d2e27f86f86040f2ff3fe2b Mon Sep 17 00:00:00 2001 From: Jin Seop Kim Date: Wed, 29 Apr 2026 14:58:07 -0400 Subject: [PATCH 2/4] CI fix --- java-maps-mapmanagement/owlbot.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/java-maps-mapmanagement/owlbot.py b/java-maps-mapmanagement/owlbot.py index 6da47954339a..fbb37df70f1a 100644 --- a/java-maps-mapmanagement/owlbot.py +++ b/java-maps-mapmanagement/owlbot.py @@ -33,6 +33,5 @@ "java.header", "license-checks.xml", "renovate.json", - ".gitignore", - ], -) \ No newline at end of file + ".gitignore" +]) \ No newline at end of file From 5d2fa1bd8334cbb96a4b890ffb1e7f11f5759d49 Mon Sep 17 00:00:00 2001 From: Jin Seop Kim Date: Wed, 29 Apr 2026 15:53:44 -0400 Subject: [PATCH 3/4] exclude jackson from upper bound violation --- google-cloud-pom-parent/pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/google-cloud-pom-parent/pom.xml b/google-cloud-pom-parent/pom.xml index 5f82d49cbd28..b476e8d72c8e 100644 --- a/google-cloud-pom-parent/pom.xml +++ b/google-cloud-pom-parent/pom.xml @@ -120,6 +120,9 @@ io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi io.opentelemetry:opentelemetry-sdk-common io.opentelemetry:opentelemetry-sdk + com.fasterxml.jackson.core:jackson-core + com.fasterxml.jackson.core:jackson-databind + com.fasterxml.jackson.core:jackson-annotations From e6fa0faeb126c6928676622220991b5f5f37a865 Mon Sep 17 00:00:00 2001 From: Jin Seop Kim Date: Wed, 29 Apr 2026 18:19:59 -0400 Subject: [PATCH 4/4] pr feedback --- google-cloud-pom-parent/pom.xml | 19 ------------------- .../third-party-dependencies/pom.xml | 10 +++++----- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/google-cloud-pom-parent/pom.xml b/google-cloud-pom-parent/pom.xml index b476e8d72c8e..5cfc88ff33b6 100644 --- a/google-cloud-pom-parent/pom.xml +++ b/google-cloud-pom-parent/pom.xml @@ -108,25 +108,6 @@ enforce - - - - - io.opentelemetry:opentelemetry-api - io.opentelemetry:opentelemetry-sdk-metrics - io.opentelemetry:opentelemetry-sdk-logs - io.opentelemetry:opentelemetry-context - io.opentelemetry:opentelemetry-sdk-trace - io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi - io.opentelemetry:opentelemetry-sdk-common - io.opentelemetry:opentelemetry-sdk - com.fasterxml.jackson.core:jackson-core - com.fasterxml.jackson.core:jackson-databind - com.fasterxml.jackson.core:jackson-annotations - - - - diff --git a/sdk-platform-java/java-shared-dependencies/third-party-dependencies/pom.xml b/sdk-platform-java/java-shared-dependencies/third-party-dependencies/pom.xml index bce2b6bbaa03..b372ed8aa93d 100644 --- a/sdk-platform-java/java-shared-dependencies/third-party-dependencies/pom.xml +++ b/sdk-platform-java/java-shared-dependencies/third-party-dependencies/pom.xml @@ -36,14 +36,14 @@ 3.49.0 0.27.0 - 0.36.0 - 2.23.0-alpha - 1.37.0 + 0.33.0 + 2.1.0-alpha + 1.29.0-alpha 0.8 17.0.0 0.6.0 1.16.0 - 1.52.0-alpha + 1.45.0-alpha 20250517 @@ -161,7 +161,7 @@ io.opentelemetry opentelemetry-semconv - 1.30.1-alpha + 1.26.0-alpha com.google.cloud.opentelemetry