chore: Merge release v2.65.1 into protobuf-3.x

.bazeliskrc

@@ -1,3 +1,3 @@
 # See https://github.com/bazelbuild/bazelisk
 # Version required for Java 24 support (https://github.com/bazelbuild/bazel/commit/806a6e82320956b63f1351ebe2b0da8483f36f19).
-USE_BAZEL_VERSION=7.6.1
+USE_BAZEL_VERSION=7.7.0

.cloudbuild/graalvm/cloudbuild-test-a.yaml

@@ -14,7 +14,7 @@
 
 timeout: 7200s # 2 hours
 substitutions:
-  _SHARED_DEPENDENCIES_VERSION: '3.54.2-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
+  _SHARED_DEPENDENCIES_VERSION: '3.55.1' # {x-version-update:google-cloud-shared-dependencies:current}
   _JAVA_SHARED_CONFIG_VERSION: '1.17.0'
 options:
   machineType: 'E2_HIGHCPU_8'

.cloudbuild/graalvm/cloudbuild-test-b.yaml

@@ -14,7 +14,7 @@
 
 timeout: 7200s # 2 hours
 substitutions:
-  _SHARED_DEPENDENCIES_VERSION: '3.54.2-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
+  _SHARED_DEPENDENCIES_VERSION: '3.55.1' # {x-version-update:google-cloud-shared-dependencies:current}
   _JAVA_SHARED_CONFIG_VERSION: '1.17.0'
 options:
   machineType: 'E2_HIGHCPU_8'

.cloudbuild/graalvm/cloudbuild-test-c.yaml

@@ -14,7 +14,7 @@
 
 timeout: 7200s # 2 hours
 substitutions:
-  _SHARED_DEPENDENCIES_VERSION: '3.54.2-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
+  _SHARED_DEPENDENCIES_VERSION: '3.55.1' # {x-version-update:google-cloud-shared-dependencies:current}
   _JAVA_SHARED_CONFIG_VERSION: '1.17.0'
 options:
   machineType: 'E2_HIGHCPU_8'

.cloudbuild/graalvm/cloudbuild.yaml

@@ -14,7 +14,7 @@
 
 timeout: 7200s # 2 hours
 substitutions:
-  _SHARED_DEPENDENCIES_VERSION: '3.54.2-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
+  _SHARED_DEPENDENCIES_VERSION: '3.55.1' # {x-version-update:google-cloud-shared-dependencies:current}
   _JAVA_SHARED_CONFIG_VERSION: '1.17.0'
 steps:
   # GraalVM A build

.cloudbuild/library_generation/cloudbuild-library-generation-push.yaml

@@ -14,7 +14,7 @@
 
 timeout: 7200s # 2 hours
 substitutions:
-  _GAPIC_GENERATOR_JAVA_VERSION: '2.64.2-SNAPSHOT' # {x-version-update:gapic-generator-java:current}
+  _GAPIC_GENERATOR_JAVA_VERSION: '2.65.1' # {x-version-update:gapic-generator-java:current}
   _PRIVATE_IMAGE_NAME: "us-docker.pkg.dev/java-hermetic-build-prod/private-resources/java-library-generation"
   _PRIVATE_SHA_IMAGE_ID: "${_PRIVATE_IMAGE_NAME}:${COMMIT_SHA}"
   _PRIVATE_LATEST_IMAGE_ID: "${_PRIVATE_IMAGE_NAME}:latest"

.cloudbuild/library_generation/library_generation.Dockerfile

@@ -21,7 +21,7 @@ FROM docker.io/library/maven:3.9.9-eclipse-temurin-17-alpine@sha256:969014ee8852
 WORKDIR /sdk-platform-java
 COPY . .
 # {x-version-update-start:gapic-generator-java:current}
-ENV DOCKER_GAPIC_GENERATOR_VERSION="2.64.2-SNAPSHOT"
+ENV DOCKER_GAPIC_GENERATOR_VERSION="2.65.1"
 # {x-version-update-end}
 
 # Download the java formatter
@@ -38,7 +38,7 @@ FROM docker.io/library/python:3.13.2-slim@sha256:6b3223eb4d93718828223966ad31690
 
 ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5
 ARG PROTOC_VERSION=25.8
