Skip to content

Commit 6a95b93

Browse files
igorbernstein2igorbernstein2
authored
Merge branch 'main' into renovate/io.grpc-protoc-gen-grpc-java-1.x
2 parents 248a737 + c88b31e commit 6a95b93

File tree

164 files changed

+66869
-6874
lines changed

Some content is hidden

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

164 files changed

+66869
-6874
lines changed

‎.github/release-please.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,12 @@ branches:
5858
- >-
5959
google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java
6060
branch: 2.30.x
61+
- bumpMinorPreMajor: true
62+
handleGHRelease: true
63+
releaseType: java-backport
64+
extraFiles:
65+
- >-
66+
google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java
67+
branch: 2.39.x
6168
extraFiles:
6269
- google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java

‎.github/sync-repo-settings.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,24 @@ branchProtectionRules:
142142
- 'Kokoro - Test: Java 17 GraalVM Native Image'
143143
- javadoc
144144
- conformance
145+
- pattern: 2.39.x
146+
isAdminEnforced: true
147+
requiredApprovingReviewCount: 1
148+
requiresCodeOwnerReviews: true
149+
requiresStrictStatusChecks: false
150+
requiredStatusCheckContexts:
151+
- dependencies (17)
152+
- lint
153+
- clirr
154+
- units (8)
155+
- units (11)
156+
- 'Kokoro - Test: Integration'
157+
- cla/google
158+
- OwlBot Post Processor
159+
- 'Kokoro - Test: Java GraalVM Native Image'
160+
- 'Kokoro - Test: Java 17 GraalVM Native Image'
161+
- javadoc
162+
- conformance
145163
permissionRules:
146164
- team: yoshi-admins
147165
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.32.0
17+
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.33.0
1818
with:
1919
bom-path: google-cloud-bigtable-bom/pom.xml

‎.kokoro/nightly/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-emulator-it,bigtable-prod-it,bigtable-prod-batch-it -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: {

‎.kokoro/presubmit/graalvm-native-17.cfg

Lines changed: 2 additions & 2 deletions
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.32.0"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.33.0"
77
}
88

