Skip to content

Commit 2f33a5a

Browse files
lqiu96lqiu96
authored
Merge branch 'main' into protobuf-ci-v4294
2 parents 1cac37d + eb7cfd5 commit 2f33a5a

File tree

93 files changed

+18654
-545
lines changed

Some content is hidden

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

93 files changed

+18654
-545
lines changed

‎.github/release-please.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,12 @@ branches:
7272
- >-
7373
google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java
7474
branch: 2.54.x
75+
- bumpMinorPreMajor: true
76+
handleGHRelease: true
77+
releaseType: java-backport
78+
extraFiles:
79+
- >-
80+
google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java
81+
branch: 2.61.x
7582
extraFiles:
7683
- google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java

‎.github/sync-repo-settings.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,26 @@ branchProtectionRules:
177177
- conformance
178178
- library_generation
179179
- unmanaged_dependency_check
180+
- pattern: 2.61.x
181+
isAdminEnforced: true
182+
requiredApprovingReviewCount: 1
183+
requiresCodeOwnerReviews: true
184+
requiresStrictStatusChecks: false
185+
requiredStatusCheckContexts:
186+
- dependencies (17)
187+
- lint
188+
- clirr
189+
- units (8)
190+
- units (11)
191+
- 'Kokoro - Test: Integration'
192+
- cla/google
193+
- 'Kokoro - Test: Java GraalVM Native Image A'
194+
- 'Kokoro - Test: Java GraalVM Native Image B'
195+
- 'Kokoro - Test: Java GraalVM Native Image C'
196+
- javadoc
197+
- conformance
198+
- library_generation
199+
- unmanaged_dependency_check
180200
permissionRules:
181201
- team: yoshi-admins
182202
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.49.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-bigtable-bom/pom.xml

‎.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.49.0" # {x-version-update:google-cloud-shared-dependencies:current}
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.50.1" # {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.49.0" # {x-version-update:google-cloud-shared-dependencies:current}
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.50.1" # {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.49.0" # {x-version-update:google-cloud-shared-dependencies:current}
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.50.1" # {x-version-update:google-cloud-shared-dependencies:current}
77
}
88

99
env_vars: {

‎CHANGELOG.md

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

3+
## [2.61.0](https://github.com/googleapis/java-bigtable/compare/v2.60.0...v2.61.0) (2025-06-27)
4+
5+
6+
### Features
7+
8+
* Add getter for universe domain in JwtCredentialsWithAudience ([#2598](https://github.com/googleapis/java-bigtable/issues/2598)) ([9ad66b1](https://github.com/googleapis/java-bigtable/commit/9ad66b129923500cdeb794fc2e4570ad8b1d92fd))
9+
10+
11+
### Bug Fixes
12+
13+
* Add name elements for the POM.xml files ([a873719](https://github.com/googleapis/java-bigtable/commit/a873719e7e32a0cd21dc259911a193520f20797e))
14+
* Populate table id for materialized view ([#2610](https://github.com/googleapis/java-bigtable/issues/2610)) ([50c3fe2](https://github.com/googleapis/java-bigtable/commit/50c3fe2ffe66acaba8cb408dc3b1a4d13a4a2556))
15+
16+
17+
### Dependencies
18+
19+
* Update shared dependencies ([#2605](https://github.com/googleapis/java-bigtable/issues/2605)) ([4cc7246](https://github.com/googleapis/java-bigtable/commit/4cc7246ff8e2e0e26d2edc0aee8866a32ec1c8ab))
20+
321
## [2.60.0](https://github.com/googleapis/java-bigtable/compare/v2.59.0...v2.60.0) (2025-06-06)
422

523

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-bigtable'
5656
If you are using Gradle without BOM, add this to your dependencies:
5757

5858
```Groovy
59-
implementation 'com.google.cloud:google-cloud-bigtable:2.60.0'
59+
implementation 'com.google.cloud:google-cloud-bigtable:2.61.0'
6060
```
6161

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

6464
```Scala
65-
libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.60.0"
65+
libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.61.0"
6666
```
6767

6868
## Authentication
@@ -470,7 +470,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
470470
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-bigtable/java11.html
471471
[stability-image]: https://img.shields.io/badge/stability-stable-green
472472
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-bigtable.svg
473-
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-bigtable/2.60.0
473+
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-bigtable/2.61.0
474474
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
475475
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
476476
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

‎generation_config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
gapic_generator_version: 2.59.0
2-
googleapis_commitish: 4c2be914d36599e4db46e2d77d02f3f00665cc89
2+
googleapis_commitish: 63161c080e7eb3dd1d4fe76db1fad108b6ac9a27
33
libraries_bom_version: 26.61.0
44
template_excludes:
55
- .gitignore

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

Lines changed: 9 additions & 9 deletions
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-bigtable-bom</artifactId>
6-
<version>2.60.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
6+
<version>2.61.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
77
<packaging>pom</packaging>
88
<parent>
99
<groupId>com.google.cloud</groupId>
1010
<artifactId>sdk-platform-java-config</artifactId>
11-
<version>3.49.0</version>
11+
<version>3.50.1</version>
1212
<relativePath/>
1313
</parent>
1414

@@ -63,37 +63,37 @@
6363
<dependency>
6464
<groupId>com.google.cloud</groupId>
6565
<artifactId>google-cloud-bigtable</artifactId>
66-
<version>2.60.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
66+
<version>2.61.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
6767
</dependency>
6868
<dependency>
6969
<groupId>com.google.cloud</groupId>
7070
<artifactId>google-cloud-bigtable-emulator</artifactId>
71-
<version>0.197.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
71+
<version>0.198.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
7272
</dependency>
7373
<dependency>
7474
<groupId>com.google.cloud</groupId>
7575
<artifactId>google-cloud-bigtable-emulator-core</artifactId>
76-
<version>0.197.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
76+
<version>0.198.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
7777
</dependency>
7878
<dependency>
7979
<groupId>com.google.api.grpc</groupId>
8080
<artifactId>grpc-google-cloud-bigtable-admin-v2</artifactId>
81-
<version>2.60.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
81+
<version>2.61.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
8282
</dependency>
8383
<dependency>
8484
<groupId>com.google.api.grpc</groupId>
8585
<artifactId>grpc-google-cloud-bigtable-v2</artifactId>
86-
<version>2.60.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
86+
<version>2.61.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
8787
</dependency>
8888
<dependency>
8989
<groupId>com.google.api.grpc</groupId>
9090
<artifactId>proto-google-cloud-bigtable-admin-v2</artifactId>
91-
<version>2.60.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
91+
<version>2.61.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
9292
</dependency>
9393
<dependency>
9494
<groupId>com.google.api.grpc</groupId>
9595
<artifactId>proto-google-cloud-bigtable-v2</artifactId>
96-
<version>2.60.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
96+
<version>2.61.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
9797
</dependency>
9898
</dependencies>
9999
</dependencyManagement>

0 commit comments

Comments
 (0)