-ARG GRPC_VERSION=1.76.1
+ARG GRPC_VERSION=1.76.2
 ENV HOME=/home
 ENV OS_ARCHITECTURE="linux-x86_64"
 

.cloudbuild/library_generation/library_generation_airlock.Dockerfile

@@ -21,7 +21,7 @@ FROM us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/maven@sha256:d3f0
 WORKDIR /sdk-platform-java
 COPY . .
 # {x-version-update-start:gapic-generator-java:current}
-ENV DOCKER_GAPIC_GENERATOR_VERSION="2.64.2-SNAPSHOT"
+ENV DOCKER_GAPIC_GENERATOR_VERSION="2.65.1"
 # {x-version-update-end}
 
 # Download the java formatter
@@ -39,7 +39,7 @@ FROM us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/python@sha256:afc
 
 ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5
 ARG PROTOC_VERSION=25.8
-ARG GRPC_VERSION=1.76.1
+ARG GRPC_VERSION=1.76.2
 ENV HOME=/home
 ENV OS_ARCHITECTURE="linux-x86_64"
 

.cloudbuild/library_generation/scripts/integration_tests.py

@@ -43,7 +43,10 @@ def test_monorepo_generation(self):
             compare_result = dircmp(
                 f"{golden_dir}/{library_name}",
                 actual_library,
-                ignore=[".repo-metadata.json"],
+                # README.md is ignored because the golden files in the 
+                # google-cloud-java repository still contain the old build badges.
+                # TODO: Remove README.md from ignore list once golden files are updated.
+                ignore=[".repo-metadata.json", "README.md"],
             )
             diff_files = []
             golden_only = []

.github/workflows/ci.yaml

@@ -402,7 +402,7 @@ jobs:
         working-directory: java-showcase
         run: |
           mvn versions:set -B -ntp -DnewVersion=local
-          mvn clirr:check -B -ntp -Dclirr.skip=false -DcomparisonVersion=$SHOWCASE_CLIENT_VERSION
+          mvn clirr:check -B -ntp -DcomparisonVersion=$SHOWCASE_CLIENT_VERSION
 
   gapic-generator-java-bom:
     runs-on: ubuntu-22.04

.github/workflows/downstream_protobuf_compatibility_check_nightly.yaml

@@ -41,7 +41,7 @@ jobs:
           - java-storage-nio
         # Default Protobuf-Java versions to use are specified here. Without this, the nightly workflow won't know
         # which values to use and would resolve to ''.
-        protobuf-version: ${{ fromJSON(format('[{0}]', inputs.protobuf_runtime_versions || '"3.25.8","4.32.0"')) }}
+        protobuf-version: ${{ fromJSON(format('[{0}]', inputs.protobuf_runtime_versions || '"3.25.8","4.33.4"')) }}
     steps:
       - name: Checkout sdk-platform-java repo
         uses: actions/checkout@v4

.github/workflows/nightly.yaml

@@ -11,13 +11,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ macOS-13, ubuntu-22.04, windows-2022 ]
+        os: [ macos-15-intel, ubuntu-22.04, windows-2022 ]
         java: [ 11, 17 ]
     runs-on: ${{ matrix.os }}
     steps:
       - run: git config --global core.longpaths true
       - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v5
         with:
           java-version: ${{ matrix.java }}
           distribution: temurin
@@ -37,12 +37,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ macOS-13, ubuntu-22.04, windows-2022 ]
+        os: [ macos-15-intel, ubuntu-22.04, windows-2022 ]
     runs-on: ${{ matrix.os }}
     steps:
       - run: git config --global core.longpaths true
       - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v5
         with:
           java-version: 11
           distribution: temurin
@@ -51,7 +51,7 @@ jobs:
       - name: Install with Java 11
         run: mvn install --errors --batch-mode --no-transfer-progress -Dcheckstyle.skip -DskipTests -Dfmt.skip
 
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v5
         with:
           java-version: 8
           distribution: temurin

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "2.64.1"
+  ".": "2.65.1"
 }

CHANGELOG.md

@@ -1,5 +1,53 @@
 # Changelog
 
