Skip to content
This repository was archived by the owner on Feb 24, 2026. It is now read-only.

Commit 975db7d

Browse files
lqiu96lqiu96
committed
Merge branch 'main' into PR #1954 to update
2 parents a12ca5b + 4d7dd5a commit 975db7d

177 files changed

Lines changed: 219 additions & 254 deletions

File tree

Some content is hidden

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

‎.github/release-please.yml‎

Lines changed: 23 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -2,52 +2,26 @@ bumpMinorPreMajor: true
22
handleGHRelease: true
33
releaseType: java-yoshi
44
branches:
5-
- bumpMinorPreMajor: true
6-
handleGHRelease: true
7-
releaseType: java-lts
8-
branch: 1.106.5-sp
9-
- bumpMinorPreMajor: true
10-
handleGHRelease: true
11-
releaseType: java-yoshi
12-
branch: java7
13-
- bumpMinorPreMajor: true
14-
handleGHRelease: true
15-
releaseType: java-backport
16-
branch: 2.1.x
17-
- bumpMinorPreMajor: true
18-
handleGHRelease: true
19-
releaseType: java-backport
20-
branch: 2.2.x
21-
- bumpMinorPreMajor: true
22-
handleGHRelease: true
23-
releaseType: java-backport
24-
branch: 2.12.x
25-
- bumpMinorPreMajor: true
26-
handleGHRelease: true
27-
releaseType: java-backport
28-
branch: 2.15.x
29-
- bumpMinorPreMajor: true
30-
handleGHRelease: true
31-
releaseType: java-backport
32-
branch: 2.17.x
33-
- bumpMinorPreMajor: true
34-
handleGHRelease: true
35-
releaseType: java-backport
36-
branch: 2.19.x
37-
- bumpMinorPreMajor: true
38-
handleGHRelease: true
39-
releaseType: java-backport
40-
branch: 2.26.x
41-
- bumpMinorPreMajor: true
42-
handleGHRelease: true
43-
releaseType: java-backport
44-
branch: 2.30.x
45-
- bumpMinorPreMajor: true
46-
handleGHRelease: true
47-
releaseType: java-backport
48-
branch: 2.29.x
49-
- bumpMinorPreMajor: true
50-
handleGHRelease: true
51-
releaseType: java-yoshi
52-
branch: protobuf-4.x-rc
53-
manifest: true
5+
- branch: 1.106.5-sp
6+
releaseType: java-lts
7+
- branch: java7
8+
- branch: 2.1.x
9+
releaseType: java-backport
10+
- branch: 2.2.x
11+
releaseType: java-backport
12+
- branch: 2.12.x
13+
releaseType: java-backport
14+
- branch: 2.15.x
15+
releaseType: java-backport
16+
- branch: 2.17.x
17+
releaseType: java-backport
18+
- branch: 2.19.x
19+
releaseType: java-backport
20+
- branch: 2.26.x
21+
releaseType: java-backport
22+
- branch: 2.30.x
23+
releaseType: java-backport
24+
- branch: 2.29.x
25+
releaseType: java-backport
26+
- branch: protobuf-4.x-rc
27+
manifest: true

‎.github/scripts/update_generation_config.sh‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,17 @@ function get_latest_released_version() {
1818
group_id_url_path="$(sed 's|\.|/|g' <<< "${group_id}")"
1919
url="https://repo1.maven.org/maven2/${group_id_url_path}/${artifact_id}/maven-metadata.xml"
2020
xml_content=$(curl -s --fail "${url}")
21-
latest=$(xmllint --xpath 'metadata/versioning/latest/text()' - <<< "${xml_content}")
21+
22+
# 1. Extract all version tags
23+
# 2. Strip the XML tags to leave just the version numbers
24+
# 3. Filter for strictly numbers.numbers.numbers (e.g., 2.54.0)
25+
# 4. Sort by version (V) and take the last one (tail -n 1)
26+
latest=$(echo "${xml_content}" \
27+
| grep -oE '<version>[0-9]+\.[0-9]+\.[0-9]+</version>' \
28+
| sed -E 's/<[^>]+>//g' \
29+
| sort -V \
30+
| tail -n 1)
31+
2232
if [[ -z "${latest}" ]]; then
2333
echo "The latest version of ${group_id}:${artifact_id} is empty."
2434
echo "The returned json from maven.org is invalid: ${json_content}"

‎.github/workflows/hermetic_library_generation.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
with:
3838
fetch-depth: 0
3939
token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
40-
- uses: googleapis/sdk-platform-java/.github/scripts@v2.64.2
40+
- uses: googleapis/sdk-platform-java/.github/scripts@v2.65.0
4141
if: env.SHOULD_RUN == 'true'
4242
with:
4343
base_ref: ${{ github.base_ref }}

‎.kokoro/presubmit/graalvm-native-a.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.54.2" # {x-version-update:google-cloud-shared-dependencies:current}
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.55.0" # {x-version-update:google-cloud-shared-dependencies:current}
77
}
88

