Skip to content

Commit dfd961c

Browse files
cindy-pengcindy-peng
authored
Merge branch 'main' into renovate/opentelemetry.version
2 parents 55198a0 + d5e4e84 commit dfd961c

File tree

24 files changed

+127
-51
lines changed

24 files changed

+127
-51
lines changed

‎.github/dependabot.yml

+12-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,15 @@ updates:
1717
# If a security vulnerability comes in, we will be notified about
1818
# it via template in the synthtool repository.
1919
ignore:
20-
- dependency-name: "*"
20+
- dependency-name: "*"
21+
22+
# rules for the `grpc-experimental` branch
23+
- package-ecosystem: maven
24+
directory: "/"
25+
schedule:
26+
interval: daily
27+
commit-message:
28+
# Prefix all commit messages with "deps: "
29+
prefix: "deps"
30+
open-pull-requests-limit: 10
31+
target-branch: "grpc-experimental"

‎.github/release-please.yml

+4
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

+34
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,22 @@ branchProtectionRules:
109109
- cla/google
110110
- 'Kokoro - Test: Java GraalVM Native Image'
111111
- 'Kokoro - Test: Java 17 GraalVM Native Image'
112+
- pattern: grpc-experimental
113+
isAdminEnforced: true
114+
requiredApprovingReviewCount: 1
115+
requiresCodeOwnerReviews: true
116+
requiresStrictStatusChecks: false
117+
requiredStatusCheckContexts:
118+
- dependencies (17)
119+
- lint
120+
- clirr
121+
- units (8)
122+
- units (11)
123+
- 'Kokoro - Test: Integration'
124+
- cla/google
125+
- 'Kokoro - Test: Java GraalVM Native Image'
126+
- 'Kokoro - Test: Java 17 GraalVM Native Image'
127+
- javadoc
112128
- pattern: 2.15.x
113129
isAdminEnforced: true
114130
requiredApprovingReviewCount: 1
@@ -172,6 +188,24 @@ branchProtectionRules:
172188
- 'Kokoro - Test: Java GraalVM Native Image'
173189
- 'Kokoro - Test: Java 17 GraalVM Native Image'
174190
- javadoc
191+
- pattern: 2.26.x
192+
isAdminEnforced: true
193+
requiredApprovingReviewCount: 1
194+
requiresCodeOwnerReviews: true
195+
requiresStrictStatusChecks: false
196+
requiredStatusCheckContexts:
197+
- dependencies (17)
198+
- lint
199+
- clirr
200+
- units (8)
201+
- units (11)
202+
- 'Kokoro - Test: Integration'
203+
- cla/google
204+
- 'Kokoro - Test: Java GraalVM Native Image'
205+
- 'Kokoro - Test: Java 17 GraalVM Native Image'
206+
- javadoc
207+
- library_generation
208+
- unmanaged_dependency_check
175209
permissionRules:
176210
- team: yoshi-admins
177211
permission: admin

‎.github/workflows/hermetic_library_generation.yaml

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

‎.github/workflows/unmanaged_dependency_check.yaml

+1-1
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.42.0
17+
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.44.0
1818
with:
1919
bom-path: google-cloud-datastore-bom/pom.xml

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

+1-1
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.42.0"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.44.0"
77
}
88

99
env_vars: {

‎.kokoro/presubmit/graalvm-native.cfg

+1-1
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.42.0"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.44.0"
77
}
88

