From c8f23a51c0c44f8f75fde809498571982bc681b4 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 3 Apr 2023 15:52:14 +0000 Subject: [PATCH 01/20] chore(main): release 2.20.4-SNAPSHOT (#1693) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- google-cloud-bigtable-bom/pom.xml | 18 +++++++++--------- google-cloud-bigtable-deps-bom/pom.xml | 2 +- google-cloud-bigtable-emulator-core/pom.xml | 4 ++-- google-cloud-bigtable-emulator/pom.xml | 10 +++++----- google-cloud-bigtable-stats/pom.xml | 6 +++--- google-cloud-bigtable/pom.xml | 10 +++++----- .../com/google/cloud/bigtable/Version.java | 2 +- grpc-google-cloud-bigtable-admin-v2/pom.xml | 8 ++++---- grpc-google-cloud-bigtable-v2/pom.xml | 8 ++++---- pom.xml | 12 ++++++------ proto-google-cloud-bigtable-admin-v2/pom.xml | 8 ++++---- proto-google-cloud-bigtable-v2/pom.xml | 8 ++++---- samples/snapshot/pom.xml | 2 +- test-proxy/pom.xml | 4 ++-- versions.txt | 14 +++++++------- 15 files changed, 58 insertions(+), 58 deletions(-) diff --git a/google-cloud-bigtable-bom/pom.xml b/google-cloud-bigtable-bom/pom.xml index 9a7c6f9346..ab4701cc96 100644 --- a/google-cloud-bigtable-bom/pom.xml +++ b/google-cloud-bigtable-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-bigtable-bom - 2.20.3 + 2.20.4-SNAPSHOT pom com.google.cloud @@ -63,42 +63,42 @@ com.google.cloud google-cloud-bigtable - 2.20.3 + 2.20.4-SNAPSHOT com.google.cloud google-cloud-bigtable-emulator - 0.157.3 + 0.157.4-SNAPSHOT com.google.cloud google-cloud-bigtable-emulator-core - 0.157.3 + 0.157.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 2.20.3 + 2.20.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-bigtable-v2 - 2.20.3 + 2.20.4-SNAPSHOT com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 2.20.3 + 2.20.4-SNAPSHOT com.google.api.grpc proto-google-cloud-bigtable-v2 - 2.20.3 + 2.20.4-SNAPSHOT com.google.cloud google-cloud-bigtable-stats - 2.20.3 + 2.20.4-SNAPSHOT diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml index 661c285d25..721089397a 100644 --- a/google-cloud-bigtable-deps-bom/pom.xml +++ b/google-cloud-bigtable-deps-bom/pom.xml @@ -13,7 +13,7 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.20.3 + 2.20.4-SNAPSHOT pom diff --git a/google-cloud-bigtable-emulator-core/pom.xml b/google-cloud-bigtable-emulator-core/pom.xml index 3455de1ff1..0cf50e9c9d 100644 --- a/google-cloud-bigtable-emulator-core/pom.xml +++ b/google-cloud-bigtable-emulator-core/pom.xml @@ -7,11 +7,11 @@ google-cloud-bigtable-parent com.google.cloud - 2.20.3 + 2.20.4-SNAPSHOT google-cloud-bigtable-emulator-core - 0.157.3 + 0.157.4-SNAPSHOT A Java wrapper for the Cloud Bigtable emulator. diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml index 8d6da712cc..318b789698 100644 --- a/google-cloud-bigtable-emulator/pom.xml +++ b/google-cloud-bigtable-emulator/pom.xml @@ -5,7 +5,7 @@ 4.0.0 google-cloud-bigtable-emulator - 0.157.3 + 0.157.4-SNAPSHOT Google Cloud Java - Bigtable Emulator https://github.com/googleapis/java-bigtable @@ -14,7 +14,7 @@ com.google.cloud google-cloud-bigtable-parent - 2.20.3 + 2.20.4-SNAPSHOT scm:git:git@github.com:googleapis/java-bigtable.git @@ -81,14 +81,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.20.3 + 2.20.4-SNAPSHOT pom import com.google.cloud google-cloud-bigtable-bom - 2.20.3 + 2.20.4-SNAPSHOT pom import @@ -99,7 +99,7 @@ com.google.cloud google-cloud-bigtable-emulator-core - 0.157.3 + 0.157.4-SNAPSHOT diff --git a/google-cloud-bigtable-stats/pom.xml b/google-cloud-bigtable-stats/pom.xml index a6d67db419..30ea39f4fd 100644 --- a/google-cloud-bigtable-stats/pom.xml +++ b/google-cloud-bigtable-stats/pom.xml @@ -5,7 +5,7 @@ com.google.cloud google-cloud-bigtable-parent - 2.20.3 + 2.20.4-SNAPSHOT 4.0.0 @@ -13,7 +13,7 @@ through Stackdriver. Built-in metrics will be implemented with shaded OpenCensus so it won't interfere with customer's application metrics. --> google-cloud-bigtable-stats - 2.20.3 + 2.20.4-SNAPSHOT Experimental project to shade OpenCensus dependencies. @@ -21,7 +21,7 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.20.3 + 2.20.4-SNAPSHOT pom import diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index 2c88e4d4d8..d597e3b904 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-bigtable - 2.20.3 + 2.20.4-SNAPSHOT jar Google Cloud Bigtable https://github.com/googleapis/java-bigtable @@ -12,11 +12,11 @@ com.google.cloud google-cloud-bigtable-parent - 2.20.3 + 2.20.4-SNAPSHOT - 2.20.3 + 2.20.4-SNAPSHOT google-cloud-bigtable @@ -49,14 +49,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.20.3 + 2.20.4-SNAPSHOT pom import com.google.cloud google-cloud-bigtable-bom - 2.20.3 + 2.20.4-SNAPSHOT pom import diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java index 4b1988735a..76837fd373 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java @@ -20,6 +20,6 @@ @InternalApi("For internal use only") public final class Version { // {x-version-update-start:google-cloud-bigtable:current} - public static String VERSION = "2.20.3"; + public static String VERSION = "2.20.4-SNAPSHOT"; // {x-version-update-end} } diff --git a/grpc-google-cloud-bigtable-admin-v2/pom.xml b/grpc-google-cloud-bigtable-admin-v2/pom.xml index d8a0d7ce5e..5a5f6c2576 100644 --- a/grpc-google-cloud-bigtable-admin-v2/pom.xml +++ b/grpc-google-cloud-bigtable-admin-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 2.20.3 + 2.20.4-SNAPSHOT grpc-google-cloud-bigtable-admin-v2 GRPC library for grpc-google-cloud-bigtable-admin-v2 com.google.cloud google-cloud-bigtable-parent - 2.20.3 + 2.20.4-SNAPSHOT @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.20.3 + 2.20.4-SNAPSHOT pom import com.google.cloud google-cloud-bigtable-bom - 2.20.3 + 2.20.4-SNAPSHOT pom import diff --git a/grpc-google-cloud-bigtable-v2/pom.xml b/grpc-google-cloud-bigtable-v2/pom.xml index da21ded083..7b6f78acf8 100644 --- a/grpc-google-cloud-bigtable-v2/pom.xml +++ b/grpc-google-cloud-bigtable-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigtable-v2 - 2.20.3 + 2.20.4-SNAPSHOT grpc-google-cloud-bigtable-v2 GRPC library for grpc-google-cloud-bigtable-v2 com.google.cloud google-cloud-bigtable-parent - 2.20.3 + 2.20.4-SNAPSHOT @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.20.3 + 2.20.4-SNAPSHOT pom import com.google.cloud google-cloud-bigtable-bom - 2.20.3 + 2.20.4-SNAPSHOT pom import diff --git a/pom.xml b/pom.xml index e07b065746..2737023e61 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ google-cloud-bigtable-parent pom - 2.20.3 + 2.20.4-SNAPSHOT Google Cloud Bigtable Parent https://github.com/googleapis/java-bigtable @@ -153,27 +153,27 @@ com.google.api.grpc proto-google-cloud-bigtable-v2 - 2.20.3 + 2.20.4-SNAPSHOT com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 2.20.3 + 2.20.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-bigtable-v2 - 2.20.3 + 2.20.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 2.20.3 + 2.20.4-SNAPSHOT com.google.cloud google-cloud-bigtable - 2.20.3 + 2.20.4-SNAPSHOT diff --git a/proto-google-cloud-bigtable-admin-v2/pom.xml b/proto-google-cloud-bigtable-admin-v2/pom.xml index 9135aefe07..2324a42087 100644 --- a/proto-google-cloud-bigtable-admin-v2/pom.xml +++ b/proto-google-cloud-bigtable-admin-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 2.20.3 + 2.20.4-SNAPSHOT proto-google-cloud-bigtable-admin-v2 PROTO library for proto-google-cloud-bigtable-admin-v2 com.google.cloud google-cloud-bigtable-parent - 2.20.3 + 2.20.4-SNAPSHOT @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.20.3 + 2.20.4-SNAPSHOT pom import com.google.cloud google-cloud-bigtable-bom - 2.20.3 + 2.20.4-SNAPSHOT pom import diff --git a/proto-google-cloud-bigtable-v2/pom.xml b/proto-google-cloud-bigtable-v2/pom.xml index 0b54c3e05f..eb8bab2844 100644 --- a/proto-google-cloud-bigtable-v2/pom.xml +++ b/proto-google-cloud-bigtable-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigtable-v2 - 2.20.3 + 2.20.4-SNAPSHOT proto-google-cloud-bigtable-v2 PROTO library for proto-google-cloud-bigtable-v2 com.google.cloud google-cloud-bigtable-parent - 2.20.3 + 2.20.4-SNAPSHOT @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.20.3 + 2.20.4-SNAPSHOT pom import com.google.cloud google-cloud-bigtable-bom - 2.20.3 + 2.20.4-SNAPSHOT pom import diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 1011de9c95..e639459f47 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-bigtable - 2.20.3 + 2.20.4-SNAPSHOT diff --git a/test-proxy/pom.xml b/test-proxy/pom.xml index 162785dc7e..ff587d5757 100644 --- a/test-proxy/pom.xml +++ b/test-proxy/pom.xml @@ -12,11 +12,11 @@ google-cloud-bigtable-parent com.google.cloud - 2.20.3 + 2.20.4-SNAPSHOT - 2.20.3 + 2.20.4-SNAPSHOT diff --git a/versions.txt b/versions.txt index 10506013e2..448d319fd9 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -google-cloud-bigtable:2.20.3:2.20.3 -grpc-google-cloud-bigtable-admin-v2:2.20.3:2.20.3 -grpc-google-cloud-bigtable-v2:2.20.3:2.20.3 -proto-google-cloud-bigtable-admin-v2:2.20.3:2.20.3 -proto-google-cloud-bigtable-v2:2.20.3:2.20.3 -google-cloud-bigtable-emulator:0.157.3:0.157.3 -google-cloud-bigtable-emulator-core:2.20.3:2.20.3 +google-cloud-bigtable:2.20.3:2.20.4-SNAPSHOT +grpc-google-cloud-bigtable-admin-v2:2.20.3:2.20.4-SNAPSHOT +grpc-google-cloud-bigtable-v2:2.20.3:2.20.4-SNAPSHOT +proto-google-cloud-bigtable-admin-v2:2.20.3:2.20.4-SNAPSHOT +proto-google-cloud-bigtable-v2:2.20.3:2.20.4-SNAPSHOT +google-cloud-bigtable-emulator:0.157.3:0.157.4-SNAPSHOT +google-cloud-bigtable-emulator-core:2.20.3:2.20.4-SNAPSHOT From 8db923c647c946cf0d6861ea5f9933ff5f05c141 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 3 Apr 2023 16:00:47 +0000 Subject: [PATCH 02/20] chore: README template fix in google-cloud-java (#1785) (#1691) Source-Link: https://togithub.com/googleapis/synthtool/commit/43c709a188a1aaaf3778e77e25332b10ff9413e0 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:3387f93d4577788512112ff69ddab746ae9192ddd9f13cfd175ef310d62d7d30 --- .github/.OwlBot.lock.yaml | 2 +- README.md | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 91bb69e63c..d7abbc602e 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:bf5639d265d70f6137d57d42ae781a6f4e26d4085ff4e018e71350480f9b3996 + digest: sha256:3387f93d4577788512112ff69ddab746ae9192ddd9f13cfd175ef310d62d7d30 diff --git a/README.md b/README.md index 72e6c23203..76c6c04748 100644 --- a/README.md +++ b/README.md @@ -34,8 +34,9 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: ``` -If you are using Maven without BOM, add this to your dependencies: +If you are using Maven without the BOM, add this to your dependencies: + ```xml @@ -608,7 +609,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [developer-console]: https://console.developers.google.com/ [create-project]: https://cloud.google.com/resource-manager/docs/creating-managing-projects [cloud-cli]: https://cloud.google.com/cli -[troubleshooting]: https://github.com/googleapis/google-cloud-common/blob/main/troubleshooting/readme.md#troubleshooting +[troubleshooting]: https://github.com/googleapis/google-cloud-java/blob/main/TROUBLESHOOTING.md [contributing]: https://github.com/googleapis/java-bigtable/blob/main/CONTRIBUTING.md [code-of-conduct]: https://github.com/googleapis/java-bigtable/blob/main/CODE_OF_CONDUCT.md#contributor-code-of-conduct [license]: https://github.com/googleapis/java-bigtable/blob/main/LICENSE From 4ed9d20d4979f5b1428b4f208f8341c8ed88d864 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 5 Apr 2023 19:57:48 +0100 Subject: [PATCH 03/20] chore(deps): update dependency com.google.cloud:libraries-bom to v26.12.0 (#1697) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps): update dependency com.google.cloud:libraries-bom to v26.12.0 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- README.md | 10 +++++----- samples/native-image-sample/pom.xml | 2 +- samples/snippets/pom.xml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 76c6c04748..5714404d06 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: com.google.cloud libraries-bom - 26.11.0 + 26.12.0 pom import @@ -50,20 +50,20 @@ If you are using Maven without the BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies: ```Groovy -implementation platform('com.google.cloud:libraries-bom:26.11.0') +implementation platform('com.google.cloud:libraries-bom:26.12.0') implementation 'com.google.cloud:google-cloud-bigtable' ``` If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-bigtable:2.20.2' +implementation 'com.google.cloud:google-cloud-bigtable:2.20.3' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.20.2" +libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.20.3" ``` @@ -601,7 +601,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-bigtable/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-bigtable.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-bigtable/2.20.2 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-bigtable/2.20.3 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml index 954eb06312..4595367595 100644 --- a/samples/native-image-sample/pom.xml +++ b/samples/native-image-sample/pom.xml @@ -29,7 +29,7 @@ com.google.cloud libraries-bom - 26.11.0 + 26.12.0 pom import diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index d072f99023..d36368b3e7 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 26.11.0 + 26.12.0 pom import From cfad56b6758977d51cfa01ebc12df727dc1cf9ae Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 6 Apr 2023 10:40:49 -0400 Subject: [PATCH 04/20] chore: generated updates (#1695) * bugfix: make exception for non-cloud artifacts * change format Source-Link: https://github.com/googleapis/synthtool/commit/a86e18975db26d8e94055382c624d84643fafb86 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:944c07e458ce227ca49a423affedf088e31e2ee70908dd21682238d58f1beb60 Co-authored-by: Owl Bot --- .github/.OwlBot.lock.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index d7abbc602e..48ad11d440 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:3387f93d4577788512112ff69ddab746ae9192ddd9f13cfd175ef310d62d7d30 + digest: sha256:944c07e458ce227ca49a423affedf088e31e2ee70908dd21682238d58f1beb60 From 4e979cb57e5fd8887d5ea413169d80be75e6a621 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 7 Apr 2023 20:24:12 +0100 Subject: [PATCH 05/20] chore(deps): update dependency com.google.cloud:google-cloud-bigtable to v2.20.3 (#1694) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-bigtable](https://togithub.com/googleapis/java-bigtable) | `2.20.2` -> `2.20.3` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-bigtable/2.20.3/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-bigtable/2.20.3/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-bigtable/2.20.3/compatibility-slim/2.20.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-bigtable/2.20.3/confidence-slim/2.20.2)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-bigtable ### [`v2.20.3`](https://togithub.com/googleapis/java-bigtable/blob/HEAD/CHANGELOG.md#​2203-httpsgithubcomgoogleapisjava-bigtablecomparev2202v2203-2023-04-03) [Compare Source](https://togithub.com/googleapis/java-bigtable/compare/v2.20.2...v2.20.3) ##### Dependencies - Upgrade shared dependencies to 3.6.0 and monitoring to 3.15.0 ([#​1688](https://togithub.com/googleapis/java-bigtable/issues/1688)) ([c0bad0d](https://togithub.com/googleapis/java-bigtable/commit/c0bad0d637179e0e8ed80e9716203ae8f11e5cb4))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-bigtable). --- README.md | 2 +- samples/install-without-bom/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5714404d06..e3d8931d71 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies: com.google.cloud google-cloud-bigtable - 2.20.2 + 2.20.3 ``` diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 7e407955ed..eb2e7498cd 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-bigtable - 2.20.2 + 2.20.3 From e02b5b824143a6321a628135cb2cecd8a13b16cb Mon Sep 17 00:00:00 2001 From: "J. Liu" Date: Tue, 11 Apr 2023 10:51:01 -0400 Subject: [PATCH 06/20] test(fix): add conformance test to the CI pipeline (redo of PR#1698). (#1699) --- .github/workflows/conformance.yaml | 41 +++++++++++++++++++ .kokoro/conformance.sh | 65 ++++++++++++++++++++++++++++++ test-proxy/known_failures.txt | 1 + 3 files changed, 107 insertions(+) create mode 100644 .github/workflows/conformance.yaml create mode 100755 .kokoro/conformance.sh create mode 100644 test-proxy/known_failures.txt diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml new file mode 100644 index 0000000000..b17c0014e6 --- /dev/null +++ b/.github/workflows/conformance.yaml @@ -0,0 +1,41 @@ +# Copyright 2023 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# Github action job to test core java library features on +# downstream client libraries before they are released. +on: + push: + branches: + - main + pull_request: +name: conformance +jobs: + conformance: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/checkout@v3 + with: + repository: googleapis/cloud-bigtable-clients-test + ref: main + path: cloud-bigtable-clients-test + - uses: actions/setup-java@v3 + with: + distribution: zulu + java-version: 8 + - uses: actions/setup-go@v3 + with: + go-version: '>=1.20.2' + - run: java -version + - run: go version + - run: .kokoro/conformance.sh diff --git a/.kokoro/conformance.sh b/.kokoro/conformance.sh new file mode 100755 index 0000000000..41405ef858 --- /dev/null +++ b/.kokoro/conformance.sh @@ -0,0 +1,65 @@ +#!/bin/bash +# Copyright 2023 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -eo pipefail + +## Get the directory of the build script +scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) +## cd to the parent directory, i.e. the root of the git repo +cd ${scriptDir}/.. + +# include common functions +source ${scriptDir}/common.sh + +# Print out Maven & Java version +mvn -version +echo ${JOB_TYPE} + +# attempt to install 3 times with exponential backoff (starting with 10 seconds) +retry_with_backoff 3 10 \ + mvn install -B -V -ntp \ + -DskipTests=true \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -Dmaven.javadoc.skip=true \ + -Dgcloud.download.skip=true \ + -T 1C + +RETURN_CODE=0 +set +e + +# Build and start the proxy in a separate process +pushd . +cd test-proxy +mvn clean install -DskipTests +nohup java -Dport=9999 -jar target/google-cloud-bigtable-test-proxy-0.0.1-SNAPSHOT.jar & +proxyPID=$! +popd + +# Run the conformance test +pushd . +cd cloud-bigtable-clients-test/tests +eval "go test -v -skip `cat ../../test-proxy/known_failures.txt` -proxy_addr=:9999" +RETURN_CODE=$? +popd + +# Stop the proxy +kill $proxyPID + +# fix output location of logs +bash .kokoro/coerce_logs.sh + +echo "exiting with ${RETURN_CODE}" +exit ${RETURN_CODE} diff --git a/test-proxy/known_failures.txt b/test-proxy/known_failures.txt new file mode 100644 index 0000000000..ba99db16b4 --- /dev/null +++ b/test-proxy/known_failures.txt @@ -0,0 +1 @@ +TestMutateRow_Generic_DeadlineExceeded\|TestMutateRows_Retry_ExponentialBackoff\|TestSampleRowKeys_Generic_DeadlineExceeded From d9afa06621c2c8c8074c8b02c09d4ee87a7b75cd Mon Sep 17 00:00:00 2001 From: kolea2 <45548808+kolea2@users.noreply.github.com> Date: Tue, 11 Apr 2023 11:04:12 -0400 Subject: [PATCH 07/20] samples: add delete samples (#1472) --- README.md | 7 + .../bigtable/deletes/BatchDeleteExample.java | 44 +++++ .../deletes/ConditionalDeleteExample.java | 39 ++++ .../deletes/DeleteColumnCellsExample.java | 34 ++++ .../deletes/DeleteColumnFamilyExample.java | 33 ++++ .../bigtable/deletes/DeleteRowExample.java | 33 ++++ .../bigtable/deletes/DeleteTableExample.java | 31 ++++ .../bigtable/deletes/DropRowRangeExample.java | 31 ++++ .../bigtable/MobileTimeSeriesBaseTest.java | 4 +- .../example/bigtable/deletes/DeletesTest.java | 173 ++++++++++++++++++ 10 files changed, 428 insertions(+), 1 deletion(-) create mode 100644 samples/snippets/src/main/java/com/example/bigtable/deletes/BatchDeleteExample.java create mode 100644 samples/snippets/src/main/java/com/example/bigtable/deletes/ConditionalDeleteExample.java create mode 100644 samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteColumnCellsExample.java create mode 100644 samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteColumnFamilyExample.java create mode 100644 samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteRowExample.java create mode 100644 samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteTableExample.java create mode 100644 samples/snippets/src/main/java/com/example/bigtable/deletes/DropRowRangeExample.java create mode 100644 samples/snippets/src/test/java/com/example/bigtable/deletes/DeletesTest.java diff --git a/README.md b/README.md index e3d8931d71..cb5dee5bd1 100644 --- a/README.md +++ b/README.md @@ -502,6 +502,13 @@ Samples are in the [`samples/`](https://github.com/googleapis/java-bigtable/tree | Write Conditionally | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/WriteConditionally.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/WriteConditionally.java) | | Write Increment | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/WriteIncrement.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/WriteIncrement.java) | | Write Simple | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/WriteSimple.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/WriteSimple.java) | +| Batch Delete Example | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/deletes/BatchDeleteExample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/deletes/BatchDeleteExample.java) | +| Conditional Delete Example | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/deletes/ConditionalDeleteExample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/deletes/ConditionalDeleteExample.java) | +| Delete Column Cells Example | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteColumnCellsExample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteColumnCellsExample.java) | +| Delete Column Family Example | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteColumnFamilyExample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteColumnFamilyExample.java) | +| Delete Row Example | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteRowExample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteRowExample.java) | +| Delete Table Example | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteTableExample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteTableExample.java) | +| Drop Row Range Example | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/deletes/DropRowRangeExample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/deletes/DropRowRangeExample.java) | diff --git a/samples/snippets/src/main/java/com/example/bigtable/deletes/BatchDeleteExample.java b/samples/snippets/src/main/java/com/example/bigtable/deletes/BatchDeleteExample.java new file mode 100644 index 0000000000..2b814c4e42 --- /dev/null +++ b/samples/snippets/src/main/java/com/example/bigtable/deletes/BatchDeleteExample.java @@ -0,0 +1,44 @@ +/* + * Copyright 2022 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.example.bigtable.deletes; + +// [START bigtable_streaming_and_batching] +import com.google.api.gax.batching.Batcher; +import com.google.api.gax.rpc.ServerStream; +import com.google.cloud.bigtable.data.v2.BigtableDataClient; +import com.google.cloud.bigtable.data.v2.models.Query; +import com.google.cloud.bigtable.data.v2.models.Row; +import com.google.cloud.bigtable.data.v2.models.RowMutationEntry; +import java.io.IOException; + +public class BatchDeleteExample { + public void batchDelete(String projectId, String instanceId, String tableId) + throws InterruptedException, IOException { + try (BigtableDataClient dataClient = BigtableDataClient.create(projectId, instanceId)) { + try (Batcher batcher = dataClient.newBulkMutationBatcher(tableId)) { + ServerStream rows = dataClient.readRows(Query.create(tableId)); + for (Row row : rows) { + batcher.add( + RowMutationEntry.create(row.getKey()).deleteCells("cell_plan", "data_plan_05gb")); + } + // Blocks until mutations are applied on all submitted row entries. + batcher.flush(); + } + } + } +} +// [END bigtable_streaming_and_batching] diff --git a/samples/snippets/src/main/java/com/example/bigtable/deletes/ConditionalDeleteExample.java b/samples/snippets/src/main/java/com/example/bigtable/deletes/ConditionalDeleteExample.java new file mode 100644 index 0000000000..4fac36404c --- /dev/null +++ b/samples/snippets/src/main/java/com/example/bigtable/deletes/ConditionalDeleteExample.java @@ -0,0 +1,39 @@ +/* + * Copyright 2022 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.example.bigtable.deletes; + +// [START bigtable_delete_check_and_mutate] +import com.google.cloud.bigtable.data.v2.BigtableDataClient; +import com.google.cloud.bigtable.data.v2.models.ConditionalRowMutation; +import com.google.cloud.bigtable.data.v2.models.Filters; +import com.google.cloud.bigtable.data.v2.models.Mutation; +import java.io.IOException; + +public class ConditionalDeleteExample { + public void conditionalDelete(String projectId, String instanceId, String tableId) + throws IOException { + try (BigtableDataClient dataClient = BigtableDataClient.create(projectId, instanceId)) { + Filters.Filter condition = Filters.FILTERS.value().exactMatch("PQ2A.190405.004"); + Mutation mutation = Mutation.create().deleteCells("stats_summary", "os_build"); + dataClient.checkAndMutateRow( + ConditionalRowMutation.create(tableId, "phone#4c410523#20190502") + .condition(condition) + .then(mutation)); + } + } +} +// [END bigtable_delete_check_and_mutate] diff --git a/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteColumnCellsExample.java b/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteColumnCellsExample.java new file mode 100644 index 0000000000..eefc4e1d84 --- /dev/null +++ b/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteColumnCellsExample.java @@ -0,0 +1,34 @@ +/* + * Copyright 2022 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.example.bigtable.deletes; + +// [START bigtable_delete_from_column] +import com.google.cloud.bigtable.data.v2.BigtableDataClient; +import com.google.cloud.bigtable.data.v2.models.Mutation; +import com.google.cloud.bigtable.data.v2.models.RowMutation; +import java.io.IOException; + +public class DeleteColumnCellsExample { + public void deleteColumnCells(String projectId, String instanceId, String tableId) + throws IOException { + try (BigtableDataClient dataClient = BigtableDataClient.create(projectId, instanceId)) { + Mutation mutation = Mutation.create().deleteCells("cell_plan", "data_plan_01gb"); + dataClient.mutateRow(RowMutation.create(tableId, "phone#4c410523#20190501", mutation)); + } + } +} +// [END bigtable_delete_from_column] diff --git a/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteColumnFamilyExample.java b/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteColumnFamilyExample.java new file mode 100644 index 0000000000..556c842cf6 --- /dev/null +++ b/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteColumnFamilyExample.java @@ -0,0 +1,33 @@ +/* + * Copyright 2022 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.example.bigtable.deletes; + +// [START bigtable_delete_column_family] +import com.google.cloud.bigtable.data.v2.BigtableDataClient; +import com.google.cloud.bigtable.data.v2.models.RowMutation; +import java.io.IOException; + +public class DeleteColumnFamilyExample { + public void deleteColumnFamily(String projectId, String instanceId, String tableId) + throws IOException { + try (BigtableDataClient dataClient = BigtableDataClient.create(projectId, instanceId)) { + dataClient.mutateRow( + RowMutation.create(tableId, "phone#5c10102#20190501").deleteFamily("stats_summary")); + } + } +} +// [END bigtable_delete_column_family] diff --git a/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteRowExample.java b/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteRowExample.java new file mode 100644 index 0000000000..9607a17079 --- /dev/null +++ b/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteRowExample.java @@ -0,0 +1,33 @@ +/* + * Copyright 2022 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.example.bigtable.deletes; + +// [START bigtable_delete_from_row] +import com.google.cloud.bigtable.data.v2.BigtableDataClient; +import com.google.cloud.bigtable.data.v2.models.Mutation; +import com.google.cloud.bigtable.data.v2.models.RowMutation; +import java.io.IOException; + +public class DeleteRowExample { + public void deleteRow(String projectId, String instanceId, String tableId) throws IOException { + try (BigtableDataClient dataClient = BigtableDataClient.create(projectId, instanceId)) { + Mutation mutation = Mutation.create().deleteRow(); + dataClient.mutateRow(RowMutation.create(tableId, "phone#4c410523#20190501", mutation)); + } + } +} +// [END bigtable_delete_from_row] diff --git a/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteTableExample.java b/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteTableExample.java new file mode 100644 index 0000000000..bdded5fbef --- /dev/null +++ b/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteTableExample.java @@ -0,0 +1,31 @@ +/* + * Copyright 2022 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.example.bigtable.deletes; + +// [START bigtable_delete_table] +import com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient; +import java.io.IOException; + +public class DeleteTableExample { + public void deleteTable(String projectId, String instanceId, String tableId) throws IOException { + try (BigtableTableAdminClient tableAdminClient = + BigtableTableAdminClient.create(projectId, instanceId)) { + tableAdminClient.deleteTable(tableId); + } + } +} +// [END bigtable_delete_table] diff --git a/samples/snippets/src/main/java/com/example/bigtable/deletes/DropRowRangeExample.java b/samples/snippets/src/main/java/com/example/bigtable/deletes/DropRowRangeExample.java new file mode 100644 index 0000000000..0575fb38ec --- /dev/null +++ b/samples/snippets/src/main/java/com/example/bigtable/deletes/DropRowRangeExample.java @@ -0,0 +1,31 @@ +/* + * Copyright 2022 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.example.bigtable.deletes; + +// [START bigtable_drop_row_range] +import com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient; +import java.io.IOException; + +public class DropRowRangeExample { + public void dropRowRange(String projectId, String instanceId, String tableId) throws IOException { + try (BigtableTableAdminClient tableAdminClient = + BigtableTableAdminClient.create(projectId, instanceId)) { + tableAdminClient.dropRowRange(tableId, "phone#4c410523"); + } + } +} +// [END bigtable_drop_row_range] diff --git a/samples/snippets/src/test/java/com/example/bigtable/MobileTimeSeriesBaseTest.java b/samples/snippets/src/test/java/com/example/bigtable/MobileTimeSeriesBaseTest.java index c31ec11ce2..00aec60498 100644 --- a/samples/snippets/src/test/java/com/example/bigtable/MobileTimeSeriesBaseTest.java +++ b/samples/snippets/src/test/java/com/example/bigtable/MobileTimeSeriesBaseTest.java @@ -170,7 +170,9 @@ public static void writePlanData() throws IOException { public static void cleanupTable() throws IOException { try (BigtableTableAdminClient adminClient = BigtableTableAdminClient.create(projectId, instanceId)) { - adminClient.deleteTable(TABLE_ID); + if (adminClient.exists(TABLE_ID)) { + adminClient.deleteTable(TABLE_ID); + } } catch (Exception e) { System.out.println("Error during afterClass: \n" + e.toString()); throw (e); diff --git a/samples/snippets/src/test/java/com/example/bigtable/deletes/DeletesTest.java b/samples/snippets/src/test/java/com/example/bigtable/deletes/DeletesTest.java new file mode 100644 index 0000000000..4ac12c1e47 --- /dev/null +++ b/samples/snippets/src/test/java/com/example/bigtable/deletes/DeletesTest.java @@ -0,0 +1,173 @@ +/* + * Copyright 2022 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.example.bigtable.deletes; + +import com.example.bigtable.MobileTimeSeriesBaseTest; +import com.google.api.gax.rpc.ServerStream; +import com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient; +import com.google.cloud.bigtable.data.v2.BigtableDataClient; +import com.google.cloud.bigtable.data.v2.models.Query; +import com.google.cloud.bigtable.data.v2.models.Row; +import com.google.cloud.bigtable.data.v2.models.RowCell; +import com.google.common.truth.Truth; +import java.io.IOException; +import java.util.List; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; + +/* + * These tests are order dependent because they delete rows and cells from a table. + * They are prefixed with `testN_` to signal the order in which they should run. + */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +public class DeletesTest extends MobileTimeSeriesBaseTest { + public static BigtableDataClient bigtableDataClient; + + @BeforeClass + public static void beforeClass() throws IOException { + initializeVariables(); + createTable(); + writeStatsData(); + writePlanData(); + bigtableDataClient = BigtableDataClient.create(projectId, instanceId); + } + + @AfterClass + public static void afterClass() throws IOException { + cleanupTable(); + } + + @Test + public void test1_testDeleteFromColumn() throws IOException { + String rowKey = "phone#4c410523#20190501"; + Row row = bigtableDataClient.readRow(TABLE_ID, rowKey); + String qualifier = "data_plan_01gb"; + List cells = row.getCells(COLUMN_FAMILY_NAME_PLAN, qualifier); + + Truth.assertThat(cells).isNotEmpty(); + + DeleteColumnCellsExample deleteColumnCellsExample = new DeleteColumnCellsExample(); + deleteColumnCellsExample.deleteColumnCells(projectId, instanceId, TABLE_ID); + row = bigtableDataClient.readRow(TABLE_ID, rowKey); + List cellsAfterDelete = row.getCells(COLUMN_FAMILY_NAME_PLAN, qualifier); + + Truth.assertThat(cellsAfterDelete).isEmpty(); + } + + @Test + public void test2_testDeleteFromRow() throws IOException { + String rowKey = "phone#4c410523#20190501"; + Row row = bigtableDataClient.readRow(TABLE_ID, rowKey); + + Truth.assertThat(row).isNotNull(); + + DeleteRowExample deleteRowExample = new DeleteRowExample(); + deleteRowExample.deleteRow(projectId, instanceId, TABLE_ID); + row = bigtableDataClient.readRow(TABLE_ID, rowKey); + + Truth.assertThat(row).isNull(); + } + + @Test + public void test3_testStreamingAndBatching() throws IOException, InterruptedException { + String rowKey = "phone#4c410523#20190502"; + Row row = bigtableDataClient.readRow(TABLE_ID, rowKey); + String qualifier = "data_plan_05gb"; + List cells = row.getCells(COLUMN_FAMILY_NAME_PLAN, qualifier); + + Truth.assertThat(cells).isNotEmpty(); + + BatchDeleteExample batchDeleteExample = new BatchDeleteExample(); + batchDeleteExample.batchDelete(projectId, instanceId, TABLE_ID); + row = bigtableDataClient.readRow(TABLE_ID, rowKey); + List cellsAfterDelete = row.getCells(COLUMN_FAMILY_NAME_PLAN, qualifier); + + Truth.assertThat(cellsAfterDelete).isEmpty(); + } + + @Test + public void test4_testCheckAndMutate() throws IOException { + String rowKey = "phone#4c410523#20190502"; + Row row = bigtableDataClient.readRow(TABLE_ID, rowKey); + String qualifier = "os_build"; + List cells = row.getCells(COLUMN_FAMILY_NAME_STATS, qualifier); + + Truth.assertThat(cells).isNotEmpty(); + + ConditionalDeleteExample conditionalDeleteExample = new ConditionalDeleteExample(); + conditionalDeleteExample.conditionalDelete(projectId, instanceId, TABLE_ID); + row = bigtableDataClient.readRow(TABLE_ID, rowKey); + List cellsAfterDelete = row.getCells(COLUMN_FAMILY_NAME_STATS, qualifier); + + Truth.assertThat(cellsAfterDelete).isEmpty(); + } + + @Test + public void test5_testDropRowRange() throws IOException { + String rowPrefix = "phone#4c410523"; + Query query = Query.create(TABLE_ID).prefix(rowPrefix); + ServerStream rows = bigtableDataClient.readRows(query); + int rowCount = 0; + for (Row ignored : rows) { + rowCount++; + } + + Truth.assertThat(rowCount).isGreaterThan(1); + + DropRowRangeExample dropRowRangeExample = new DropRowRangeExample(); + dropRowRangeExample.dropRowRange(projectId, instanceId, TABLE_ID); + rows = bigtableDataClient.readRows(query); + rowCount = 0; + for (Row ignored : rows) { + rowCount++; + } + + Truth.assertThat(rowCount).isEqualTo(0); + } + + @Test + public void test6_testDeleteColumnFamily() throws IOException { + String rowKey = "phone#5c10102#20190501"; + Row row = bigtableDataClient.readRow(TABLE_ID, rowKey); + List cells = row.getCells(COLUMN_FAMILY_NAME_STATS); + + Truth.assertThat(cells).isNotEmpty(); + + DeleteColumnFamilyExample deleteColumnFamilyExample = new DeleteColumnFamilyExample(); + deleteColumnFamilyExample.deleteColumnFamily(projectId, instanceId, TABLE_ID); + row = bigtableDataClient.readRow(TABLE_ID, rowKey); + List cellsAfterDelete = row.getCells(COLUMN_FAMILY_NAME_STATS); + + Truth.assertThat(cellsAfterDelete).isEmpty(); + } + + @Test + public void test7_testDeleteTable() throws IOException { + try (BigtableTableAdminClient tableAdminClient = + BigtableTableAdminClient.create(projectId, instanceId)) { + Truth.assertThat(tableAdminClient.exists(TABLE_ID)).isTrue(); + + DeleteTableExample deleteTableExample = new DeleteTableExample(); + deleteTableExample.deleteTable(projectId, instanceId, TABLE_ID); + + Truth.assertThat(tableAdminClient.exists(TABLE_ID)).isFalse(); + } + } +} From 1fd13ba9fdfa0322ee419f405c92ebe3979d85c7 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 11 Apr 2023 18:34:42 +0100 Subject: [PATCH 08/20] deps: update actions/setup-go action to v4 (#1700) --- .github/workflows/conformance.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml index b17c0014e6..66d9c10c71 100644 --- a/.github/workflows/conformance.yaml +++ b/.github/workflows/conformance.yaml @@ -33,7 +33,7 @@ jobs: with: distribution: zulu java-version: 8 - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: go-version: '>=1.20.2' - run: java -version From 392fc697b9b75d172ba5bfd98ead45a6074c47f7 Mon Sep 17 00:00:00 2001 From: kolea2 <45548808+kolea2@users.noreply.github.com> Date: Tue, 11 Apr 2023 16:50:16 -0400 Subject: [PATCH 09/20] deps: upgrade maven-enforcer-plugin to 3.3.0, remove duplicate entry in pom (#1702) --- google-cloud-bigtable/pom.xml | 49 +++++++++++++++-------------------- 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index d597e3b904..6ec91a1d4a 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -607,33 +607,6 @@ - - org.apache.maven.plugins - maven-enforcer-plugin - 3.1.0 - - - enforce-declared-grpc-and-proto-version - - enforce - - - - - - io.grpc:*:[${grpc.version}] - com.google.protobuf:*:[${protobuf.version}] - - - io.grpc:* - com.google.protobuf:* - - - - - - - org.xolstice.maven.plugins protobuf-maven-plugin @@ -678,7 +651,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.2.1 + 3.3.0 @@ -704,6 +677,26 @@ enforce + + enforce-declared-grpc-and-proto-version + + enforce + + + + + + io.grpc:*:[${grpc.version}] + com.google.protobuf:*:[${protobuf.version}] + + + io.grpc:* + com.google.protobuf:* + + + + + If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-bigtable). --- samples/native-image-sample/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml index 4595367595..ccb9384a29 100644 --- a/samples/native-image-sample/pom.xml +++ b/samples/native-image-sample/pom.xml @@ -99,7 +99,7 @@ org.graalvm.buildtools native-maven-plugin - 0.9.20 + 0.9.21 true com.example.bigtable.NativeImageBigtableSample From d60c94630f60d01241eecf9e3061ed197435b55e Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 12 Apr 2023 16:04:13 +0100 Subject: [PATCH 12/20] deps: update dependency org.graalvm.buildtools:junit-platform-native to v0.9.21 (#1704) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.graalvm.buildtools:junit-platform-native](https://togithub.com/graalvm/native-build-tools) | `0.9.20` -> `0.9.21` | [![age](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.21/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.21/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.21/compatibility-slim/0.9.20)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.21/confidence-slim/0.9.20)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-bigtable). --- samples/native-image-sample/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml index ccb9384a29..bd4382f8cf 100644 --- a/samples/native-image-sample/pom.xml +++ b/samples/native-image-sample/pom.xml @@ -89,7 +89,7 @@ org.graalvm.buildtools junit-platform-native - 0.9.20 + 0.9.21 test From 6412d73984e6ecd7fade89d151a9677fdb088b64 Mon Sep 17 00:00:00 2001 From: kolea2 <45548808+kolea2@users.noreply.github.com> Date: Wed, 12 Apr 2023 12:52:13 -0400 Subject: [PATCH 13/20] chore: remove enforce-declared-grpc-and-proto-version enforcer check (#1706) --- google-cloud-bigtable/pom.xml | 32 +++++--------------------------- renovate.json | 4 ++-- 2 files changed, 7 insertions(+), 29 deletions(-) diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index 6ec91a1d4a..d979d68a2a 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -37,11 +37,9 @@ Also, this property will be augmented by `internal-bigtable-prod-batch-it-prop-helper` profile --> batch-bigtable.googleapis.com:443 - - 1.54.0 - 3.21.12 - ${protobuf.version} + + 1.54.0 + 3.21.12 @@ -621,11 +619,11 @@ - com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier} + com.google.protobuf:protoc:${test-protoc.version}:exe:${os.detected.classifier} grpc-java - io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier} + io.grpc:protoc-gen-grpc-java:${test-protoc-grpc.version}:exe:${os.detected.classifier} @@ -677,26 +675,6 @@ enforce - - enforce-declared-grpc-and-proto-version - - enforce - - - - - - io.grpc:*:[${grpc.version}] - com.google.protobuf:*:[${protobuf.version}] - - - io.grpc:* - com.google.protobuf:* - - - - - If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-bigtable). --- google-cloud-bigtable-deps-bom/pom.xml | 2 +- google-cloud-bigtable/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml index 721089397a..83c3b5504d 100644 --- a/google-cloud-bigtable-deps-bom/pom.xml +++ b/google-cloud-bigtable-deps-bom/pom.xml @@ -66,7 +66,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.6.0 + 3.7.0 pom import diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index d979d68a2a..248cc37196 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -39,7 +39,7 @@ 1.54.0 - 3.21.12 + 3.22.2 From 4d1165338b26058d0527d7ec45667a0ecbe8b83b Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 13 Apr 2023 16:12:37 +0100 Subject: [PATCH 15/20] deps: update dependency com.google.protobuf:protoc to v3.22.3 (#1707) --- google-cloud-bigtable/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index 248cc37196..561af17b52 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -39,7 +39,7 @@ 1.54.0 - 3.22.2 + 3.22.3 From ce0799b01f70c213b4c4d766bda434a07497e6ce Mon Sep 17 00:00:00 2001 From: kolea2 <45548808+kolea2@users.noreply.github.com> Date: Thu, 13 Apr 2023 13:43:44 -0400 Subject: [PATCH 16/20] chore: have renovate label protoc and protoc grpc as test deps (#1709) * chore: have renovate label protoc and protoc grpc as test deps * remove space --- renovate.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 9fd48e3541..a5826e23a4 100644 --- a/renovate.json +++ b/renovate.json @@ -52,7 +52,9 @@ "^com.google.truth:truth", "^org.mockito:mockito-core", "^org.objenesis:objenesis", - "^com.google.cloud:google-cloud-conformance-tests" + "^com.google.cloud:google-cloud-conformance-tests", + "^io.grpc:protoc-gen-grpc-java", + "^com.google.protobuf:protoc" ], "semanticCommitType": "test", "semanticCommitScope": "deps" From 2d80188c65f454e037b758426b8747b5992db0de Mon Sep 17 00:00:00 2001 From: Billy Jacobson Date: Thu, 13 Apr 2023 15:43:51 -0400 Subject: [PATCH 17/20] docs: make delete examples consistent with other languages (#1710) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: make delete examples consistent with other languages * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- README.md | 5 +-- .../deletes/DeleteColumnFamilyExample.java | 18 +++++----- ...mple.java => DeleteFromColumnExample.java} | 4 +-- .../DeleteFromColumnFamilyExample.java | 33 +++++++++++++++++++ ...Example.java => DeleteFromRowExample.java} | 5 +-- .../example/bigtable/deletes/DeletesTest.java | 31 ++++++++++++----- 6 files changed, 74 insertions(+), 22 deletions(-) rename samples/snippets/src/main/java/com/example/bigtable/deletes/{DeleteColumnCellsExample.java => DeleteFromColumnExample.java} (90%) create mode 100644 samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteFromColumnFamilyExample.java rename samples/snippets/src/main/java/com/example/bigtable/deletes/{DeleteRowExample.java => DeleteFromRowExample.java} (88%) diff --git a/README.md b/README.md index cb5dee5bd1..17a6c823e6 100644 --- a/README.md +++ b/README.md @@ -504,9 +504,10 @@ Samples are in the [`samples/`](https://github.com/googleapis/java-bigtable/tree | Write Simple | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/WriteSimple.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/WriteSimple.java) | | Batch Delete Example | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/deletes/BatchDeleteExample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/deletes/BatchDeleteExample.java) | | Conditional Delete Example | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/deletes/ConditionalDeleteExample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/deletes/ConditionalDeleteExample.java) | -| Delete Column Cells Example | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteColumnCellsExample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteColumnCellsExample.java) | | Delete Column Family Example | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteColumnFamilyExample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteColumnFamilyExample.java) | -| Delete Row Example | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteRowExample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteRowExample.java) | +| Delete From Column Example | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteFromColumnExample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteFromColumnExample.java) | +| Delete From Column Family Example | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteFromColumnFamilyExample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteFromColumnFamilyExample.java) | +| Delete From Row Example | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteFromRowExample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteFromRowExample.java) | | Delete Table Example | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteTableExample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteTableExample.java) | | Drop Row Range Example | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/deletes/DropRowRangeExample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/deletes/DropRowRangeExample.java) | diff --git a/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteColumnFamilyExample.java b/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteColumnFamilyExample.java index 556c842cf6..e3648fb0a1 100644 --- a/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteColumnFamilyExample.java +++ b/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteColumnFamilyExample.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 Google LLC + * Copyright 2023 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,16 +17,18 @@ package com.example.bigtable.deletes; // [START bigtable_delete_column_family] -import com.google.cloud.bigtable.data.v2.BigtableDataClient; -import com.google.cloud.bigtable.data.v2.models.RowMutation; +import com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient; +import com.google.cloud.bigtable.admin.v2.models.ModifyColumnFamiliesRequest; import java.io.IOException; public class DeleteColumnFamilyExample { - public void deleteColumnFamily(String projectId, String instanceId, String tableId) - throws IOException { - try (BigtableDataClient dataClient = BigtableDataClient.create(projectId, instanceId)) { - dataClient.mutateRow( - RowMutation.create(tableId, "phone#5c10102#20190501").deleteFamily("stats_summary")); + public void deleteColumnFamily( + String projectId, String instanceId, String tableId, String columnFamily) throws IOException { + try (BigtableTableAdminClient tableAdminClient = + BigtableTableAdminClient.create(projectId, instanceId)) { + ModifyColumnFamiliesRequest modifyColumnFamiliesRequest = + ModifyColumnFamiliesRequest.of(tableId).dropFamily(columnFamily); + tableAdminClient.modifyFamilies(modifyColumnFamiliesRequest); } } } diff --git a/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteColumnCellsExample.java b/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteFromColumnExample.java similarity index 90% rename from samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteColumnCellsExample.java rename to samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteFromColumnExample.java index eefc4e1d84..7403272d19 100644 --- a/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteColumnCellsExample.java +++ b/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteFromColumnExample.java @@ -22,8 +22,8 @@ import com.google.cloud.bigtable.data.v2.models.RowMutation; import java.io.IOException; -public class DeleteColumnCellsExample { - public void deleteColumnCells(String projectId, String instanceId, String tableId) +public class DeleteFromColumnExample { + public void deleteFromColumnCells(String projectId, String instanceId, String tableId) throws IOException { try (BigtableDataClient dataClient = BigtableDataClient.create(projectId, instanceId)) { Mutation mutation = Mutation.create().deleteCells("cell_plan", "data_plan_01gb"); diff --git a/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteFromColumnFamilyExample.java b/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteFromColumnFamilyExample.java new file mode 100644 index 0000000000..db89c04e4b --- /dev/null +++ b/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteFromColumnFamilyExample.java @@ -0,0 +1,33 @@ +/* + * Copyright 2022 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.example.bigtable.deletes; + +// [START bigtable_delete_from_column_family] +import com.google.cloud.bigtable.data.v2.BigtableDataClient; +import com.google.cloud.bigtable.data.v2.models.RowMutation; +import java.io.IOException; + +public class DeleteFromColumnFamilyExample { + public void deleteFromColumnFamily(String projectId, String instanceId, String tableId) + throws IOException { + try (BigtableDataClient dataClient = BigtableDataClient.create(projectId, instanceId)) { + dataClient.mutateRow( + RowMutation.create(tableId, "phone#5c10102#20190501").deleteFamily("stats_summary")); + } + } +} +// [END bigtable_delete_from_column_family] diff --git a/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteRowExample.java b/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteFromRowExample.java similarity index 88% rename from samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteRowExample.java rename to samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteFromRowExample.java index 9607a17079..029298497f 100644 --- a/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteRowExample.java +++ b/samples/snippets/src/main/java/com/example/bigtable/deletes/DeleteFromRowExample.java @@ -22,8 +22,9 @@ import com.google.cloud.bigtable.data.v2.models.RowMutation; import java.io.IOException; -public class DeleteRowExample { - public void deleteRow(String projectId, String instanceId, String tableId) throws IOException { +public class DeleteFromRowExample { + public void deleteFromRow(String projectId, String instanceId, String tableId) + throws IOException { try (BigtableDataClient dataClient = BigtableDataClient.create(projectId, instanceId)) { Mutation mutation = Mutation.create().deleteRow(); dataClient.mutateRow(RowMutation.create(tableId, "phone#4c410523#20190501", mutation)); diff --git a/samples/snippets/src/test/java/com/example/bigtable/deletes/DeletesTest.java b/samples/snippets/src/test/java/com/example/bigtable/deletes/DeletesTest.java index 4ac12c1e47..bff3c74a1f 100644 --- a/samples/snippets/src/test/java/com/example/bigtable/deletes/DeletesTest.java +++ b/samples/snippets/src/test/java/com/example/bigtable/deletes/DeletesTest.java @@ -63,8 +63,8 @@ public void test1_testDeleteFromColumn() throws IOException { Truth.assertThat(cells).isNotEmpty(); - DeleteColumnCellsExample deleteColumnCellsExample = new DeleteColumnCellsExample(); - deleteColumnCellsExample.deleteColumnCells(projectId, instanceId, TABLE_ID); + DeleteFromColumnExample deleteFromColumnExample = new DeleteFromColumnExample(); + deleteFromColumnExample.deleteFromColumnCells(projectId, instanceId, TABLE_ID); row = bigtableDataClient.readRow(TABLE_ID, rowKey); List cellsAfterDelete = row.getCells(COLUMN_FAMILY_NAME_PLAN, qualifier); @@ -78,8 +78,8 @@ public void test2_testDeleteFromRow() throws IOException { Truth.assertThat(row).isNotNull(); - DeleteRowExample deleteRowExample = new DeleteRowExample(); - deleteRowExample.deleteRow(projectId, instanceId, TABLE_ID); + DeleteFromRowExample deleteFromRowExample = new DeleteFromRowExample(); + deleteFromRowExample.deleteFromRow(projectId, instanceId, TABLE_ID); row = bigtableDataClient.readRow(TABLE_ID, rowKey); Truth.assertThat(row).isNull(); @@ -143,15 +143,16 @@ public void test5_testDropRowRange() throws IOException { } @Test - public void test6_testDeleteColumnFamily() throws IOException { + public void test6_testDeleteFromColumnFamily() throws IOException { String rowKey = "phone#5c10102#20190501"; Row row = bigtableDataClient.readRow(TABLE_ID, rowKey); List cells = row.getCells(COLUMN_FAMILY_NAME_STATS); Truth.assertThat(cells).isNotEmpty(); - DeleteColumnFamilyExample deleteColumnFamilyExample = new DeleteColumnFamilyExample(); - deleteColumnFamilyExample.deleteColumnFamily(projectId, instanceId, TABLE_ID); + DeleteFromColumnFamilyExample deleteFromColumnFamilyExample = + new DeleteFromColumnFamilyExample(); + deleteFromColumnFamilyExample.deleteFromColumnFamily(projectId, instanceId, TABLE_ID); row = bigtableDataClient.readRow(TABLE_ID, rowKey); List cellsAfterDelete = row.getCells(COLUMN_FAMILY_NAME_STATS); @@ -159,7 +160,21 @@ public void test6_testDeleteColumnFamily() throws IOException { } @Test - public void test7_testDeleteTable() throws IOException { + public void test7_testDeleteColumnFamily() throws IOException { + try (BigtableTableAdminClient tableAdminClient = + BigtableTableAdminClient.create(projectId, instanceId)) { + Truth.assertThat(tableAdminClient.getTable(TABLE_ID).getColumnFamilies().size()).isEqualTo(2); + + DeleteColumnFamilyExample deleteColumnFamilyExample = new DeleteColumnFamilyExample(); + deleteColumnFamilyExample.deleteColumnFamily( + projectId, instanceId, TABLE_ID, COLUMN_FAMILY_NAME_STATS); + + Truth.assertThat(tableAdminClient.getTable(TABLE_ID).getColumnFamilies().size()).isEqualTo(1); + } + } + + @Test + public void test8_testDeleteTable() throws IOException { try (BigtableTableAdminClient tableAdminClient = BigtableTableAdminClient.create(projectId, instanceId)) { Truth.assertThat(tableAdminClient.exists(TABLE_ID)).isTrue(); From f3bb088cd670805e5c6975e7154ee7e1e320acc6 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 17 Apr 2023 14:33:13 +0100 Subject: [PATCH 18/20] deps: update dependency com.google.cloud:google-cloud-monitoring-bom to v3.16.0 (#1712) --- google-cloud-bigtable-deps-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml index 83c3b5504d..633d7724df 100644 --- a/google-cloud-bigtable-deps-bom/pom.xml +++ b/google-cloud-bigtable-deps-bom/pom.xml @@ -73,7 +73,7 @@ com.google.cloud google-cloud-monitoring-bom - 3.15.0 + 3.16.0 From 10de838ec80a6e71550dc482578491762eb23062 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 17 Apr 2023 14:33:31 +0100 Subject: [PATCH 19/20] test(deps): update dependency io.grpc:protoc-gen-grpc-java to v1.54.1 (#1713) --- google-cloud-bigtable/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index 561af17b52..16f626f2d1 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -38,7 +38,7 @@ batch-bigtable.googleapis.com:443 - 1.54.0 + 1.54.1 3.22.3 From 446b60b65a390ea57d9c1c828f609f0e794aea8a Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 17 Apr 2023 13:54:44 +0000 Subject: [PATCH 20/20] chore(main): release 2.20.4 (#1701) :robot: I have created a release *beep* *boop* --- ## [2.20.4](https://togithub.com/googleapis/java-bigtable/compare/v2.20.3...v2.20.4) (2023-04-17) ### Documentation * Make delete examples consistent with other languages ([#1710](https://togithub.com/googleapis/java-bigtable/issues/1710)) ([2d80188](https://togithub.com/googleapis/java-bigtable/commit/2d80188c65f454e037b758426b8747b5992db0de)) ### Dependencies * Update actions/setup-go action to v4 ([#1700](https://togithub.com/googleapis/java-bigtable/issues/1700)) ([1fd13ba](https://togithub.com/googleapis/java-bigtable/commit/1fd13ba9fdfa0322ee419f405c92ebe3979d85c7)) * Update dependency com.google.cloud:google-cloud-monitoring-bom to v3.16.0 ([#1712](https://togithub.com/googleapis/java-bigtable/issues/1712)) ([f3bb088](https://togithub.com/googleapis/java-bigtable/commit/f3bb088cd670805e5c6975e7154ee7e1e320acc6)) * Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.21 ([#1704](https://togithub.com/googleapis/java-bigtable/issues/1704)) ([d60c946](https://togithub.com/googleapis/java-bigtable/commit/d60c94630f60d01241eecf9e3061ed197435b55e)) * Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.21 ([#1705](https://togithub.com/googleapis/java-bigtable/issues/1705)) ([8f3d69d](https://togithub.com/googleapis/java-bigtable/commit/8f3d69d2498a7c0b5f760a40054e17d07502764d)) * Update shared dependencies ([#1703](https://togithub.com/googleapis/java-bigtable/issues/1703)) ([076b411](https://togithub.com/googleapis/java-bigtable/commit/076b411b3c834c4ed1b98551f08befab78743c8f)) * Upgrade maven-enforcer-plugin to 3.3.0, remove duplicate entry in pom ([#1702](https://togithub.com/googleapis/java-bigtable/issues/1702)) ([392fc69](https://togithub.com/googleapis/java-bigtable/commit/392fc697b9b75d172ba5bfd98ead45a6074c47f7)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- CHANGELOG.md | 17 +++++++++++++++++ google-cloud-bigtable-bom/pom.xml | 18 +++++++++--------- google-cloud-bigtable-deps-bom/pom.xml | 2 +- google-cloud-bigtable-emulator-core/pom.xml | 4 ++-- google-cloud-bigtable-emulator/pom.xml | 10 +++++----- google-cloud-bigtable-stats/pom.xml | 6 +++--- google-cloud-bigtable/pom.xml | 10 +++++----- .../com/google/cloud/bigtable/Version.java | 2 +- grpc-google-cloud-bigtable-admin-v2/pom.xml | 8 ++++---- grpc-google-cloud-bigtable-v2/pom.xml | 8 ++++---- pom.xml | 12 ++++++------ proto-google-cloud-bigtable-admin-v2/pom.xml | 8 ++++---- proto-google-cloud-bigtable-v2/pom.xml | 8 ++++---- samples/snapshot/pom.xml | 2 +- test-proxy/pom.xml | 4 ++-- versions.txt | 14 +++++++------- 16 files changed, 75 insertions(+), 58 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3ed79caa1..64381fa247 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,22 @@ # Changelog +## [2.20.4](https://github.com/googleapis/java-bigtable/compare/v2.20.3...v2.20.4) (2023-04-17) + + +### Documentation + +* Make delete examples consistent with other languages ([#1710](https://github.com/googleapis/java-bigtable/issues/1710)) ([2d80188](https://github.com/googleapis/java-bigtable/commit/2d80188c65f454e037b758426b8747b5992db0de)) + + +### Dependencies + +* Update actions/setup-go action to v4 ([#1700](https://github.com/googleapis/java-bigtable/issues/1700)) ([1fd13ba](https://github.com/googleapis/java-bigtable/commit/1fd13ba9fdfa0322ee419f405c92ebe3979d85c7)) +* Update dependency com.google.cloud:google-cloud-monitoring-bom to v3.16.0 ([#1712](https://github.com/googleapis/java-bigtable/issues/1712)) ([f3bb088](https://github.com/googleapis/java-bigtable/commit/f3bb088cd670805e5c6975e7154ee7e1e320acc6)) +* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.21 ([#1704](https://github.com/googleapis/java-bigtable/issues/1704)) ([d60c946](https://github.com/googleapis/java-bigtable/commit/d60c94630f60d01241eecf9e3061ed197435b55e)) +* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.21 ([#1705](https://github.com/googleapis/java-bigtable/issues/1705)) ([8f3d69d](https://github.com/googleapis/java-bigtable/commit/8f3d69d2498a7c0b5f760a40054e17d07502764d)) +* Update shared dependencies ([#1703](https://github.com/googleapis/java-bigtable/issues/1703)) ([076b411](https://github.com/googleapis/java-bigtable/commit/076b411b3c834c4ed1b98551f08befab78743c8f)) +* Upgrade maven-enforcer-plugin to 3.3.0, remove duplicate entry in pom ([#1702](https://github.com/googleapis/java-bigtable/issues/1702)) ([392fc69](https://github.com/googleapis/java-bigtable/commit/392fc697b9b75d172ba5bfd98ead45a6074c47f7)) + ## [2.20.3](https://github.com/googleapis/java-bigtable/compare/v2.20.2...v2.20.3) (2023-04-03) diff --git a/google-cloud-bigtable-bom/pom.xml b/google-cloud-bigtable-bom/pom.xml index ab4701cc96..4d74b4af4b 100644 --- a/google-cloud-bigtable-bom/pom.xml +++ b/google-cloud-bigtable-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-bigtable-bom - 2.20.4-SNAPSHOT + 2.20.4 pom com.google.cloud @@ -63,42 +63,42 @@ com.google.cloud google-cloud-bigtable - 2.20.4-SNAPSHOT + 2.20.4 com.google.cloud google-cloud-bigtable-emulator - 0.157.4-SNAPSHOT + 0.157.4 com.google.cloud google-cloud-bigtable-emulator-core - 0.157.4-SNAPSHOT + 0.157.4 com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 2.20.4-SNAPSHOT + 2.20.4 com.google.api.grpc grpc-google-cloud-bigtable-v2 - 2.20.4-SNAPSHOT + 2.20.4 com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 2.20.4-SNAPSHOT + 2.20.4 com.google.api.grpc proto-google-cloud-bigtable-v2 - 2.20.4-SNAPSHOT + 2.20.4 com.google.cloud google-cloud-bigtable-stats - 2.20.4-SNAPSHOT + 2.20.4 diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml index 633d7724df..33afb68af8 100644 --- a/google-cloud-bigtable-deps-bom/pom.xml +++ b/google-cloud-bigtable-deps-bom/pom.xml @@ -13,7 +13,7 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.20.4-SNAPSHOT + 2.20.4 pom diff --git a/google-cloud-bigtable-emulator-core/pom.xml b/google-cloud-bigtable-emulator-core/pom.xml index 0cf50e9c9d..13ce1689ea 100644 --- a/google-cloud-bigtable-emulator-core/pom.xml +++ b/google-cloud-bigtable-emulator-core/pom.xml @@ -7,11 +7,11 @@ google-cloud-bigtable-parent com.google.cloud - 2.20.4-SNAPSHOT + 2.20.4 google-cloud-bigtable-emulator-core - 0.157.4-SNAPSHOT + 0.157.4 A Java wrapper for the Cloud Bigtable emulator. diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml index 318b789698..eec14844d2 100644 --- a/google-cloud-bigtable-emulator/pom.xml +++ b/google-cloud-bigtable-emulator/pom.xml @@ -5,7 +5,7 @@ 4.0.0 google-cloud-bigtable-emulator - 0.157.4-SNAPSHOT + 0.157.4 Google Cloud Java - Bigtable Emulator https://github.com/googleapis/java-bigtable @@ -14,7 +14,7 @@ com.google.cloud google-cloud-bigtable-parent - 2.20.4-SNAPSHOT + 2.20.4 scm:git:git@github.com:googleapis/java-bigtable.git @@ -81,14 +81,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.20.4-SNAPSHOT + 2.20.4 pom import com.google.cloud google-cloud-bigtable-bom - 2.20.4-SNAPSHOT + 2.20.4 pom import @@ -99,7 +99,7 @@ com.google.cloud google-cloud-bigtable-emulator-core - 0.157.4-SNAPSHOT + 0.157.4 diff --git a/google-cloud-bigtable-stats/pom.xml b/google-cloud-bigtable-stats/pom.xml index 30ea39f4fd..8ab2416a68 100644 --- a/google-cloud-bigtable-stats/pom.xml +++ b/google-cloud-bigtable-stats/pom.xml @@ -5,7 +5,7 @@ com.google.cloud google-cloud-bigtable-parent - 2.20.4-SNAPSHOT + 2.20.4 4.0.0 @@ -13,7 +13,7 @@ through Stackdriver. Built-in metrics will be implemented with shaded OpenCensus so it won't interfere with customer's application metrics. --> google-cloud-bigtable-stats - 2.20.4-SNAPSHOT + 2.20.4 Experimental project to shade OpenCensus dependencies. @@ -21,7 +21,7 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.20.4-SNAPSHOT + 2.20.4 pom import diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index 16f626f2d1..f6ebed4539 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-bigtable - 2.20.4-SNAPSHOT + 2.20.4 jar Google Cloud Bigtable https://github.com/googleapis/java-bigtable @@ -12,11 +12,11 @@ com.google.cloud google-cloud-bigtable-parent - 2.20.4-SNAPSHOT + 2.20.4 - 2.20.4-SNAPSHOT + 2.20.4 google-cloud-bigtable @@ -47,14 +47,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.20.4-SNAPSHOT + 2.20.4 pom import com.google.cloud google-cloud-bigtable-bom - 2.20.4-SNAPSHOT + 2.20.4 pom import diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java index 76837fd373..15a6384986 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java @@ -20,6 +20,6 @@ @InternalApi("For internal use only") public final class Version { // {x-version-update-start:google-cloud-bigtable:current} - public static String VERSION = "2.20.4-SNAPSHOT"; + public static String VERSION = "2.20.4"; // {x-version-update-end} } diff --git a/grpc-google-cloud-bigtable-admin-v2/pom.xml b/grpc-google-cloud-bigtable-admin-v2/pom.xml index 5a5f6c2576..79b2225c7d 100644 --- a/grpc-google-cloud-bigtable-admin-v2/pom.xml +++ b/grpc-google-cloud-bigtable-admin-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 2.20.4-SNAPSHOT + 2.20.4 grpc-google-cloud-bigtable-admin-v2 GRPC library for grpc-google-cloud-bigtable-admin-v2 com.google.cloud google-cloud-bigtable-parent - 2.20.4-SNAPSHOT + 2.20.4 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.20.4-SNAPSHOT + 2.20.4 pom import com.google.cloud google-cloud-bigtable-bom - 2.20.4-SNAPSHOT + 2.20.4 pom import diff --git a/grpc-google-cloud-bigtable-v2/pom.xml b/grpc-google-cloud-bigtable-v2/pom.xml index 7b6f78acf8..307b38fc5b 100644 --- a/grpc-google-cloud-bigtable-v2/pom.xml +++ b/grpc-google-cloud-bigtable-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigtable-v2 - 2.20.4-SNAPSHOT + 2.20.4 grpc-google-cloud-bigtable-v2 GRPC library for grpc-google-cloud-bigtable-v2 com.google.cloud google-cloud-bigtable-parent - 2.20.4-SNAPSHOT + 2.20.4 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.20.4-SNAPSHOT + 2.20.4 pom import com.google.cloud google-cloud-bigtable-bom - 2.20.4-SNAPSHOT + 2.20.4 pom import diff --git a/pom.xml b/pom.xml index 2737023e61..5c6c371293 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ google-cloud-bigtable-parent pom - 2.20.4-SNAPSHOT + 2.20.4 Google Cloud Bigtable Parent https://github.com/googleapis/java-bigtable @@ -153,27 +153,27 @@ com.google.api.grpc proto-google-cloud-bigtable-v2 - 2.20.4-SNAPSHOT + 2.20.4 com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 2.20.4-SNAPSHOT + 2.20.4 com.google.api.grpc grpc-google-cloud-bigtable-v2 - 2.20.4-SNAPSHOT + 2.20.4 com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 2.20.4-SNAPSHOT + 2.20.4 com.google.cloud google-cloud-bigtable - 2.20.4-SNAPSHOT + 2.20.4 diff --git a/proto-google-cloud-bigtable-admin-v2/pom.xml b/proto-google-cloud-bigtable-admin-v2/pom.xml index 2324a42087..20858f177c 100644 --- a/proto-google-cloud-bigtable-admin-v2/pom.xml +++ b/proto-google-cloud-bigtable-admin-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 2.20.4-SNAPSHOT + 2.20.4 proto-google-cloud-bigtable-admin-v2 PROTO library for proto-google-cloud-bigtable-admin-v2 com.google.cloud google-cloud-bigtable-parent - 2.20.4-SNAPSHOT + 2.20.4 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.20.4-SNAPSHOT + 2.20.4 pom import com.google.cloud google-cloud-bigtable-bom - 2.20.4-SNAPSHOT + 2.20.4 pom import diff --git a/proto-google-cloud-bigtable-v2/pom.xml b/proto-google-cloud-bigtable-v2/pom.xml index eb8bab2844..0d39f90ce3 100644 --- a/proto-google-cloud-bigtable-v2/pom.xml +++ b/proto-google-cloud-bigtable-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigtable-v2 - 2.20.4-SNAPSHOT + 2.20.4 proto-google-cloud-bigtable-v2 PROTO library for proto-google-cloud-bigtable-v2 com.google.cloud google-cloud-bigtable-parent - 2.20.4-SNAPSHOT + 2.20.4 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.20.4-SNAPSHOT + 2.20.4 pom import com.google.cloud google-cloud-bigtable-bom - 2.20.4-SNAPSHOT + 2.20.4 pom import diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index e639459f47..4cd895bf35 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-bigtable - 2.20.4-SNAPSHOT + 2.20.4 diff --git a/test-proxy/pom.xml b/test-proxy/pom.xml index ff587d5757..4f7d573104 100644 --- a/test-proxy/pom.xml +++ b/test-proxy/pom.xml @@ -12,11 +12,11 @@ google-cloud-bigtable-parent com.google.cloud - 2.20.4-SNAPSHOT + 2.20.4 - 2.20.4-SNAPSHOT + 2.20.4 diff --git a/versions.txt b/versions.txt index 448d319fd9..75d7eefd92 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -google-cloud-bigtable:2.20.3:2.20.4-SNAPSHOT -grpc-google-cloud-bigtable-admin-v2:2.20.3:2.20.4-SNAPSHOT -grpc-google-cloud-bigtable-v2:2.20.3:2.20.4-SNAPSHOT -proto-google-cloud-bigtable-admin-v2:2.20.3:2.20.4-SNAPSHOT -proto-google-cloud-bigtable-v2:2.20.3:2.20.4-SNAPSHOT -google-cloud-bigtable-emulator:0.157.3:0.157.4-SNAPSHOT -google-cloud-bigtable-emulator-core:2.20.3:2.20.4-SNAPSHOT +google-cloud-bigtable:2.20.4:2.20.4 +grpc-google-cloud-bigtable-admin-v2:2.20.4:2.20.4 +grpc-google-cloud-bigtable-v2:2.20.4:2.20.4 +proto-google-cloud-bigtable-admin-v2:2.20.4:2.20.4 +proto-google-cloud-bigtable-v2:2.20.4:2.20.4 +google-cloud-bigtable-emulator:0.157.4:0.157.4 +google-cloud-bigtable-emulator-core:2.20.4:2.20.4