Skip to content

Commit e0a580f

Browse files
authored
Merge branch 'main' into spanner-key-aware-routing-mock-server-test
2 parents a220818 + 5208fc9 commit e0a580f

File tree

3,067 files changed

+195129
-15645
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,067 files changed

+195129
-15645
lines changed

.github/workflows/ci.yaml

Lines changed: 56 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,14 @@ jobs:
4040
src:
4141
- '**/*.java'
4242
- '**/pom.xml'
43+
- '!java-bigquery/**'
44+
- '!java-bigquerystorage/**'
45+
- '!java-datastore/**'
46+
- '!java-logging-logback/**'
47+
- '!java-logging/**'
48+
- '!java-spanner/**'
49+
- '!java-storage/**'
50+
- '!google-auth-library-java/**'
4351
ci:
4452
- '.github/workflows/ci.yaml'
4553
- '.kokoro/**'
@@ -116,15 +124,55 @@ jobs:
116124
- uses: dorny/paths-filter@v4
117125
id: filter
118126
with:
127+
# For each library, run CI in split repos where there are changes in:
128+
# 1. Changes inside the split repo's module
129+
# 2. Java code changes in upstream modules: Auth Library and Sdk-Platform-Java
130+
# 3. Upstream dependency version changes: Shared-Deps and Gapic-Generator-Pom-Parent
119131
filters: |
120-
java-bigquery: java-bigquery/**
121-
java-bigquerystorage: java-bigquerystorage/**
122-
java-datastore: java-datastore/**
123-
java-logging-logback: java-logging-logback/**
124-
java-logging: java-logging/**
125-
java-spanner: java-spanner/**
126-
java-storage: java-storage/**
127-
sdk-platform-java: sdk-platform-java/**
132+
google-auth-library-java:
133+
- 'google-auth-library-java/**'
134+
java-bigquery:
135+
- 'java-bigquery/**'
136+
- 'google-auth-library-java/**/*.java'
137+
- 'sdk-platform-java/**/*.java'
138+
- 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
139+
- 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
140+
java-bigquerystorage:
141+
- 'java-bigquerystorage/**'
142+
- 'google-auth-library-java/**/*.java'
143+
- 'sdk-platform-java/**/*.java'
144+
- 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
145+
- 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
146+
java-datastore:
147+
- 'java-datastore/**'
148+
- 'google-auth-library-java/**/*.java'
149+
- 'sdk-platform-java/**/*.java'
150+
- 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
151+
- 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
152+
java-logging-logback:
153+
- 'java-logging-logback/**'
154+
- 'google-auth-library-java/**/*.java'
155+
- 'sdk-platform-java/**/*.java'
156+
- 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
157+
- 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
158+
java-logging:
159+
- 'java-logging/**'
160+
- 'google-auth-library-java/**/*.java'
161+
- 'sdk-platform-java/**/*.java'
162+
- 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
163+
- 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
164+
java-spanner:
165+
- 'java-spanner/**'
166+
- 'google-auth-library-java/**/*.java'
167+
- 'sdk-platform-java/**/*.java'
168+
- 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
169+
- 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
170+
java-storage:
171+
- 'java-storage/**'
172+
- 'google-auth-library-java/**/*.java'
173+
- 'sdk-platform-java/**/*.java'
174+
- 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
175+
- 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
128176
split-units:
129177
runs-on: ubuntu-latest
130178
needs: changes

.github/workflows/generated_files_sync.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
pull_request:
1818
name: generation diff
1919
env:
20-
library_generation_image_tag: 2.70.0 # {x-version-update:gapic-generator-java:current}
20+
library_generation_image_tag: 2.71.0 # {x-version-update:gapic-generator-java:current}
2121
jobs:
2222
root-pom:
2323
# root pom.xml does not have diff from generated one

.github/workflows/hermetic_library_generation.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ jobs:
4444
head_ref: ${{ github.head_ref }}
4545
token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
4646
force_regenerate_all: ${{ github.event.pull_request.head.ref == 'generate-libraries-main' }}
47-
image_tag: 2.70.0 # {x-version-update:gapic-generator-java:current}
47+
image_tag: 2.71.0 # {x-version-update:gapic-generator-java:current}

.github/workflows/sdk-platform-java-ci.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
filters: |
1818
library:
1919
- 'sdk-platform-java/**'
20+
- 'google-auth-library-java/**'
2021
build:
2122
needs: filter
2223
if: ${{ needs.filter.outputs.library == 'true' }}
@@ -173,12 +174,6 @@ jobs:
173174
java-version: 8
174175
distribution: temurin
175176
cache: maven
176-
- name: Compile with Java 17 and run tests with Java 8
177-
shell: bash
178-
run: .kokoro/build.sh
179-
env:
180-
BUILD_SUBDIR: sdk-platform-java
181-
JOB_TYPE: install
182177
- run: echo "JAVA8_HOME=${JAVA_HOME}" >> $GITHUB_ENV
183178
- uses: actions/setup-java@v3
184179
with:

.github/workflows/sdk-platform-java-downstream_unmanaged_dependency_check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
repo:
3434
- java-bigtable
3535
- java-firestore
36-
- java-logging
36+
- java-pubsub
3737
steps:
3838
- name: Checkout sdk-platform-java
3939
uses: actions/checkout@v3