99
env_vars: {

‎.kokoro/presubmit/graalvm-native-b.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.54.2" # {x-version-update:google-cloud-shared-dependencies:current}
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.55.0" # {x-version-update:google-cloud-shared-dependencies:current}
77
}
88

99
env_vars: {

‎.kokoro/presubmit/graalvm-native-c.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.54.2" # {x-version-update:google-cloud-shared-dependencies:current}
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.55.0" # {x-version-update:google-cloud-shared-dependencies:current}
77
}
88

99
env_vars: {

‎README.md‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ If you are using Maven without the BOM, add this to your dependencies:
4949
If you are using Gradle 5.x or later, add this to your dependencies:
5050

5151
```Groovy
52-
implementation platform('com.google.cloud:libraries-bom:26.72.0')
52+
implementation platform('com.google.cloud:libraries-bom:26.74.0-rc2')
5353
5454
implementation 'com.google.cloud:google-cloud-datastore'
5555
```
@@ -468,29 +468,10 @@ information.
468468

469469
Apache 2.0 - See [LICENSE][license] for more information.
470470

471-
## CI Status
472-
473-
Java Version | Status
474-
------------ | ------
475-
Java 8 | [![Kokoro CI][kokoro-badge-image-2]][kokoro-badge-link-2]
476-
Java 8 OSX | [![Kokoro CI][kokoro-badge-image-3]][kokoro-badge-link-3]
477-
Java 8 Windows | [![Kokoro CI][kokoro-badge-image-4]][kokoro-badge-link-4]
478-
Java 11 | [![Kokoro CI][kokoro-badge-image-5]][kokoro-badge-link-5]
479-
480471
Java is a registered trademark of Oracle and/or its affiliates.
481472

482473
[product-docs]: https://cloud.google.com/datastore
483474
[javadocs]: https://cloud.google.com/java/docs/reference/google-cloud-datastore/latest/history
484-
[kokoro-badge-image-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java7.svg
485-
[kokoro-badge-link-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java7.html
486-
[kokoro-badge-image-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java8.svg
487-
[kokoro-badge-link-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java8.html
488-
[kokoro-badge-image-3]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java8-osx.svg
489-
[kokoro-badge-link-3]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java8-osx.html
490-
[kokoro-badge-image-4]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java8-win.svg
491-
[kokoro-badge-link-4]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java8-win.html
492-
[kokoro-badge-image-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.svg
493-
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
494475
[stability-image]: https://img.shields.io/badge/stability-stable-green
495476
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
496477
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.33.1

‎generation_config.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
gapic_generator_version: 2.64.2
2-
googleapis_commitish: b32495a713a68dd0dff90cf0b24021debfca048a
3-
libraries_bom_version: 26.72.0
1+
gapic_generator_version: 2.65.0
2+
googleapis_commitish: e006e1c8b69c0594e6f872316a3543b3b37ad81b
3+
libraries_bom_version: 26.74.0-rc2
44
libraries:
55
- api_shortname: datastore
66
name_pretty: Cloud Datastore

‎google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2025 Google LLC
2+
* Copyright 2026 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2025 Google LLC
2+
* Copyright 2026 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -97,8 +97,8 @@
9797
* }</pre>
9898
*
9999
* Please refer to the [Client Side Retry
100-
* Guide](https://github.com/googleapis/google-cloud-java/blob/main/docs/client_retries.md) for
101-
* additional support in setting retries.
100+
* Guide](https://docs.cloud.google.com/java/docs/client-retries) for additional support in setting
101+
* retries.
102102
*
103103
* <p>To configure the RetrySettings of a Long Running Operation method, create an
104104
* OperationTimedPollAlgorithm object and update the RPC's polling algorithm. For example, to

0 commit comments

Comments
 (0)