+## [2.65.1](https://github.com/googleapis/sdk-platform-java/compare/v2.65.0...v2.65.1) (2026-01-13)
+
+
+### Documentation
+
+* Update docs for GoogleCredentialsProvider#setScopesToApply ([#4057](https://github.com/googleapis/sdk-platform-java/issues/4057)) ([0a9962f](https://github.com/googleapis/sdk-platform-java/commit/0a9962f9945b6018796a808f89a6a3a309d1ca04))
+
+## [2.65.0](https://github.com/googleapis/sdk-platform-java/compare/v2.64.2...v2.65.0) (2026-01-12)
+
+
+### Features
+
+* add org.json:json to third-party-dependencies pom ([#4047](https://github.com/googleapis/sdk-platform-java/issues/4047)) ([ffa432e](https://github.com/googleapis/sdk-platform-java/commit/ffa432e4e4ae763845afd48b404836c88698bdc0)), closes [#4046](https://github.com/googleapis/sdk-platform-java/issues/4046)
+* remove dependency management of graal-sdk ([#4033](https://github.com/googleapis/sdk-platform-java/issues/4033)) ([ad05c34](https://github.com/googleapis/sdk-platform-java/commit/ad05c34e205c09ad035f469170b0c62b4423b748))
+
+
+### Bug Fixes
+
+* add api_version breadcrumb to client docs ([#4018](https://github.com/googleapis/sdk-platform-java/issues/4018)) ([a2b2179](https://github.com/googleapis/sdk-platform-java/commit/a2b2179874e6a5435001fe201f4eecc2a8e4c531))
+* Create a single S2AChannelCredentials per application ([#3989](https://github.com/googleapis/sdk-platform-java/issues/3989)) ([3758b43](https://github.com/googleapis/sdk-platform-java/commit/3758b436d7e80b79ad7d5ea330d8f2bf2f430330))
+* provide API to share the same background executor for channel po… ([#4030](https://github.com/googleapis/sdk-platform-java/issues/4030)) ([178182c](https://github.com/googleapis/sdk-platform-java/commit/178182c76c1b35e702215a88adc3ab511dd35a9e))
+
+
+### Dependencies
+
+* update dependencies.txt for grpc-gcp to 1.9.0  ([#4025](https://github.com/googleapis/sdk-platform-java/issues/4025)) ([b68791d](https://github.com/googleapis/sdk-platform-java/commit/b68791d074c02e02a5ccf2f937a5922749a14f56))
+* update google api dependencies ([#3917](https://github.com/googleapis/sdk-platform-java/issues/3917)) ([480cf13](https://github.com/googleapis/sdk-platform-java/commit/480cf13148687c53c4af3da9d48490aeb5bf4b88))
+* update google.http-client.version to 2.0.3 ([#4054](https://github.com/googleapis/sdk-platform-java/issues/4054)) ([b9a8c89](https://github.com/googleapis/sdk-platform-java/commit/b9a8c8924e7b03bca8a97e476abfd012b86f6d45))
+
+
+### Documentation
+
+* Fix retry guide link in javadocs ([#4029](https://github.com/googleapis/sdk-platform-java/issues/4029)) ([b43f77c](https://github.com/googleapis/sdk-platform-java/commit/b43f77c66d93d2423744d0f6d6a0a2a53a06e6d9))
+
+## [2.64.2](https://github.com/googleapis/sdk-platform-java/compare/v2.64.1...v2.64.2) (2025-12-10)
+
+
+### Bug Fixes
+
+* add per-service api_version to gapic_metadata ([#3984](https://github.com/googleapis/sdk-platform-java/issues/3984)) ([d589306](https://github.com/googleapis/sdk-platform-java/commit/d589306c4ecc12a2a744cb9dfb914ccea8fb34fd))
+
+
+### Dependencies
+
+* Upgrade auth to 1.41.0. ([#4008](https://github.com/googleapis/sdk-platform-java/issues/4008)) ([833b3e5](https://github.com/googleapis/sdk-platform-java/commit/833b3e54c0f13ac8183a639c4464dcf58fd44096))
+* upgrade grpc to 1.76.1 ([#3993](https://github.com/googleapis/sdk-platform-java/issues/3993)) ([958611e](https://github.com/googleapis/sdk-platform-java/commit/958611e23460dba596160f3224d8588afdba6bc2))
+* Upgrade grpc to 1.76.2 ([#4006](https://github.com/googleapis/sdk-platform-java/issues/4006)) ([a8060a2](https://github.com/googleapis/sdk-platform-java/commit/a8060a263ba34556b8d4d347a57625849a6859bc))
+
 ## [2.64.1](https://github.com/googleapis/sdk-platform-java/compare/v2.64.0...v2.64.1) (2025-11-07)
 
 

WORKSPACE

@@ -24,6 +24,15 @@ com_google_api_gax_java_repositories()
 
 _googleapis_commit = "7438480b2a1bc6371d748e974f7a3647f90c4e8d"
 
+# This is required for local testing on macOS. There is known incompatibility between old zlib and the latest macOS (Sequoia 15.7.3 as of writing)
+http_archive(
+    name = "zlib",
+    build_file = "@com_google_protobuf//:third_party/zlib.BUILD",
+    sha256 = "9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23",
+    strip_prefix = "zlib-1.3.1",
+    urls = ["https://github.com/madler/zlib/releases/download/v1.3.1/zlib-1.3.1.tar.gz"],
+)
+
 http_archive(
     name = "com_google_googleapis",
     strip_prefix = "googleapis-%s" % _googleapis_commit,
@@ -58,7 +67,7 @@ load("@rules_jvm_external//:defs.bzl", "maven_install")
 load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_ARTIFACTS")
 load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS")
 
-_gapic_generator_java_version = "2.64.2-SNAPSHOT"  # {x-version-update:gapic-generator-java:current}
+_gapic_generator_java_version = "2.65.1"  # {x-version-update:gapic-generator-java:current}
 
 maven_install(
     artifacts = [

api-common-java/pom.xml

@@ -5,14 +5,14 @@
     <groupId>com.google.api</groupId>
     <artifactId>api-common</artifactId>
     <packaging>jar</packaging>
-    <version>2.55.2-SNAPSHOT</version><!-- {x-version-update:api-common:current} -->
+    <version>2.56.1</version><!-- {x-version-update:api-common:current} -->
     <name>API Common</name>
     <description>Common utilities for Google APIs in Java</description>
 
     <parent>
         <groupId>com.google.api</groupId>
         <artifactId>gapic-generator-java-pom-parent</artifactId>
-        <version>2.64.2-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
+        <version>2.65.1</version><!-- {x-version-update:gapic-generator-java:current} -->
         <relativePath>../gapic-generator-java-pom-parent</relativePath>
     </parent>
 

coverage-report/pom.xml

@@ -31,22 +31,22 @@
             <dependency>
                 <groupId>com.google.api</groupId>
                 <artifactId>gax</artifactId>
-                <version>2.72.2-SNAPSHOT</version> <!-- {x-version-update:gax:current} -->
+                <version>2.73.1</version> <!-- {x-version-update:gax:current} -->
             </dependency>
             <dependency>
                 <groupId>com.google.api</groupId>
                 <artifactId>gax-grpc</artifactId>
-                <version>2.72.2-SNAPSHOT</version> <!-- {x-version-update:gax-grpc:current} -->
+                <version>2.73.1</version> <!-- {x-version-update:gax-grpc:current} -->
             </dependency>
             <dependency>
                 <groupId>com.google.api</groupId>
                 <artifactId>gax-httpjson</artifactId>
-                <version>2.72.2-SNAPSHOT</version> <!-- {x-version-update:gax:current} -->
+                <version>2.73.1</version> <!-- {x-version-update:gax:current} -->
             </dependency>
             <dependency>
                 <groupId>com.google.api</groupId>
                 <artifactId>api-common</artifactId>
-                <version>2.55.2-SNAPSHOT</version> <!-- {x-version-update:api-common:current} -->
+                <version>2.56.1</version> <!-- {x-version-update:api-common:current} -->
             </dependency>
         </dependencies>
 

dependencies.txt

@@ -9,21 +9,21 @@
 # Pom-Parent Dependencies
 # These dependencies are declared: https://github.com/googleapis/sdk-platform-java/blob/main/gapic-generator-java-pom-parent/pom.xml
 javax.annotation:javax.annotation-api,javax.annotation-api=1.3.2
-io.grpc:grpc-bom,grpc=1.74.0
-com.google.auth:google-auth-library-bom,google.auth=1.40.0
-com.google.http-client:google-http-client,google.http-client=1.47.1
+io.grpc:grpc-bom,grpc=1.76.2
+com.google.auth:google-auth-library-bom,google.auth=1.41.0
+com.google.http-client:google-http-client,google.http-client=2.0.3
 com.google.code.gson:gson,gson=2.13.2
-com.google.guava:guava,guava=33.4.8-jre
-com.google.protobuf:protobuf-java,protobuf=4.31.1
-io.opentelemetry:opentelemetry-bom,opentelemetry=1.55.0
-com.google.errorprone:error_prone_annotations,errorprone=2.43.0
+com.google.guava:guava,guava=33.5.0-jre
+com.google.protobuf:protobuf-java,protobuf=4.33.4
+io.opentelemetry:opentelemetry-bom,opentelemetry=1.58.0
+com.google.errorprone:error_prone_annotations,errorprone=2.46.0
 com.google.j2objc:j2objc-annotations,j2objc-annotations=3.1
 org.threeten:threetenbp,threetenbp=1.7.2
 org.slf4j:slf4j-api,slf4j=2.0.17
 
 # 1P Shared-Deps
 # These dependencies are declared: https://github.com/googleapis/sdk-platform-java/blob/main/java-shared-dependencies/first-party-dependencies/pom.xml
-com.google.cloud:grpc-gcp,grpc-gcp=1.7.0
+com.google.cloud:grpc-gcp,grpc-gcp=1.9.1
 com.google.oauth-client:google-oauth-client,google.oauth-client=1.39.0
 com.google.api-client:google-api-client,google.api-client=2.8.1
 
@@ -33,18 +33,19 @@ org.threeten:threeten-extra,threeten-extra=1.8.0
 io.opencensus:opencensus-api,opencensus=0.31.1
 com.google.code.findbugs:jsr305,findbugs=3.0.2
 com.fasterxml.jackson:jackson-bom,jackson=2.20.1
-commons-codec:commons-codec,codec=1.19.0
+commons-codec:commons-codec,codec=1.20.0
 org.apache.httpcomponents:httpclient,httpcomponents.httpclient=4.5.14
 org.apache.httpcomponents:httpcore,httpcomponents.httpcore=4.4.16
-org.apache.httpcomponents.client5:httpclient5,apache-httpclient-5=5.5.1
-org.apache.httpcomponents.core5:httpcore5,apache-httpcore-5=5.3.6
+org.apache.httpcomponents.client5:httpclient5,apache-httpclient-5=5.6
+org.apache.httpcomponents.core5:httpcore5,apache-httpcore-5=5.4
+org.json:json,json=20251224
 io.perfmark:perfmark-api,perfmark-api=0.27.0
 # Note: This is the google opentelemetry exporter and not the general opentelemetry project
 com.google.cloud.opentelemetry:exporter-metrics,google.cloud.opentelemetry=0.36.0
 com.google.flogger:flogger,flogger=0.9
 org.apache.arrow:arrow-memory-core,arrow=18.3.0
 dev.cel:cel,dev.cel=0.11.1
-com.google.crypto.tink:tink,com.google.crypto.tink=1.19.0
+com.google.crypto.tink:tink,com.google.crypto.tink=1.20.0
 # The follow opentelemetry dependencies have a different version from the opentelemetry-bom
 io.opentelemetry.semconv:opentelemetry-semconv,opentelemetry-semconv=1.37.0
-io.opentelemetry.contrib:opentelemetry-gcp-resources,io.opentelemetry.contrib.opentelemetry-gcp-resources=1.48.0-alpha
+io.opentelemetry.contrib:opentelemetry-gcp-resources,io.opentelemetry.contrib.opentelemetry-gcp-resources=1.52.0-alpha