Skip to content

Commit 7bed5b9

Browse files
jinseopkim0jinseopkim0
authored
Merge branch 'main' into refactor-consistency-request
2 parents 35e797a + 86c0cca commit 7bed5b9

36 files changed

Lines changed: 373 additions & 99 deletions

File tree

‎.github/scripts/update_generation_config.sh‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -144,16 +144,12 @@ rm -rf tmp-googleapis
144144
update_config "googleapis_commitish" "${latest_commit}" "${generation_config}"
145145

146146
# Update gapic-generator-java version to the latest
147-
latest_gapic_generator_version=$(get_latest_released_version "com.google.api" "gapic-generator-java")
148-
update_config "gapic_generator_version" "${latest_gapic_generator_version}" "${generation_config}"
149-
150-
# Update the GitHub Actions reference to the latest.
151-
# After the google-cloud-java monorepo migration of sdk-platform-java,
152-
# we cannot rely on the gapic-generator-java version tag. Let's use
153-
# the gapic-libraries-bom version
154-
latest_gapic_libraries_bom_version=$(get_latest_released_version "com.google.cloud" "gapic-libraries-bom")
147+
latest_version=$(get_latest_released_version "com.google.api" "gapic-generator-java")
148+
update_config "gapic_generator_version" "${latest_version}" "${generation_config}"
149+
150+
# Update composite action version to latest gapic-generator-java version
155151
update_action "googleapis/google-cloud-java/sdk-platform-java/.github/scripts" \
156-
"v${latest_gapic_libraries_bom_version}" \
152+
"${latest_version}" \
157153
"${workflow}"
158154

159155
# Update libraries-bom version to the latest

‎.github/workflows/hermetic_library_generation.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,10 @@ jobs:
3737
with:
3838
fetch-depth: 0
3939
token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
40-
- uses: googleapis/sdk-platform-java/.github/scripts@v2.68.0
40+
- uses: googleapis/google-cloud-java/sdk-platform-java/.github/scripts@v1.85.0
4141
if: env.SHOULD_RUN == 'true'
4242
with:
43+
image_tag: latest
4344
base_ref: ${{ github.base_ref }}
4445
head_ref: ${{ github.head_ref }}
4546
token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}

‎.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.58.0
17+
uses: googleapis/google-cloud-java/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@v1.85.0
1818
with:
1919
bom-path: google-cloud-bigtable-bom/pom.xml