99
env_vars: {

‎CHANGELOG.md

+27
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,32 @@
11
# Changelog
22

3+
## [2.26.4](https://github.com/googleapis/java-datastore/compare/v2.26.3...v2.26.4) (2025-02-26)
4+
5+
6+
### Dependencies
7+
8+
* 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))
9+
10+
## [2.26.3](https://github.com/googleapis/java-datastore/compare/v2.26.2...v2.26.3) (2025-02-21)
11+
12+
13+
### Dependencies
14+
15+
* Update dependency com.google.cloud:gapic-libraries-bom to v1.52.0 ([#1747](https://github.com/googleapis/java-datastore/issues/1747)) ([592072b](https://github.com/googleapis/java-datastore/commit/592072b194706e63a7fd4a6f6230377e8f4b729d))
16+
17+
## [2.26.2](https://github.com/googleapis/java-datastore/compare/v2.26.1...v2.26.2) (2025-02-12)
18+
19+
20+
### Bug Fixes
21+
22+
* **deps:** Update the Java code generator (gapic-generator-java) to 2.53.0 ([be0d0cd](https://github.com/googleapis/java-datastore/commit/be0d0cd960b9254d26404d9331b78dee1104cf0a))
23+
24+
25+
### Dependencies
26+
27+
* Update dependency com.google.cloud:sdk-platform-java-config to v3.43.0 ([#1737](https://github.com/googleapis/java-datastore/issues/1737)) ([7272a41](https://github.com/googleapis/java-datastore/commit/7272a4197a0d7fb97ee039ccb88ac13a1ec037d1))
28+
* Update googleapis/sdk-platform-java action to v2.53.0 ([#1738](https://github.com/googleapis/java-datastore/issues/1738)) ([b8a7a5d](https://github.com/googleapis/java-datastore/commit/b8a7a5d5d8700ccccb643162843e3043396a9444))
29+
330
## [2.26.1](https://github.com/googleapis/java-datastore/compare/v2.26.0...v2.26.1) (2025-02-05)
431

532

‎README.md

+6-6
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.54.0</version>
22+
<version>26.55.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.25.2</version>
44+
<version>2.26.3</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.54.0')
52+
implementation platform('com.google.cloud:libraries-bom:26.55.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.1'
59+
implementation 'com.google.cloud:google-cloud-datastore:2.26.4'
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.1"
65+
libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.26.4"
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.1
520+
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.26.4
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

+2-2
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.2-SNAPSHOT</version><!-- {x-version-update:datastore-v1-proto-client:current} -->
22+
<version>2.26.5-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.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
27+
<version>2.26.5-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
2828
</parent>
2929

3030
<packaging>jar</packaging>

‎generation_config.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
gapic_generator_version: 2.52.0
2-
googleapis_commitish: 04132de0b952ee921d91a2583915dbd82d10cd3c
3-
libraries_bom_version: 26.54.0
1+
gapic_generator_version: 2.54.0
2+
googleapis_commitish: 68b6376ca75f03094a65ec5bbbc868bd9f058ee3
3+
libraries_bom_version: 26.55.0
44
libraries:
55
- api_shortname: datastore
66
name_pretty: Cloud Datastore

‎google-cloud-datastore-bom/pom.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-datastore-bom</artifactId>
6-
<version>2.26.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore-bom:current} -->
6+
<version>2.26.5-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore-bom:current} -->
77
<packaging>pom</packaging>
88
<parent>
99
<groupId>com.google.cloud</groupId>
1010
<artifactId>sdk-platform-java-config</artifactId>
11-
<version>3.42.0</version>
11+
<version>3.44.0</version>
1212
</parent>
1313

1414
<name>Google Cloud datastore BOM</name>
@@ -52,22 +52,22 @@
5252
<dependency>
5353
<groupId>com.google.cloud</groupId>
5454
<artifactId>google-cloud-datastore</artifactId>
55-
<version>2.26.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
55+
<version>2.26.5-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
5656
</dependency>
5757
<dependency>
5858
<groupId>com.google.api.grpc</groupId>
5959
<artifactId>grpc-google-cloud-datastore-admin-v1</artifactId>
60-
<version>2.26.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-datastore-admin-v1:current} -->
60+
<version>2.26.5-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-datastore-admin-v1:current} -->
6161
</dependency>
6262
<dependency>
6363
<groupId>com.google.api.grpc</groupId>
6464
<artifactId>proto-google-cloud-datastore-v1</artifactId>
65-
<version>0.117.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datastore-v1:current} -->
65+
<version>0.117.5-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datastore-v1:current} -->
6666
</dependency>
6767
<dependency>
6868
<groupId>com.google.api.grpc</groupId>
6969
<artifactId>proto-google-cloud-datastore-admin-v1</artifactId>
70-
<version>2.26.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datastore-admin-v1:current} -->
70+
<version>2.26.5-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datastore-admin-v1:current} -->
7171
</dependency>
7272
</dependencies>
7373
</dependencyManagement>

‎google-cloud-datastore/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<artifactId>google-cloud-datastore</artifactId>
5-
<version>2.26.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
5+
<version>2.26.5-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
66
<packaging>jar</packaging>
77
<name>Google Cloud Datastore</name>
88
<url>https://github.com/googleapis/java-datastore</url>
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>com.google.cloud</groupId>
1414
<artifactId>google-cloud-datastore-parent</artifactId>
15-
<version>2.26.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
15+
<version>2.26.5-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
1616
</parent>
1717
<properties>
1818
<site.installationModule>google-cloud-datastore</site.installationModule>
@@ -24,7 +24,7 @@
2424
<!-- Artifacts from google-cloud-java monorepo -->
2525
<groupId>com.google.cloud</groupId>
2626
<artifactId>gapic-libraries-bom</artifactId>
27-
<version>1.51.0</version>
27+
<version>1.52.0</version>
2828
<type>pom</type>
2929
<scope>import</scope>
3030
</dependency>

‎grpc-google-cloud-datastore-admin-v1/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.google.api.grpc</groupId>
66
<artifactId>grpc-google-cloud-datastore-admin-v1</artifactId>
7-
<version>2.26.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-datastore-admin-v1:current} -->
7+
<version>2.26.5-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-datastore-admin-v1:current} -->
88
<name>grpc-google-cloud-datastore-admin-v1</name>
99
<description>GRPC library for google-cloud-datastore</description>
1010
<parent>
1111
<groupId>com.google.cloud</groupId>
1212
<artifactId>google-cloud-datastore-parent</artifactId>
13-
<version>2.26.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
13+
<version>2.26.5-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
1414
</parent>
1515
<dependencies>
1616
<dependency>

