Skip to content

Commit c78e207

Browse files
cindy-pengcindy-peng
authored
Merge branch 'main' into grpc-experimental-main-1
2 parents 9552e63 + 5c736fa commit c78e207

File tree

29 files changed

+113
-55
lines changed

29 files changed

+113
-55
lines changed

‎.github/release-please.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,7 @@ branches:
3434
handleGHRelease: true
3535
releaseType: java-backport
3636
branch: 2.19.x
37+
- bumpMinorPreMajor: true
38+
handleGHRelease: true
39+
releaseType: java-backport
40+
branch: 2.26.x

‎.github/sync-repo-settings.yaml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,24 @@ branchProtectionRules:
172172
- 'Kokoro - Test: Java GraalVM Native Image'
173173
- 'Kokoro - Test: Java 17 GraalVM Native Image'
174174
- javadoc
175+
- pattern: 2.26.x
176+
isAdminEnforced: true
177+
requiredApprovingReviewCount: 1
178+
requiresCodeOwnerReviews: true
179+
requiresStrictStatusChecks: false
180+
requiredStatusCheckContexts:
181+
- dependencies (17)
182+
- lint
183+
- clirr
184+
- units (8)
185+
- units (11)
186+
- 'Kokoro - Test: Integration'
187+
- cla/google
188+
- 'Kokoro - Test: Java GraalVM Native Image'
189+
- 'Kokoro - Test: Java 17 GraalVM Native Image'
190+
- javadoc
191+
- library_generation
192+
- unmanaged_dependency_check
175193
permissionRules:
176194
- team: yoshi-admins
177195
permission: admin

‎.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.53.0
40+
- uses: googleapis/sdk-platform-java/.github/scripts@v2.55.1
4141
if: env.SHOULD_RUN == 'true'
4242
with:
4343
base_ref: ${{ github.base_ref }}

‎.github/workflows/unmanaged_dependency_check.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ jobs:
1414
shell: bash
1515
run: .kokoro/build.sh
1616
- name: Unmanaged dependency check
17-
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.43.0
17+
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.45.1
1818
with:
1919
bom-path: google-cloud-datastore-bom/pom.xml

‎.kokoro/presubmit/graalvm-native-17.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.43.0"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.45.1"
77
}
88

99
env_vars: {

‎.kokoro/presubmit/graalvm-native.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.43.0"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.45.1"
77
}
88

99
env_vars: {

‎CHANGELOG.md‎

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

3+
## [2.27.1](https://github.com/googleapis/java-datastore/compare/v2.27.0...v2.27.1) (2025-03-18)
4+
5+
6+
### Bug Fixes
7+
8+
* **deps:** Update the Java code generator (gapic-generator-java) to 2.55.1 ([ba1ad98](https://github.com/googleapis/java-datastore/commit/ba1ad98cce4c0feae13a370ea0581d15674dd43c))
9+
10+
11+
### Dependencies
12+
13+
* Update dependency com.google.cloud:sdk-platform-java-config to v3.45.1 ([#1791](https://github.com/googleapis/java-datastore/issues/1791)) ([ab5ac8e](https://github.com/googleapis/java-datastore/commit/ab5ac8e6407541520fabb4504fcce0d675347f63))
14+
15+
## [2.27.0](https://github.com/googleapis/java-datastore/compare/v2.26.4...v2.27.0) (2025-03-05)
16+
17+
18+
### Features
19+
20+
* Next release from main branch is 2.27.0 ([#1781](https://github.com/googleapis/java-datastore/issues/1781)) ([d29f47c](https://github.com/googleapis/java-datastore/commit/d29f47cbef9998acdc8b7b0f42d93574dab3cc7f))
21+
22+
23+
### Bug Fixes
24+
25+
* **deps:** Update the Java code generator (gapic-generator-java) to 2.54.0 ([b9b302b](https://github.com/googleapis/java-datastore/commit/b9b302bb6c8bb1c8d8b175b776b2f65317511987))
26+
27+
28+
### Dependencies
29+
30+
* Update dependency com.google.cloud:gapic-libraries-bom to v1.53.0 ([#1779](https://github.com/googleapis/java-datastore/issues/1779)) ([8369118](https://github.com/googleapis/java-datastore/commit/8369118994e9a18b888a7779376fea7e22b219ed))
31+
32+
## [2.26.4](https://github.com/googleapis/java-datastore/compare/v2.26.3...v2.26.4) (2025-02-26)
33+
34+
35+
### Dependencies
36+
37+
* Update dependency com.google.cloud:sdk-platform-java-config to v3.44.0 ([#1769](https://github.com/googleapis/java-datastore/issues/1769)) ([7a86509](https://github.com/googleapis/java-datastore/commit/7a8650939e652fc3b384053454d6ef5084bb1508))
38+
339
## [2.26.3](https://github.com/googleapis/java-datastore/compare/v2.26.2...v2.26.3) (2025-02-21)
440

541

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
1919
<dependency>
2020
<groupId>com.google.cloud</groupId>
2121
<artifactId>libraries-bom</artifactId>
22-
<version>26.55.0</version>
22+
<version>26.56.0</version>
2323
<type>pom</type>
2424
<scope>import</scope>
2525
</dependency>
@@ -41,28 +41,28 @@ If you are using Maven without the BOM, add this to your dependencies:
4141
<dependency>
4242
<groupId>com.google.cloud</groupId>
4343
<artifactId>google-cloud-datastore</artifactId>
44-
<version>2.26.3</version>
44+
<version>2.26.4</version>
4545
</dependency>
4646

4747
```
4848

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.55.0')
52+
implementation platform('com.google.cloud:libraries-bom:26.57.0')
5353
5454
implementation 'com.google.cloud:google-cloud-datastore'
5555
```
5656
If you are using Gradle without BOM, add this to your dependencies:
5757

5858
```Groovy
59-
implementation 'com.google.cloud:google-cloud-datastore:2.26.3'
59+
implementation 'com.google.cloud:google-cloud-datastore:2.27.1'
6060
```
6161

6262
If you are using SBT, add this to your dependencies:
6363

6464
```Scala
65-
libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.26.3"
65+
libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.27.1"
6666
```
6767

6868
## Authentication
@@ -517,7 +517,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
517517
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
518518
[stability-image]: https://img.shields.io/badge/stability-stable-green
519519
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
520-
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.26.3
520+
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.27.1
521521
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
522522
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
523523
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

‎datastore-v1-proto-client/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
<modelVersion>4.0.0</modelVersion>
2020
<groupId>com.google.cloud.datastore</groupId>
2121
<artifactId>datastore-v1-proto-client</artifactId>
22-
<version>2.26.4-SNAPSHOT</version><!-- {x-version-update:datastore-v1-proto-client:current} -->
22+
<version>2.27.2-SNAPSHOT</version><!-- {x-version-update:datastore-v1-proto-client:current} -->
2323

2424
<parent>
2525
<groupId>com.google.cloud</groupId>
2626
<artifactId>google-cloud-datastore-parent</artifactId>
27-
<version>2.26.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
27+
<version>2.27.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
2828
</parent>
2929

3030
<packaging>jar</packaging>

‎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.53.0
2-
googleapis_commitish: 6bc8e91bf92cc985da5ed0c227b48f12315cb695
3-
libraries_bom_version: 26.55.0
1+
gapic_generator_version: 2.55.1
2+
googleapis_commitish: 00716e8ec21866b5744ffbe967f3467cf3246e88
3+
libraries_bom_version: 26.57.0
44
libraries:
55
- api_shortname: datastore
66
name_pretty: Cloud Datastore

0 commit comments

Comments
 (0)