Skip to content

Commit 425e7c2

Browse files
cindy-pengcindy-peng
authored
Merge branch 'main' into renovate/org.apache.maven.plugins-maven-deploy-plugin-3.x
2 parents de38c19 + eda6bf8 commit 425e7c2

File tree

22 files changed

+63
-41
lines changed

22 files changed

+63
-41
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
@@ -188,6 +188,24 @@ branchProtectionRules:
188188
- 'Kokoro - Test: Java GraalVM Native Image'
189189
- 'Kokoro - Test: Java 17 GraalVM Native Image'
190190
- 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
191209
permissionRules:
192210
- team: yoshi-admins
193211
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.54.0
4141
if: env.SHOULD_RUN == 'true'
4242
with:
4343
base_ref: ${{ github.base_ref }}

‎README.md‎

Lines changed: 1 addition & 1 deletion
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.55.0')
52+
implementation platform('com.google.cloud:libraries-bom:26.56.0')
5353
5454
implementation 'com.google.cloud:google-cloud-datastore'
5555
```

‎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</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.4</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‎

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: fbbbf5023815f9a662c85aa8af8f3b72467fcb6f
3-
libraries_bom_version: 26.55.0
1+
gapic_generator_version: 2.54.0
2+
googleapis_commitish: f4f8efb9e05e589abf94f8086fb6d0492f3551b8
3+
libraries_bom_version: 26.56.0
44
libraries:
55
- api_shortname: datastore
66
name_pretty: Cloud Datastore

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-datastore-bom</artifactId>
6-
<version>2.26.4</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>
@@ -52,22 +52,22 @@
5252
<dependency>
5353
<groupId>com.google.cloud</groupId>
5454
<artifactId>google-cloud-datastore</artifactId>
55-
<version>2.26.4</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.4</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.4</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.4</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‎

Lines changed: 2 additions & 2 deletions
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.4</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.4</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>

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

Lines changed: 2 additions & 2 deletions
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.4</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.4</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‎

Lines changed: 6 additions & 6 deletions
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.4</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>
@@ -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.4</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.4</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.4</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.4</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.4</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>

0 commit comments

Comments
 (0)