‎.kokoro/presubmit/integration.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ env_vars: {
88

99
env_vars: {
1010
key: "INTEGRATION_TEST_ARGS"
11-
value: "-P bigtable-prod-it,enable-verbose-grpc-logs -Dbigtable.project=gcloud-devel -Dbigtable.instance=google-cloud-bigtable -Dbigtable.table=integration-tests -Dbigtable.kms_key_name=projects/gcloud-devel/locations/us-east1/keyRings/cmek-test-key-ring/cryptoKeys/cmek-test-key -Dbigtable.wait-for-cmek-key-status=true"
11+
value: "-P bigtable-emulator-it,bigtable-prod-it,bigtable-prod-batch-it,enable-verbose-grpc-logs -Dbigtable.project=gcloud-devel -Dbigtable.instance=google-cloud-bigtable -Dbigtable.table=integration-tests -Dbigtable.kms_key_name=projects/gcloud-devel/locations/us-east1/keyRings/cmek-test-key-ring/cryptoKeys/cmek-test-key -Dbigtable.wait-for-cmek-key-status=true"
1212
}
1313

1414
env_vars: {

‎CHANGELOG.md‎

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

3+
## [2.77.1](https://github.com/googleapis/java-bigtable/compare/v2.77.0...v2.77.1) (2026-04-13)
4+
5+
6+
### Bug Fixes
7+
8+
* Bump reported admin versions ([#2876](https://github.com/googleapis/java-bigtable/issues/2876)) ([cb56060](https://github.com/googleapis/java-bigtable/commit/cb5606071e083642946ddbd87e914c5e8ec896ea))
9+
* Fix translate exception in compat layer ([#2879](https://github.com/googleapis/java-bigtable/issues/2879)) ([2742460](https://github.com/googleapis/java-bigtable/commit/274246016802bf92ac372d1f9c866b487f5900e2))
10+
311
## [2.77.0](https://github.com/googleapis/java-bigtable/compare/v2.76.0...v2.77.0) (2026-04-09)
412

513

@@ -37,6 +45,7 @@
3745

3846
## [2.75.0](https://github.com/googleapis/java-bigtable/compare/v2.74.0...v2.75.0) (2026-03-24)
3947

48+
### WARNING: This release contains a known bug with clientside metrics which was fixed in v2.75.1
4049

4150
### Features
4251

@@ -64,6 +73,7 @@
6473

6574
## [2.74.0](https://github.com/googleapis/java-bigtable/compare/v2.73.1...v2.74.0) (2026-03-02)
6675

76+
### WARNING: This release contains a known bug with clientside metrics which was fixed in v2.75.1
6777

6878
### Features
6979

‎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.77.0'
59+
implementation 'com.google.cloud:google-cloud-bigtable:2.77.1'
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.77.0"
65+
libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.77.1"
6666
```
6767

6868
## Authentication
@@ -452,7 +452,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
452452
[javadocs]: https://cloud.google.com/java/docs/reference/google-cloud-bigtable/latest/history
453453
[stability-image]: https://img.shields.io/badge/stability-stable-green
454454
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-bigtable.svg
455-
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-bigtable/2.77.0
455+
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-bigtable/2.77.1
456456
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
457457
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
458458
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

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

Lines changed: 8 additions & 8 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-bigtable-bom</artifactId>
6-
<version>2.77.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
6+
<version>2.77.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
77
<packaging>pom</packaging>
88
<parent>
99
<groupId>com.google.cloud</groupId>
@@ -63,37 +63,37 @@
6363
<dependency>
6464
<groupId>com.google.cloud</groupId>
6565
<artifactId>google-cloud-bigtable</artifactId>
66-
<version>2.77.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
66+
<version>2.77.2-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.214.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
71+
<version>0.214.2-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.214.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
76+
<version>0.214.2-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.77.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
81+
<version>2.77.2-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.77.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
86+
<version>2.77.2-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.77.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
91+
<version>2.77.2-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.77.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
96+
<version>2.77.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
9797
</dependency>
9898
</dependencies>
9999
</dependencyManagement>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<groupId>com.google.cloud</groupId>
1515
<artifactId>google-cloud-bigtable-deps-bom</artifactId>
16-
<version>2.77.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
16+
<version>2.77.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
1717

1818
<packaging>pom</packaging>
1919
<name>Google Cloud Bigtable Dependency BOM</name>

‎google-cloud-bigtable-emulator-core/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<parent>
88
<artifactId>google-cloud-bigtable-parent</artifactId>
99
<groupId>com.google.cloud</groupId>
10-
<version>2.77.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
10+
<version>2.77.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
1111
</parent>
1212
<name>Google Cloud Java - Bigtable Emulator Core</name>
1313

1414
<artifactId>google-cloud-bigtable-emulator-core</artifactId>
15-
<version>0.214.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
15+
<version>0.214.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
1616

1717
<description>
1818
A Java wrapper for the Cloud Bigtable emulator.

‎google-cloud-bigtable-emulator-core/src/main/java/com/google/cloud/bigtable/emulator/core/EmulatorController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ public synchronized void start(int port)
129129
throw e;
130130
}
131131
}
132-
Thread stdoutThread = pipeStreamToLog(process.getInputStream(), Level.INFO);
133-
Thread stderrThread = pipeStreamToLog(process.getErrorStream(), Level.WARNING);
132+
stdoutThread = pipeStreamToLog(process.getInputStream(), Level.INFO);
133+
stderrThread = pipeStreamToLog(process.getErrorStream(), Level.WARNING);
134134
isStopped = false;
135135

136136
shutdownHook =

0 commit comments

Comments
 (0)