Skip to content

Commit b35d956

Browse files
mutianfmutianf
committed
Merge branch 'main' into otel
2 parents 9d5eb08 + cc54c03 commit b35d956

File tree

116 files changed

+34126
-1024
lines changed

Some content is hidden

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

116 files changed

+34126
-1024
lines changed

‎.github/release-please.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,12 @@ branches:
5151
- >-
5252
google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java
5353
branch: 2.25.x
54+
- bumpMinorPreMajor: true
55+
handleGHRelease: true
56+
releaseType: java-backport
57+
extraFiles:
58+
- >-
59+
google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java
60+
branch: 2.30.x
5461
extraFiles:
5562
- google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java

‎.github/sync-repo-settings.yaml‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ branchProtectionRules:
1919
- 'Kokoro - Test: Java GraalVM Native Image'
2020
- 'Kokoro - Test: Java 17 GraalVM Native Image'
2121
- javadoc
22-
- conformance
22+
- conformance
2323
- pattern: 1.22.0-sp
2424
isAdminEnforced: true
2525
requiredApprovingReviewCount: 1
@@ -124,6 +124,24 @@ branchProtectionRules:
124124
- OwlBot Post Processor
125125
- 'Kokoro - Test: Java GraalVM Native Image'
126126
- 'Kokoro - Test: Java 17 GraalVM Native Image'
127+
- pattern: 2.30.x
128+
isAdminEnforced: true
129+
requiredApprovingReviewCount: 1
130+
requiresCodeOwnerReviews: true
131+
requiresStrictStatusChecks: false
132+
requiredStatusCheckContexts:
133+
- dependencies (17)
134+
- lint
135+
- clirr
136+
- units (8)
137+
- units (11)
138+
- 'Kokoro - Test: Integration'
139+
- cla/google
140+
- OwlBot Post Processor
141+
- 'Kokoro - Test: Java GraalVM Native Image'
142+
- 'Kokoro - Test: Java 17 GraalVM Native Image'
143+
- javadoc
144+
- conformance
127145
permissionRules:
128146
- team: yoshi-admins
129147
permission: admin

‎.kokoro/presubmit/graalvm-native-17.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.25.0"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.27.0"
77
}
88

99
env_vars: {

‎.kokoro/presubmit/graalvm-native.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.25.0"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.27.0"
77
}
88

99
env_vars: {

‎CHANGELOG.md‎

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

3+
## [2.35.1](https://github.com/googleapis/java-bigtable/compare/v2.35.0...v2.35.1) (2024-03-07)
4+
5+
6+
### Dependencies
7+
8+
* Update shared dependencies ([#2140](https://github.com/googleapis/java-bigtable/issues/2140)) ([a6c9f9b](https://github.com/googleapis/java-bigtable/commit/a6c9f9bc7781535d80c4a44cb350052d6771b2e0))
9+
10+
## [2.35.0](https://github.com/googleapis/java-bigtable/compare/v2.34.0...v2.35.0) (2024-03-05)
11+
12+
13+
### Features
14+
15+
* Add authorized view bindings to Cloud Bigtable data APIs and messages ([#2144](https://github.com/googleapis/java-bigtable/issues/2144)) ([ae89709](https://github.com/googleapis/java-bigtable/commit/ae89709514921f7f362b7bf6057ec2f01e50046d))
16+
17+
18+
### Bug Fixes
19+
20+
* Per-connection metrics issue when using a different Bigtable project ([#2143](https://github.com/googleapis/java-bigtable/issues/2143)) ([8dbd680](https://github.com/googleapis/java-bigtable/commit/8dbd680abc1ad13ad33981c67f8349f63432b7ea))
21+
322
## [2.34.0](https://github.com/googleapis/java-bigtable/compare/v2.33.0...v2.34.0) (2024-02-21)
423

524

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
4242
<dependency>
4343
<groupId>com.google.cloud</groupId>
4444
<artifactId>google-cloud-bigtable</artifactId>
45-
<version>2.34.0</version>
45+
<version>2.35.1</version>
4646
</dependency>
4747

4848
```

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

Lines changed: 14 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.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
6+
<version>2.35.2-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.25.0</version>
11+
<version>3.27.0</version>
1212
<relativePath/>
1313
</parent>
1414

@@ -63,38 +63,43 @@
6363
<dependency>
6464
<groupId>com.google.cloud</groupId>
6565
<artifactId>google-cloud-bigtable</artifactId>
66-
<version>2.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
66+
<version>2.35.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.171.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
71+
<version>0.172.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.171.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
76+
<version>0.172.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.34.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
81+
<version>2.35.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.34.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
86+
<version>2.35.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.34.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
91+
<version>2.35.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.34.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
96+
<version>2.35.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
9797
</dependency>
98+
<dependency>
99+
<groupId>com.google.cloud</groupId>
100+
<artifactId>google-cloud-bigtable-stats</artifactId>
101+
<version>2.35.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
102+
</dependency>
98103
</dependencies>
99104
</dependencyManagement>
100105

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<parent>
88
<groupId>com.google.cloud</groupId>
99
<artifactId>sdk-platform-java-config</artifactId>
10-
<version>3.25.0</version>
10+
<version>3.27.0</version>
1111
<relativePath/>
1212
</parent>
1313

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

1818
<packaging>pom</packaging>
1919
<description>
@@ -66,7 +66,7 @@
6666
<dependency>
6767
<groupId>com.google.cloud</groupId>
6868
<artifactId>gapic-libraries-bom</artifactId>
69-
<version>1.30.0</version>
69+
<version>1.31.0</version>
7070
<type>pom</type>
7171
<scope>import</scope>
7272
</dependency>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<artifactId>google-cloud-bigtable-parent</artifactId>
99
<groupId>com.google.cloud</groupId>
10-
<version>2.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
10+
<version>2.35.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
1111
</parent>
1212

1313
<artifactId>google-cloud-bigtable-emulator-core</artifactId>
14-
<version>0.171.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
14+
<version>0.172.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
1515

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

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<artifactId>google-cloud-bigtable-emulator</artifactId>
8-
<version>0.171.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
8+
<version>0.172.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
99
<name>Google Cloud Java - Bigtable Emulator</name>
1010
<url>https://github.com/googleapis/java-bigtable</url>
1111
<description>
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>com.google.cloud</groupId>
1616
<artifactId>google-cloud-bigtable-parent</artifactId>
17-
<version>2.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
17+
<version>2.35.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
1818
</parent>
1919
<scm>
2020
<connection>scm:git:git@github.com:googleapis/java-bigtable.git</connection>
@@ -81,14 +81,14 @@
8181
<dependency>
8282
<groupId>com.google.cloud</groupId>
8383
<artifactId>google-cloud-bigtable-deps-bom</artifactId>
84-
<version>2.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
84+
<version>2.35.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
8585
<type>pom</type>
8686
<scope>import</scope>
8787
</dependency>
8888
<dependency>
8989
<groupId>com.google.cloud</groupId>
9090
<artifactId>google-cloud-bigtable-bom</artifactId>
91-
<version>2.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
91+
<version>2.35.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
9292
<type>pom</type>
9393
<scope>import</scope>
9494
</dependency>
@@ -99,7 +99,7 @@
9999
<dependency>
100100
<groupId>com.google.cloud</groupId>
101101
<artifactId>google-cloud-bigtable-emulator-core</artifactId>
102-
<version>0.171.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
102+
<version>0.172.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
103103
</dependency>
104104

105105
<dependency>

0 commit comments

Comments
 (0)