Skip to content

Commit d860b1e

Browse files
authored
Merge branch 'main' into renovate/com.google.cloud-libraries-bom-26.x
2 parents f06ff94 + b10e0f0 commit d860b1e

File tree

8 files changed

+40
-17
lines changed

8 files changed

+40
-17
lines changed

.github/release-please.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,7 @@ branches:
3838
handleGHRelease: true
3939
releaseType: java-backport
4040
branch: 2.26.x
41+
- bumpMinorPreMajor: true
42+
handleGHRelease: true
43+
releaseType: java-backport
44+
branch: 2.30.x

.github/sync-repo-settings.yaml

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -116,16 +116,16 @@ branchProtectionRules:
116116
requiresCodeOwnerReviews: true
117117
requiresStrictStatusChecks: false
118118
requiredStatusCheckContexts:
119-
- dependencies (17)
120-
- lint
121-
- clirr
122-
- units (8)
123-
- units (11)
124-
- 'Kokoro - Test: Integration'
125-
- cla/google
126-
- 'Kokoro - Test: Java GraalVM Native Image'
127-
- 'Kokoro - Test: Java 17 GraalVM Native Image'
128-
- javadoc
119+
- dependencies (17)
120+
- lint
121+
- clirr
122+
- units (8)
123+
- units (11)
124+
- 'Kokoro - Test: Integration'
125+
- cla/google
126+
- 'Kokoro - Test: Java GraalVM Native Image'
127+
- 'Kokoro - Test: Java 17 GraalVM Native Image'
128+
- javadoc
129129
- pattern: 2.15.x
130130
isAdminEnforced: true
131131
requiredApprovingReviewCount: 1
@@ -191,6 +191,25 @@ branchProtectionRules:
191191
- javadoc
192192
- library_generation
193193
- unmanaged_dependency_check
194+
- pattern: 2.30.x
195+
isAdminEnforced: true
196+
requiredApprovingReviewCount: 1
197+
requiresCodeOwnerReviews: true
198+
requiresStrictStatusChecks: false
199+
requiredStatusCheckContexts:
200+
- dependencies (17)
201+
- lint
202+
- clirr
203+
- units (8)
204+
- units (11)
205+
- 'Kokoro - Test: Integration'
206+
- cla/google
207+
- 'Kokoro - Test: Java GraalVM Native Image A'
208+
- 'Kokoro - Test: Java GraalVM Native Image B'
209+
- 'Kokoro - Test: Java GraalVM Native Image C'
210+
- javadoc
211+
- library_generation
212+
- unmanaged_dependency_check
194213
permissionRules:
195214
- team: yoshi-admins
196215
permission: admin

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

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ 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.29.2</version>
44+
<version>2.30.0</version>
4545
</dependency>
4646

4747
```

google-cloud-datastore-bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>com.google.cloud</groupId>
1010
<artifactId>sdk-platform-java-config</artifactId>
11-
<version>3.50.0</version>
11+
<version>3.50.1</version>
1212
</parent>
1313

1414
<name>Google Cloud datastore BOM</name>

google-cloud-datastore/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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.60.0</version>
27+
<version>1.61.0</version>
2828
<type>pom</type>
2929
<scope>import</scope>
3030
</dependency>

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>com.google.cloud</groupId>
1616
<artifactId>sdk-platform-java-config</artifactId>
17-
<version>3.50.0</version>
17+
<version>3.50.1</version>
1818
</parent>
1919

2020
<developers>
@@ -184,7 +184,7 @@
184184
<dependency>
185185
<groupId>com.google.cloud</groupId>
186186
<artifactId>google-cloud-datastore-utils</artifactId>
187-
<version>2.29.2</version><!-- {x-version-update:google-cloud-datastore-utils:current} -->
187+
<version>2.30.0</version><!-- {x-version-update:google-cloud-datastore-utils:current} -->
188188
</dependency>
189189
<dependency>
190190
<groupId>com.google.cloud.datastore</groupId>

samples/install-without-bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<dependency>
3030
<groupId>com.google.cloud</groupId>
3131
<artifactId>google-cloud-datastore</artifactId>
32-
<version>2.29.2</version>
32+
<version>2.30.0</version>
3333
</dependency>
3434
<!-- [END datastore_install_without_bom] -->
3535

0 commit comments

Comments
 (0)