‎pom.xml

+8-8
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-datastore-parent</artifactId>
66
<packaging>pom</packaging>
7-
<version>2.26.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
7+
<version>2.26.5-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
88
<name>Google Cloud Datastore Parent</name>
99
<url>https://github.com/googleapis/java-datastore</url>
1010
<description>
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>com.google.cloud</groupId>
1616
<artifactId>sdk-platform-java-config</artifactId>
17-
<version>3.42.0</version>
17+
<version>3.44.0</version>
1818
</parent>
1919

2020
<developers>
@@ -159,27 +159,27 @@
159159
<dependency>
160160
<groupId>com.google.api.grpc</groupId>
161161
<artifactId>proto-google-cloud-datastore-admin-v1</artifactId>
162-
<version>2.26.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datastore-admin-v1:current} -->
162+
<version>2.26.5-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datastore-admin-v1:current} -->
163163
</dependency>
164164
<dependency>
165165
<groupId>com.google.api.grpc</groupId>
166166
<artifactId>grpc-google-cloud-datastore-admin-v1</artifactId>
167-
<version>2.26.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-datastore-admin-v1:current} -->
167+
<version>2.26.5-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-datastore-admin-v1:current} -->
168168
</dependency>
169169
<dependency>
170170
<groupId>com.google.cloud</groupId>
171171
<artifactId>google-cloud-datastore</artifactId>
172-
<version>2.26.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
172+
<version>2.26.5-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
173173
</dependency>
174174
<dependency>
175175
<groupId>com.google.api.grpc</groupId>
176176
<artifactId>proto-google-cloud-datastore-v1</artifactId>
177-
<version>0.117.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datastore-v1:current} -->
177+
<version>0.117.5-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datastore-v1:current} -->
178178
</dependency>
179179
<dependency>
180180
<groupId>com.google.cloud.datastore</groupId>
181181
<artifactId>datastore-v1-proto-client</artifactId>
182-
<version>2.26.2-SNAPSHOT</version><!-- {x-version-update:datastore-v1-proto-client:current} -->
182+
<version>2.26.5-SNAPSHOT</version><!-- {x-version-update:datastore-v1-proto-client:current} -->
183183
<exclusions>
184184
<exclusion>
185185
<groupId>com.google.api.grpc</groupId>
@@ -232,7 +232,7 @@
232232
<plugin>
233233
<groupId>org.apache.maven.plugins</groupId>
234234
<artifactId>maven-compiler-plugin</artifactId>
235-
<version>3.13.0</version>
235+
<version>3.14.0</version>
236236
<configuration>
237237
<encoding>UTF-8</encoding>
238238
<fork>true</fork>

‎proto-google-cloud-datastore-admin-v1/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.google.api.grpc</groupId>
66
<artifactId>proto-google-cloud-datastore-admin-v1</artifactId>
7-
<version>2.26.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datastore-admin-v1:current} -->
7+
<version>2.26.5-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datastore-admin-v1:current} -->
88
<name>proto-google-cloud-datastore-admin-v1</name>
99
<description>Proto library for google-cloud-datastore</description>
1010
<parent>
1111
<groupId>com.google.cloud</groupId>
1212
<artifactId>google-cloud-datastore-parent</artifactId>
13-
<version>2.26.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
13+
<version>2.26.5-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
1414
</parent>
1515
<dependencies>
1616
<dependency>

‎proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2024 Google LLC
1+
// Copyright 2025 Google LLC
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.

‎proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2024 Google LLC
1+
// Copyright 2025 Google LLC
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.

‎proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2024 Google LLC
1+
// Copyright 2025 Google LLC
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)