99
env_vars: {
@@ -13,7 +13,7 @@ env_vars: {
1313

1414
env_vars: {
1515
key: "INTEGRATION_TEST_ARGS"
16-
value: "-P bigtable-emulator-it,bigtable-prod-it,bigtable-prod-batch-it -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"
16+
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"
1717
}
1818

1919
# TODO: remove this after we've migrated all tests and scripts

‎.kokoro/presubmit/graalvm-native.cfg

Lines changed: 2 additions & 2 deletions
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.32.0"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.33.0"
77
}
88

99
env_vars: {
@@ -19,7 +19,7 @@ env_vars: {
1919

2020
env_vars: {
2121
key: "INTEGRATION_TEST_ARGS"
22-
value: "-P bigtable-emulator-it,bigtable-prod-it,bigtable-prod-batch-it -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"
22+
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"
2323
}
2424

2525
env_vars: {

‎.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-emulator-it,bigtable-prod-it,bigtable-prod-batch-it -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: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# Changelog
22

3+
## [2.41.0](https://github.com/googleapis/java-bigtable/compare/v2.40.0...v2.41.0) (2024-07-24)
4+
5+
6+
### Features
7+
8+
* Add MergeToCell to Mutation APIs ([#2279](https://github.com/googleapis/java-bigtable/issues/2279)) ([0ce8a2a](https://github.com/googleapis/java-bigtable/commit/0ce8a2a38703233da58208655f41f6e81e03576e))
9+
* Add support for MergeToCell API ([#2258](https://github.com/googleapis/java-bigtable/issues/2258)) ([191d15c](https://github.com/googleapis/java-bigtable/commit/191d15c5284dbb702e11669931272877bf05f44e))
10+
* Add support for new functions ([#2287](https://github.com/googleapis/java-bigtable/issues/2287)) ([dd6583a](https://github.com/googleapis/java-bigtable/commit/dd6583a22504385b7a1f7dc91b3bc3d2500ea0c5))
11+
* Create new environment variable to toggle directpath scoped to cloud bigtable. ([#2261](https://github.com/googleapis/java-bigtable/issues/2261)) ([9062944](https://github.com/googleapis/java-bigtable/commit/9062944610277eb7ae77f395dc79ce94239c5bee))
12+
* Implement ExecuteQuery API for SQL support ([#2280](https://github.com/googleapis/java-bigtable/issues/2280)) ([25218e8](https://github.com/googleapis/java-bigtable/commit/25218e8cc46f9a51d4b6515afdb8931e574b0bb1))
13+
14+
15+
### Dependencies
16+
17+
* Update dependency com.google.truth.extensions:truth-proto-extension to v1.4.4 ([#2282](https://github.com/googleapis/java-bigtable/issues/2282)) ([d00a9e0](https://github.com/googleapis/java-bigtable/commit/d00a9e01b2b329f3bae50f48a15692d87ad0f3bf))
18+
319
## [2.40.0](https://github.com/googleapis/java-bigtable/compare/v2.39.5...v2.40.0) (2024-06-28)
420

521

‎README.md

Lines changed: 4 additions & 4 deletions
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.39.5</version>
45+
<version>2.40.0</version>
4646
</dependency>
4747

4848
```
@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-bigtable'
5757
If you are using Gradle without BOM, add this to your dependencies:
5858

5959
```Groovy
60-
implementation 'com.google.cloud:google-cloud-bigtable:2.40.0'
60+
implementation 'com.google.cloud:google-cloud-bigtable:2.41.0'
6161
```
6262

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

6565
```Scala
66-
libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.40.0"
66+
libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.41.0"
6767
```
6868
<!-- {x-version-update-end} -->
6969

@@ -542,7 +542,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
542542
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-bigtable/java11.html
543543
[stability-image]: https://img.shields.io/badge/stability-stable-green
544544
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-bigtable.svg
545-
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-bigtable/2.40.0
545+
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-bigtable/2.41.0
546546
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
547547
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
548548
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

‎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.40.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
6+
<version>2.41.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.32.0</version>
11+
<version>3.33.0</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.40.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
66+
<version>2.41.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.177.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
71+
<version>0.178.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.177.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
76+
<version>0.178.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.40.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
81+
<version>2.41.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.40.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
86+
<version>2.41.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.40.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
91+
<version>2.41.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.40.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
96+
<version>2.41.1-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: 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.32.0</version>
10+
<version>3.33.0</version>
1111
<relativePath/>
1212
</parent>
1313

1414
<groupId>com.google.cloud</groupId>
1515
<artifactId>google-cloud-bigtable-deps-bom</artifactId>
16-
<version>2.40.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
16+
<version>2.41.1-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.40.0</version>
69+
<version>1.41.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.40.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
10+
<version>2.41.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
1111
</parent>
1212

1313
<artifactId>google-cloud-bigtable-emulator-core</artifactId>
14-
<version>0.177.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
14+
<version>0.178.1-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.177.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
8+
<version>0.178.1-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.40.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
17+
<version>2.41.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
1818
</parent>
1919
<scm>
2020
<connection>scm:git:[email protected]: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.40.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
84+
<version>2.41.1-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.40.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
91+
<version>2.41.1-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.177.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
102+
<version>0.178.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
103103
</dependency>
104104

105105
<dependency>

‎google-cloud-bigtable/clirr-ignored-differences.xml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,4 +210,43 @@
210210
<className>com/google/cloud/bigtable/data/v2/models/ChangeStreamRecordAdapter$ChangeStreamRecordBuilder</className>
211211
<method>*</method>
212212
</difference>
213+
<!-- BetaApi was updated -->
214+
<difference>
215+
<differenceType>2000</differenceType>
216+
<className>com/google/cloud/bigtable/admin/v2/models/Type</className>
217+
</difference>
218+
<difference>
219+
<differenceType>2000</differenceType>
220+
<className>com/google/cloud/bigtable/admin/v2/models/Type$SumAggregateInput</className>
221+
</difference>
222+
<difference>
223+
<differenceType>5001</differenceType>
224+
<className>com/google/cloud/bigtable/admin/v2/models/Type$SumAggregateInput</className>
225+
<to>com/google/cloud/bigtable/admin/v2/models/Type</to>
226+
</difference>
227+
<difference>
228+
<differenceType>5001</differenceType>
229+
<className>com/google/cloud/bigtable/admin/v2/models/Type$Aggregate</className>
230+
<to>com/google/cloud/bigtable/admin/v2/models/Type</to>
231+
</difference>
232+
<difference>
233+
<differenceType>5001</differenceType>
234+
<className>com/google/cloud/bigtable/admin/v2/models/Type$Bytes</className>
235+
<to>com/google/cloud/bigtable/admin/v2/models/Type</to>
236+
</difference>
237+
<difference>
238+
<differenceType>5001</differenceType>
239+
<className>com/google/cloud/bigtable/admin/v2/models/Type$Int64</className>
240+
<to>com/google/cloud/bigtable/admin/v2/models/Type</to>
241+
</difference>
242+
<difference>
243+
<differenceType>5001</differenceType>
244+
<className>com/google/cloud/bigtable/admin/v2/models/Type$Int64</className>
245+
<to>com/google/cloud/bigtable/admin/v2/models/Type$SumAggregateInput</to>
246+
</difference>
247+
<difference>
248+
<differenceType>5001</differenceType>
249+
<className>com/google/cloud/bigtable/admin/v2/models/Type$Raw</className>
250+
<to>com/google/cloud/bigtable/admin/v2/models/Type</to>
251+
</difference>
213252
</differences>

0 commit comments

Comments
 (0)