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

Commit 258036e

Browse files
committed
Merge branch 'main' into PR #2663 to update
2 parents 226eb7b + 971c34c commit 258036e

3 files changed

Lines changed: 3 additions & 26 deletions

File tree

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.76.0')
52+
implementation platform('com.google.cloud:libraries-bom:26.77.0')
5353
5454
implementation 'com.google.cloud:google-cloud-bigtable'
5555
```

generation_config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
gapic_generator_version: 2.67.0
2-
googleapis_commitish: d420134ab324c0cbe0f4ae06ad9697dac77f26ad
3-
libraries_bom_version: 26.76.0
2+
googleapis_commitish: 6df3ecf4fd43b64826de6a477d1a535ec18b0d7c
3+
libraries_bom_version: 26.77.0
44
template_excludes:
55
- .gitignore
66
- .kokoro/presubmit/integration.cfg

google-cloud-bigtable/pom.xml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -206,13 +206,6 @@
206206
<dependency>
207207
<groupId>io.grpc</groupId>
208208
<artifactId>grpc-opentelemetry</artifactId>
209-
<!-- TODO: remove this after next release (2.72.0). This is necessary to workaround a late downgrade of otel in cloud-shared-deps -->
210-
<exclusions>
211-
<exclusion>
212-
<groupId>io.opentelemetry</groupId>
213-
<artifactId>opentelemetry-api</artifactId>
214-
</exclusion>
215-
</exclusions>
216209
</dependency>
217210
<dependency>
218211
<groupId>org.threeten</groupId>
@@ -306,27 +299,11 @@
306299
<groupId>com.google.truth</groupId>
307300
<artifactId>truth</artifactId>
308301
<scope>test</scope>
309-
<exclusions>
310-
<!-- TODO: consider a different approach -->
311-
<!-- exclude to resolve conflict with guava -->
312-
<exclusion>
313-
<groupId>org.checkerframework</groupId>
314-
<artifactId>checker-qual</artifactId>
315-
</exclusion>
316-
</exclusions>
317302
</dependency>
318303
<dependency>
319304
<groupId>com.google.truth.extensions</groupId>
320305
<artifactId>truth-proto-extension</artifactId>
321306
<scope>test</scope>
322-
<exclusions>
323-
<!-- TODO: consider a different approach -->
324-
<!-- exclude to resolve conflict with guava -->
325-
<exclusion>
326-
<groupId>org.checkerframework</groupId>
327-
<artifactId>checker-qual</artifactId>
328-
</exclusion>
329-
</exclusions>
330307
</dependency>
331308
<dependency>
332309
<groupId>io.grpc</groupId>

0 commit comments

Comments
 (0)