Skip to content
This repository was archived by the owner on May 8, 2026. It is now read-only.

Commit 5e48a22

Browse files
committed
Merge branch 'main' into PR #2614 to update
2 parents 8b59ec7 + d1020a1 commit 5e48a22

9 files changed

Lines changed: 18 additions & 11 deletions

File tree

.github/CODEOWNERS

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
66

77
# The @googleapis/api-bigtable @googleapis/api-bigtable-partners is the default owner for changes in this repo
8-
* @googleapis/yoshi-java @googleapis/api-bigtable @googleapis/api-bigtable-partners
8+
* @googleapis/cloud-sdk-java-team @googleapis/api-bigtable @googleapis/api-bigtable-partners
99

1010
# for handwritten libraries, keep codeowner_team in .repo-metadata.json as owner
1111
**/*.java @googleapis/api-bigtable @googleapis/api-bigtable-partners
@@ -15,8 +15,8 @@
1515
samples/**/*.java @googleapis/java-samples-reviewers
1616

1717
# Generated snippets should not be owned by samples reviewers
18-
samples/snippets/generated/ @googleapis/yoshi-java
18+
samples/snippets/generated/ @googleapis/cloud-sdk-java-team
1919

2020
# Admin Module (Cloud Java Team ownership)
21-
**/com/google/cloud/bigtable/admin/** @googleapis/api-bigtable @googleapis/api-bigtable-partners @googleapis/cloud-java-team-teamsync
22-
**/com/google/bigtable/admin/** @googleapis/api-bigtable @googleapis/api-bigtable-partners @googleapis/cloud-java-team-teamsync
21+
**/com/google/cloud/bigtable/admin/** @googleapis/api-bigtable @googleapis/api-bigtable-partners @googleapis/cloud-sdk-java-team
22+
**/com/google/bigtable/admin/** @googleapis/api-bigtable @googleapis/api-bigtable-partners @googleapis/cloud-sdk-java-team

.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.55.1
17+
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.56.0
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.54.1" # {x-version-update:google-cloud-shared-dependencies:current}
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.56.0" # {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.54.1" # {x-version-update:google-cloud-shared-dependencies:current}
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.56.0" # {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.54.1" # {x-version-update:google-cloud-shared-dependencies:current}
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.56.0" # {x-version-update:google-cloud-shared-dependencies:current}
77
}
88

99
env_vars: {

google-cloud-bigtable-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.55.1</version>
11+
<version>3.56.0</version>
1212
<relativePath/>
1313
</parent>
1414

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.google.cloud</groupId>
99
<artifactId>sdk-platform-java-config</artifactId>
10-
<version>3.55.1</version>
10+
<version>3.56.0</version>
1111
<relativePath/>
1212
</parent>
1313

google-cloud-bigtable/pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,13 @@
211211
<dependency>
212212
<groupId>io.grpc</groupId>
213213
<artifactId>grpc-opentelemetry</artifactId>
214+
<!-- TODO: remove this after next release (2.72.0). This is necessary to workaround a late downgrade of otel in cloud-shared-deps -->
215+
<exclusions>
216+
<exclusion>
217+
<groupId>io.opentelemetry</groupId>
218+
<artifactId>opentelemetry-api</artifactId>
219+
</exclusion>
220+
</exclusions>
214221
</dependency>
215222
<dependency>
216223
<groupId>org.threeten</groupId>

pom.xml

Lines changed: 1 addition & 1 deletion
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.55.1</version>
17+
<version>3.56.0</version>
1818
<relativePath/>
1919
</parent>
2020

0 commit comments

Comments
 (0)