.release-please-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "1.84.0"
2+
".": "1.85.0"
33
}

CHANGELOG.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,37 @@
11
# Changelog
22

3+
## [1.85.0](https://github.com/googleapis/google-cloud-java/compare/v1.84.0...v1.85.0) (2026-04-14)
4+
5+
6+
### Features
7+
8+
* [appoptimize] new module for appoptimize ([#12768](https://github.com/googleapis/google-cloud-java/issues/12768)) ([050187d](https://github.com/googleapis/google-cloud-java/commit/050187d934fc78139ec2790c04dd4c1e256591d4))
9+
* [chronicle] Add DataTableService to Chronicle v1 Client Libraries ([fc62b1e](https://github.com/googleapis/google-cloud-java/commit/fc62b1e80fa239ba8eec34ce1853e6c32126d9f4))
10+
* [databasecenter] Add support for BigQuery datasets and ([fc62b1e](https://github.com/googleapis/google-cloud-java/commit/fc62b1e80fa239ba8eec34ce1853e6c32126d9f4))
11+
* [dataplex] Allow Data Documentation DataScans to support BigQuery ([fc62b1e](https://github.com/googleapis/google-cloud-java/commit/fc62b1e80fa239ba8eec34ce1853e6c32126d9f4))
12+
* [dataproc] Add `Engine` field to support LightningEngine in ([fc62b1e](https://github.com/googleapis/google-cloud-java/commit/fc62b1e80fa239ba8eec34ce1853e6c32126d9f4))
13+
* [discoveryengine] add AUTO condition to SearchAsYouTypeSpec in ([fc62b1e](https://github.com/googleapis/google-cloud-java/commit/fc62b1e80fa239ba8eec34ce1853e6c32126d9f4))
14+
* [infra-manager] adding DeploymentGroups, you can now manage ([fc62b1e](https://github.com/googleapis/google-cloud-java/commit/fc62b1e80fa239ba8eec34ce1853e6c32126d9f4))
15+
* [kms] add a variable to SingleTenantHsmInstanceCreate to control ([fc62b1e](https://github.com/googleapis/google-cloud-java/commit/fc62b1e80fa239ba8eec34ce1853e6c32126d9f4))
16+
* [kms] support external-μ in the Digest ([fc62b1e](https://github.com/googleapis/google-cloud-java/commit/fc62b1e80fa239ba8eec34ce1853e6c32126d9f4))
17+
* [shopping-merchant-products] a new field `base64_encoded_name` is ([fc62b1e](https://github.com/googleapis/google-cloud-java/commit/fc62b1e80fa239ba8eec34ce1853e6c32126d9f4))
18+
* [vectorsearch] Added CMEK support ([fc62b1e](https://github.com/googleapis/google-cloud-java/commit/fc62b1e80fa239ba8eec34ce1853e6c32126d9f4))
19+
20+
21+
### Bug Fixes
22+
23+
* **auth:** Address ClientSideCredentialAccessBoundary RefreshTask race condition ([#12681](https://github.com/googleapis/google-cloud-java/issues/12681)) ([30088d2](https://github.com/googleapis/google-cloud-java/commit/30088d2140184b64e841b9864a2b9518f797a686))
24+
* **bqjdbc:** lazily instantiate Statement in BigQueryDatabaseMetaData ([#12752](https://github.com/googleapis/google-cloud-java/issues/12752)) ([72e5508](https://github.com/googleapis/google-cloud-java/commit/72e5508669ea48cde28f02adfeedfb05cd73fc57))
25+
* **deps:** update the Java code generator (gapic-generator-java) to ([fc62b1e](https://github.com/googleapis/google-cloud-java/commit/fc62b1e80fa239ba8eec34ce1853e6c32126d9f4))
26+
* **gdch:** support EC private keys ([#1896](https://github.com/googleapis/google-cloud-java/issues/1896)) ([bf926fb](https://github.com/googleapis/google-cloud-java/commit/bf926fb23a0ee32b5563af7671af3776ca670126))
27+
* update appoptimize version to 0.0.1 to match released repo ([#12782](https://github.com/googleapis/google-cloud-java/issues/12782)) ([80dfac6](https://github.com/googleapis/google-cloud-java/commit/80dfac6773bfe7e41e1d3f659fa5c9953a4fd83b))
28+
29+
30+
### Documentation
31+
32+
* [network-management] Update comment for the `region` field in ([fc62b1e](https://github.com/googleapis/google-cloud-java/commit/fc62b1e80fa239ba8eec34ce1853e6c32126d9f4))
33+
* [shopping-merchant-inventories] A comment for field `name` in ([fc62b1e](https://github.com/googleapis/google-cloud-java/commit/fc62b1e80fa239ba8eec34ce1853e6c32126d9f4))
34+
335
## [1.84.0](https://github.com/googleapis/google-cloud-java/compare/v1.83.0...v1.84.0) (2026-04-10)
436

537

WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ load("@rules_jvm_external//:defs.bzl", "maven_install")
6767
load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_ARTIFACTS")
6868
load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS")
6969

70-
_gapic_generator_java_version = "2.70.0" # {x-version-update:gapic-generator-java:current}
70+
_gapic_generator_java_version = "2.71.0" # {x-version-update:gapic-generator-java:current}
7171

7272
maven_install(
7373
artifacts = [

0 commit comments

Comments
 (0)