From c24b1ce2c0e5642ca365e1ad5e4ab1a1c19996cb Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 1 Sep 2021 18:04:09 +0000 Subject: [PATCH 01/20] chore: release 2.1.2-SNAPSHOT (#979) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- google-cloud-bigtable-bom/pom.xml | 14 +++++++------- google-cloud-bigtable-deps-bom/pom.xml | 2 +- google-cloud-bigtable-emulator/pom.xml | 8 ++++---- google-cloud-bigtable/pom.xml | 10 +++++----- .../java/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 | 2 +- proto-google-cloud-bigtable-admin-v2/pom.xml | 8 ++++---- proto-google-cloud-bigtable-v2/pom.xml | 8 ++++---- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 12 files changed, 42 insertions(+), 42 deletions(-) diff --git a/google-cloud-bigtable-bom/pom.xml b/google-cloud-bigtable-bom/pom.xml index f27a8671ae..ba91d040fe 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.1.1 + 2.1.2-SNAPSHOT pom com.google.cloud @@ -62,32 +62,32 @@ com.google.cloud google-cloud-bigtable - 2.1.1 + 2.1.2-SNAPSHOT com.google.cloud google-cloud-bigtable-emulator - 0.138.1 + 0.138.2-SNAPSHOT com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 2.1.1 + 2.1.2-SNAPSHOT com.google.api.grpc grpc-google-cloud-bigtable-v2 - 2.1.1 + 2.1.2-SNAPSHOT com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 2.1.1 + 2.1.2-SNAPSHOT com.google.api.grpc proto-google-cloud-bigtable-v2 - 2.1.1 + 2.1.2-SNAPSHOT diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml index b2faf61b7f..c1b6111477 100644 --- a/google-cloud-bigtable-deps-bom/pom.xml +++ b/google-cloud-bigtable-deps-bom/pom.xml @@ -12,7 +12,7 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.1.1 + 2.1.2-SNAPSHOT pom diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml index 0e5da3dad3..1c4b993fa7 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.138.1 + 0.138.2-SNAPSHOT Google Cloud Java - Bigtable Emulator https://github.com/googleapis/java-bigtable @@ -14,7 +14,7 @@ com.google.cloud google-cloud-bigtable-parent - 2.1.1 + 2.1.2-SNAPSHOT scm:git:git@github.com:googleapis/java-bigtable.git @@ -80,14 +80,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.1.1 + 2.1.2-SNAPSHOT pom import com.google.cloud google-cloud-bigtable-bom - 2.1.1 + 2.1.2-SNAPSHOT pom import diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index de3ea31c92..c9d3959d7c 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-bigtable - 2.1.1 + 2.1.2-SNAPSHOT jar Google Cloud Bigtable https://github.com/googleapis/java-bigtable @@ -12,11 +12,11 @@ com.google.cloud google-cloud-bigtable-parent - 2.1.1 + 2.1.2-SNAPSHOT - 2.1.1 + 2.1.2-SNAPSHOT google-cloud-bigtable @@ -43,14 +43,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.1.1 + 2.1.2-SNAPSHOT pom import com.google.cloud google-cloud-bigtable-bom - 2.1.1 + 2.1.2-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 e9c6c070fc..47d1a92bcf 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.1.1"; + public static String VERSION = "2.1.2-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 3e2ad74895..3bf15b1d20 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.1.1 + 2.1.2-SNAPSHOT grpc-google-cloud-bigtable-admin-v2 GRPC library for grpc-google-cloud-bigtable-admin-v2 com.google.cloud google-cloud-bigtable-parent - 2.1.1 + 2.1.2-SNAPSHOT @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.1.1 + 2.1.2-SNAPSHOT pom import com.google.cloud google-cloud-bigtable-bom - 2.1.1 + 2.1.2-SNAPSHOT pom import diff --git a/grpc-google-cloud-bigtable-v2/pom.xml b/grpc-google-cloud-bigtable-v2/pom.xml index b3c13c9303..18ba0366eb 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.1.1 + 2.1.2-SNAPSHOT grpc-google-cloud-bigtable-v2 GRPC library for grpc-google-cloud-bigtable-v2 com.google.cloud google-cloud-bigtable-parent - 2.1.1 + 2.1.2-SNAPSHOT @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.1.1 + 2.1.2-SNAPSHOT pom import com.google.cloud google-cloud-bigtable-bom - 2.1.1 + 2.1.2-SNAPSHOT pom import diff --git a/pom.xml b/pom.xml index 3b43e1a715..a478766afa 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ google-cloud-bigtable-parent pom - 2.1.1 + 2.1.2-SNAPSHOT Google Cloud Bigtable Parent https://github.com/googleapis/java-bigtable diff --git a/proto-google-cloud-bigtable-admin-v2/pom.xml b/proto-google-cloud-bigtable-admin-v2/pom.xml index 35e7f32550..8c7a822a86 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.1.1 + 2.1.2-SNAPSHOT proto-google-cloud-bigtable-admin-v2 PROTO library for proto-google-cloud-bigtable-admin-v2 com.google.cloud google-cloud-bigtable-parent - 2.1.1 + 2.1.2-SNAPSHOT @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.1.1 + 2.1.2-SNAPSHOT pom import com.google.cloud google-cloud-bigtable-bom - 2.1.1 + 2.1.2-SNAPSHOT pom import diff --git a/proto-google-cloud-bigtable-v2/pom.xml b/proto-google-cloud-bigtable-v2/pom.xml index 69d7d08427..3b3eccf1d3 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.1.1 + 2.1.2-SNAPSHOT proto-google-cloud-bigtable-v2 PROTO library for proto-google-cloud-bigtable-v2 com.google.cloud google-cloud-bigtable-parent - 2.1.1 + 2.1.2-SNAPSHOT @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.1.1 + 2.1.2-SNAPSHOT pom import com.google.cloud google-cloud-bigtable-bom - 2.1.1 + 2.1.2-SNAPSHOT pom import diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index a6f7ca4e2d..9cd6757d45 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-bigtable - 2.1.1 + 2.1.2-SNAPSHOT diff --git a/versions.txt b/versions.txt index 51f56b2d35..380c0ce601 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-bigtable:2.1.1:2.1.1 -grpc-google-cloud-bigtable-admin-v2:2.1.1:2.1.1 -grpc-google-cloud-bigtable-v2:2.1.1:2.1.1 -proto-google-cloud-bigtable-admin-v2:2.1.1:2.1.1 -proto-google-cloud-bigtable-v2:2.1.1:2.1.1 -google-cloud-bigtable-emulator:0.138.1:0.138.1 +google-cloud-bigtable:2.1.1:2.1.2-SNAPSHOT +grpc-google-cloud-bigtable-admin-v2:2.1.1:2.1.2-SNAPSHOT +grpc-google-cloud-bigtable-v2:2.1.1:2.1.2-SNAPSHOT +proto-google-cloud-bigtable-admin-v2:2.1.1:2.1.2-SNAPSHOT +proto-google-cloud-bigtable-v2:2.1.1:2.1.2-SNAPSHOT +google-cloud-bigtable-emulator:0.138.1:0.138.2-SNAPSHOT From 5976a8afb10b3e9f5da2c8762d9ad27aafbfc007 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 1 Sep 2021 11:30:24 -0700 Subject: [PATCH 02/20] chore: regenerate README (#981) This PR was generated using Autosynth. :rainbow:
Log from Synthtool ``` 2021-09-01 18:14:25,921 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-bigtable/.github/readme/synth.py. On branch autosynth-readme nothing to commit, working tree clean 2021-09-01 18:14:27,169 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata. ```
Full log will be available here: https://source.cloud.google.com/results/invocations/cfef039a-184d-4f02-ba2e-a0a602ba7829/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) --- .github/readme/synth.metadata/synth.metadata | 4 ++-- README.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 9400f27c7c..a1a41609c4 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-bigtable.git", - "sha": "e5bb52eead42e8b351a7469529837d8b509b8332" + "sha": "c24b1ce2c0e5642ca365e1ad5e4ab1a1c19996cb" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "9a238a0623879c3de129a376c6085d4a862f6eb9" + "sha": "5c0fa62eea9c33ebe61e582424b659eb264e1ba4" } } ] diff --git a/README.md b/README.md index 35d5697acc..f564cacc13 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,13 @@ 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.1.0' +implementation 'com.google.cloud:google-cloud-bigtable:2.1.1' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.1.0" +libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.1.1" ``` ## Authentication From ed02dd734499b28ce028b0ffe38c0837877670e0 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 2 Sep 2021 18:50:59 +0200 Subject: [PATCH 03/20] chore(deps): update dependency com.google.cloud:google-cloud-bigtable to v2.1.1 (#980) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource 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.1.0` -> `2.1.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-bigtable/2.1.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-bigtable/2.1.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-bigtable/2.1.1/compatibility-slim/2.1.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-bigtable/2.1.1/confidence-slim/2.1.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-bigtable ### [`v2.1.1`](https://togithub.com/googleapis/java-bigtable/blob/master/CHANGELOG.md#​211-httpswwwgithubcomgoogleapisjava-bigtablecomparev210v211-2021-09-01) [Compare Source](https://togithub.com/googleapis/java-bigtable/compare/v2.1.0...v2.1.1)
--- ### Configuration 📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-bigtable). --- samples/install-without-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 6fba144cb9..e89cbb4b56 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.1.0 + 2.1.1 From fbd27c4ca9e2475ebcf20243f5e4e894037e255a Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 3 Sep 2021 08:46:32 -0700 Subject: [PATCH 04/20] chore(java): install maven 3.8.1 at runtime (#983) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/a1660e58-6b1e-47ca-90d1-505a1120f154/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) Source-Link: https://github.com/googleapis/synthtool/commit/ad7fd76e17bf9494a3e47ff9cf445f61564432e0 --- .github/workflows/ci.yaml | 14 +++++++++++++- synth.metadata | 4 ++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d510359d97..e23d923e1e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,6 +12,9 @@ jobs: java: [8, 11] steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: ${{matrix.java}} @@ -37,6 +40,9 @@ jobs: java: [8, 11] steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: ${{matrix.java}} @@ -46,6 +52,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: 8 @@ -57,10 +66,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: 8 - run: java -version - run: .kokoro/build.sh env: - JOB_TYPE: clirr + JOB_TYPE: clirr \ No newline at end of file diff --git a/synth.metadata b/synth.metadata index 1099e93d00..0fa591376c 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-bigtable.git", - "sha": "392432daa7569cd73a8635ccc078c78f59513e3b" + "sha": "ed02dd734499b28ce028b0ffe38c0837877670e0" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "9a238a0623879c3de129a376c6085d4a862f6eb9" + "sha": "ad7fd76e17bf9494a3e47ff9cf445f61564432e0" } } ], From 9b2279881c465f5e00493927e012e2195458309e Mon Sep 17 00:00:00 2001 From: Igor Bernstein Date: Tue, 7 Sep 2021 11:32:26 -0400 Subject: [PATCH 05/20] chore: temporary workaround for maven wildcard excludes (#985) Integration tests started failing due to dependency upper bounds rules. It appears that something is not respecting the wildcard exclusions. For the time being this will explicitly exclude all deps --- google-cloud-bigtable/pom.xml | 58 +++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 2 deletions(-) diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index c9d3959d7c..8cd7bb5bd3 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -224,10 +224,64 @@ * Exclude protobuf-java to prefer the version declared here in the project. --> + + + + + - * - * + api-common + com.google.api + + com.google.api.grpc + proto-google-cloud-firestore-v1 + + + com.google.api.grpc + proto-google-common-protos + + + com.google.api.grpc + proto-google-cloud-bigtable-v2 + + + com.google.auto.value + auto-value-annotations + + + com.google.code.findbugs + jsr305 + + + com.google.errorprone + error_prone_annotations + + + com.google.guava + failureaccess + + + com.google.guava + listenablefuture + + + com.google.j2objc + j2objc-annotations + + + com.google.protobuf + protobuf-java + + + javax.annotation + javax.annotation-api + + + org.checkerframework + checker-qual + + From d28a568e352ed0ae10e98fd8f3b26b6be04ee8ef Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 7 Sep 2021 08:52:10 -0700 Subject: [PATCH 06/20] chore: regenerate README (#987) This PR was generated using Autosynth. :rainbow:
Log from Synthtool ``` 2021-09-07 15:34:39,085 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-bigtable/.github/readme/synth.py. On branch autosynth-readme nothing to commit, working tree clean 2021-09-07 15:34:40,165 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata. ```
Full log will be available here: https://source.cloud.google.com/results/invocations/fb2209d4-5227-48a3-a042-3308adbbda43/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) --- .github/readme/synth.metadata/synth.metadata | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index a1a41609c4..37f41062b3 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-bigtable.git", - "sha": "c24b1ce2c0e5642ca365e1ad5e4ab1a1c19996cb" + "sha": "9b2279881c465f5e00493927e012e2195458309e" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "5c0fa62eea9c33ebe61e582424b659eb264e1ba4" + "sha": "ad7fd76e17bf9494a3e47ff9cf445f61564432e0" } } ] diff --git a/README.md b/README.md index f564cacc13..87232c7d08 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-bigtable - 2.1.0 + 2.1.1 ``` From 96ab2c71e71ebd98c459702fa50135bf5cc31897 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20F=C3=A9raud?= <43784631+paulferaud@users.noreply.github.com> Date: Tue, 7 Sep 2021 19:32:02 +0200 Subject: [PATCH 07/20] refactor: Avoid setting empty builders in proto setters (#984) Per Google internal cleanup --- .../com/google/cloud/bigtable/data/v2/models/MutationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/MutationTest.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/MutationTest.java index 450925ab0a..8d89670a1c 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/MutationTest.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/MutationTest.java @@ -175,7 +175,7 @@ public void deleteRowTest() { assertThat(actual) .containsExactly( com.google.bigtable.v2.Mutation.newBuilder() - .setDeleteFromRow(DeleteFromRow.newBuilder()) + .setDeleteFromRow(DeleteFromRow.getDefaultInstance()) .build()); } From 50490d9c7dd08d79fd92dce7cfab9040e8c2a9e8 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 7 Sep 2021 21:48:13 +0200 Subject: [PATCH 08/20] build(deps): update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.3.1 (#988) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-javadoc-plugin](https://maven.apache.org/plugins/) | `3.3.0` -> `3.3.1` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-javadoc-plugin/3.3.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-javadoc-plugin/3.3.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-javadoc-plugin/3.3.1/compatibility-slim/3.3.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-javadoc-plugin/3.3.1/confidence-slim/3.3.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-bigtable). --- grpc-google-cloud-bigtable-admin-v2/pom.xml | 2 +- grpc-google-cloud-bigtable-v2/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/grpc-google-cloud-bigtable-admin-v2/pom.xml b/grpc-google-cloud-bigtable-admin-v2/pom.xml index 3bf15b1d20..52502ef0f1 100644 --- a/grpc-google-cloud-bigtable-admin-v2/pom.xml +++ b/grpc-google-cloud-bigtable-admin-v2/pom.xml @@ -74,7 +74,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.0 + 3.3.1 protected true diff --git a/grpc-google-cloud-bigtable-v2/pom.xml b/grpc-google-cloud-bigtable-v2/pom.xml index 18ba0366eb..ef59b1ba2e 100644 --- a/grpc-google-cloud-bigtable-v2/pom.xml +++ b/grpc-google-cloud-bigtable-v2/pom.xml @@ -66,7 +66,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.0 + 3.3.1 protected true diff --git a/pom.xml b/pom.xml index a478766afa..59558ac22a 100644 --- a/pom.xml +++ b/pom.xml @@ -200,7 +200,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.0 + 3.3.1 aggregate @@ -278,7 +278,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.0 + 3.3.1 com.microsoft.doclet.DocFxDoclet false From 148a928e3f8f6d1e2ee1d1b119ca820d676802fd Mon Sep 17 00:00:00 2001 From: Igor Bernstein Date: Tue, 7 Sep 2021 17:08:28 -0400 Subject: [PATCH 09/20] revert: temporary workaround for maven wildcard excludes (#989) Reverts googleapis/java-bigtable#985 --- google-cloud-bigtable/pom.xml | 58 ++--------------------------------- 1 file changed, 2 insertions(+), 56 deletions(-) diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index 8cd7bb5bd3..c9d3959d7c 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -224,64 +224,10 @@ * Exclude protobuf-java to prefer the version declared here in the project. --> - - - - - - api-common - com.google.api + * + * - - com.google.api.grpc - proto-google-cloud-firestore-v1 - - - com.google.api.grpc - proto-google-common-protos - - - com.google.api.grpc - proto-google-cloud-bigtable-v2 - - - com.google.auto.value - auto-value-annotations - - - com.google.code.findbugs - jsr305 - - - com.google.errorprone - error_prone_annotations - - - com.google.guava - failureaccess - - - com.google.guava - listenablefuture - - - com.google.j2objc - j2objc-annotations - - - com.google.protobuf - protobuf-java - - - javax.annotation - javax.annotation-api - - - org.checkerframework - checker-qual - - From a3719122294080f2214e522d779d6f2344b6aaef Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 7 Sep 2021 14:28:12 -0700 Subject: [PATCH 10/20] chore: regenerate README (#992) This PR was generated using Autosynth. :rainbow:
Log from Synthtool ``` 2021-09-07 21:10:42,032 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-bigtable/.github/readme/synth.py. On branch autosynth-readme nothing to commit, working tree clean 2021-09-07 21:10:43,098 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata. ```
Full log will be available here: https://source.cloud.google.com/results/invocations/338b2de6-4bcd-4e73-87bc-7de6c695de2d/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) --- .github/readme/synth.metadata/synth.metadata | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 37f41062b3..4db4e2dc7c 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-bigtable.git", - "sha": "9b2279881c465f5e00493927e012e2195458309e" + "sha": "148a928e3f8f6d1e2ee1d1b119ca820d676802fd" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "ad7fd76e17bf9494a3e47ff9cf445f61564432e0" + "sha": "17ee6e5c08f2eb47029beee4776ce990e56b3925" } } ] diff --git a/README.md b/README.md index 87232c7d08..a66dab5ec6 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ If you are using Maven without 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:22.0.0') +implementation platform('com.google.cloud:libraries-bom:23.0.0') implementation 'com.google.cloud:google-cloud-bigtable' ``` From 7704ee33701eef51cd14e5738548d4df964d8ecc Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 7 Sep 2021 15:29:59 -0700 Subject: [PATCH 11/20] chore(java): update windows build (#993) to install maven 3.8.1 at runtime too (related to #1202) Tested in [java-bigquerystorage](https://github.com/googleapis/java-bigquerystorage/pull/1291/commits/7834f4ff86858f6ed0b8068ea66dadf6365e399a) Source-Author: Stephanie Wang Source-Date: Tue Sep 7 13:04:27 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: 17ee6e5c08f2eb47029beee4776ce990e56b3925 Source-Link: https://github.com/googleapis/synthtool/commit/17ee6e5c08f2eb47029beee4776ce990e56b3925 --- .github/workflows/ci.yaml | 5 ++++- synth.metadata | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e23d923e1e..3becb5c022 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -26,6 +26,9 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: 8 @@ -75,4 +78,4 @@ jobs: - run: java -version - run: .kokoro/build.sh env: - JOB_TYPE: clirr \ No newline at end of file + JOB_TYPE: clirr diff --git a/synth.metadata b/synth.metadata index 0fa591376c..8a1aec182c 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-bigtable.git", - "sha": "ed02dd734499b28ce028b0ffe38c0837877670e0" + "sha": "a3719122294080f2214e522d779d6f2344b6aaef" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "ad7fd76e17bf9494a3e47ff9cf445f61564432e0" + "sha": "17ee6e5c08f2eb47029beee4776ce990e56b3925" } } ], From c1681b1e6e76d7620041b6c712334d480113b171 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 8 Sep 2021 00:31:17 +0200 Subject: [PATCH 12/20] chore(deps): update dependency com.google.cloud:libraries-bom to v23 (#990) --- samples/snippets/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 7753ceb032..a60aa044b9 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 22.0.0 + 23.0.0 pom import From eff89c5d00739dc9959b01a8252e7989db4024e2 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 7 Sep 2021 15:48:11 -0700 Subject: [PATCH 13/20] chore: regenerate README (#994) This PR was generated using Autosynth. :rainbow:
Log from Synthtool ``` 2021-09-07 22:32:33,473 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-bigtable/.github/readme/synth.py. On branch autosynth-readme nothing to commit, working tree clean 2021-09-07 22:32:35,139 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata. ```
Full log will be available here: https://source.cloud.google.com/results/invocations/a4ab72d5-5431-499a-b0fb-cc30b0c69306/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) --- .github/readme/synth.metadata/synth.metadata | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 4db4e2dc7c..4737824ebc 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-bigtable.git", - "sha": "148a928e3f8f6d1e2ee1d1b119ca820d676802fd" + "sha": "c1681b1e6e76d7620041b6c712334d480113b171" } }, { diff --git a/README.md b/README.md index a66dab5ec6..b16dc92a33 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 - 22.0.0 + 23.0.0 pom import From 48a4d7f74948d2a9d6b2e1275d069f050e7a465f Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 8 Sep 2021 20:03:40 +0200 Subject: [PATCH 14/20] test(deps): update dependency com.google.cloud:google-cloud-conformance-tests to v0.2.1 (#995) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 59558ac22a..911fb15c30 100644 --- a/pom.xml +++ b/pom.xml @@ -153,7 +153,7 @@ com.google.cloud google-cloud-conformance-tests - 0.2.0 + 0.2.1 com.google.truth From f5321feefc8eb300eb66411db19c93042beb7d4b Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Wed, 8 Sep 2021 13:14:32 -0700 Subject: [PATCH 15/20] chore: remove readme autosynth config (#996) --- .kokoro/continuous/readme.cfg | 55 ----------------------------------- 1 file changed, 55 deletions(-) delete mode 100644 .kokoro/continuous/readme.cfg diff --git a/.kokoro/continuous/readme.cfg b/.kokoro/continuous/readme.cfg deleted file mode 100644 index 5b59996afa..0000000000 --- a/.kokoro/continuous/readme.cfg +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 2020 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. - -# Format: //devtools/kokoro/config/proto/build.proto - -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/python-multi" -} - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/java-bigtable/.kokoro/readme.sh" -} - -# Build logs will be here -action { - define_artifacts { - regex: "**/*sponge_log.xml" - regex: "**/*sponge_log.log" - } -} - -# The github token is stored here. -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "yoshi-automation-github-key" - # TODO(theacodes): remove this after secrets have globally propagated - backend_type: FASTCONFIGPUSH - } - } -} - -# Common env vars for all repositories and builds. -env_vars: { - key: "GITHUB_USER" - value: "yoshi-automation" -} -env_vars: { - key: "GITHUB_EMAIL" - value: "yoshi-automation@google.com" -} From 49c98b273825f6ecd25c9a0e80ff2443651eb8de Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 9 Sep 2021 07:47:36 -0700 Subject: [PATCH 16/20] chore: synthtool config changes (#998) * changes without context autosynth cannot find the source of changes triggered by earlier changes in this repository, or by version upgrades to tools such as linters. * chore(java): remove readme autosynth job config README generation is now handled by owlbot Source-Author: Jeff Ching Source-Date: Wed Sep 8 12:11:28 2021 -0700 Source-Repo: googleapis/synthtool Source-Sha: df5093b950d4aafd49a4c7758d74c44485263ada Source-Link: https://github.com/googleapis/synthtool/commit/df5093b950d4aafd49a4c7758d74c44485263ada * chore: remove readme synth.py config Source-Author: Jeff Ching Source-Date: Wed Sep 8 13:23:41 2021 -0700 Source-Repo: googleapis/synthtool Source-Sha: 2d31a9243781b282202b4f76dc7bbc8b45803196 Source-Link: https://github.com/googleapis/synthtool/commit/2d31a9243781b282202b4f76dc7bbc8b45803196 * chore: add gcf-owl-bot to list of trusted contributors Source-Author: Jeff Ching Source-Date: Wed Sep 8 13:42:12 2021 -0700 Source-Repo: googleapis/synthtool Source-Sha: a6b97202771f89a4b76873d43ea9a07d7fc95f91 Source-Link: https://github.com/googleapis/synthtool/commit/a6b97202771f89a4b76873d43ea9a07d7fc95f91 --- .github/readme/synth.py | 19 ------------------- .github/trusted-contribution.yml | 3 ++- synth.metadata | 6 ++---- 3 files changed, 4 insertions(+), 24 deletions(-) delete mode 100644 .github/readme/synth.py diff --git a/.github/readme/synth.py b/.github/readme/synth.py deleted file mode 100644 index 7b48cc28d3..0000000000 --- a/.github/readme/synth.py +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2020 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. - -"""This script is used to synthesize generated the README for this library.""" - -from synthtool.languages import java - -java.custom_templates(["java_library/README.md"]) diff --git a/.github/trusted-contribution.yml b/.github/trusted-contribution.yml index f247d5c789..a0ba1f7d90 100644 --- a/.github/trusted-contribution.yml +++ b/.github/trusted-contribution.yml @@ -1,2 +1,3 @@ trustedContributors: -- renovate-bot \ No newline at end of file +- renovate-bot +- gcf-owl-bot[bot] diff --git a/synth.metadata b/synth.metadata index 8a1aec182c..0876ed24fa 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-bigtable.git", - "sha": "a3719122294080f2214e522d779d6f2344b6aaef" + "sha": "f5321feefc8eb300eb66411db19c93042beb7d4b" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "17ee6e5c08f2eb47029beee4776ce990e56b3925" + "sha": "a6b97202771f89a4b76873d43ea9a07d7fc95f91" } } ], @@ -50,7 +50,6 @@ ".github/PULL_REQUEST_TEMPLATE.md", ".github/blunderbuss.yml", ".github/generated-files-bot.yml", - ".github/readme/synth.py", ".github/release-please.yml", ".github/release-trigger.yml", ".github/snippet-bot.yml", @@ -67,7 +66,6 @@ ".kokoro/common.sh", ".kokoro/continuous/common.cfg", ".kokoro/continuous/java8.cfg", - ".kokoro/continuous/readme.cfg", ".kokoro/dependencies.sh", ".kokoro/nightly/common.cfg", ".kokoro/nightly/java11.cfg", From 1adf25c644de92961eed5359e10de28cb0a17782 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 9 Sep 2021 15:26:00 -0700 Subject: [PATCH 17/20] chore(java): update shared-config and shared-dependencies version in pom template (#999) Source-Author: Neenu Shaji Source-Date: Wed Sep 8 17:28:48 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: 396d9b84a1e93880f5bf88b59ecd38a0a6dffc5e Source-Link: https://github.com/googleapis/synthtool/commit/396d9b84a1e93880f5bf88b59ecd38a0a6dffc5e --- .kokoro/release/common.sh | 2 +- .kokoro/release/drop.sh | 2 +- .kokoro/release/promote.sh | 2 +- .kokoro/release/publish_javadoc.sh | 2 +- .kokoro/release/publish_javadoc11.sh | 2 +- .kokoro/release/stage.sh | 2 +- .kokoro/trampoline.sh | 2 +- synth.metadata | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.kokoro/release/common.sh b/.kokoro/release/common.sh index 6e3f65999b..7f78ee414f 100755 --- a/.kokoro/release/common.sh +++ b/.kokoro/release/common.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/release/drop.sh b/.kokoro/release/drop.sh index 5c4551efa2..742ec1a886 100755 --- a/.kokoro/release/drop.sh +++ b/.kokoro/release/drop.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/release/promote.sh b/.kokoro/release/promote.sh index 1fa95fa537..3cac3d8a97 100755 --- a/.kokoro/release/promote.sh +++ b/.kokoro/release/promote.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh index 58f0f3f47c..a6782c6cfd 100755 --- a/.kokoro/release/publish_javadoc.sh +++ b/.kokoro/release/publish_javadoc.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2019 Google Inc. +# Copyright 2019 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh index 7fced9e0ab..5220866fe5 100755 --- a/.kokoro/release/publish_javadoc11.sh +++ b/.kokoro/release/publish_javadoc11.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2021 Google Inc. +# Copyright 2021 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh index 8a1033843c..77dc4e8f0f 100755 --- a/.kokoro/release/stage.sh +++ b/.kokoro/release/stage.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/trampoline.sh b/.kokoro/trampoline.sh index 9da0f83987..8b69b793c9 100644 --- a/.kokoro/trampoline.sh +++ b/.kokoro/trampoline.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/synth.metadata b/synth.metadata index 0876ed24fa..f6c96a63ae 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-bigtable.git", - "sha": "f5321feefc8eb300eb66411db19c93042beb7d4b" + "sha": "49c98b273825f6ecd25c9a0e80ff2443651eb8de" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "a6b97202771f89a4b76873d43ea9a07d7fc95f91" + "sha": "396d9b84a1e93880f5bf88b59ecd38a0a6dffc5e" } } ], From dd5164dc9de7f060bb0dab79820cb43ac434d703 Mon Sep 17 00:00:00 2001 From: Igor Bernstein Date: Mon, 13 Sep 2021 13:26:33 -0400 Subject: [PATCH 18/20] fix: parallel execution and verbose grpc logs (#1004) * chore: fix parallel execution and verbose grpc logs Mucking around with java util logging fails when tests are executed in parallel. So make the 2 features exclusive: by default tests are executed in parallel, if verbose logs are needed they can be activated by a profile that will disable parallel execution. Also switch parallel tests to run in threads instead of processes and enable parallel execution for unit tests * fix sys prop name --- google-cloud-bigtable/pom.xml | 33 +++++++++++++++++-- .../test_helpers/env/TestEnvRule.java | 10 +++++- 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index c9d3959d7c..8c21a2cbb4 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -279,6 +279,28 @@ + + + enable-verbose-grpc-logs + + true + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + 1 + none + + + + + bigtable-emulator-it @@ -587,11 +609,11 @@ true + classes - 2C - 1 - true + 10 + false @@ -602,6 +624,11 @@ ${skipUnitTests} + + + classes + 10 + false diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/TestEnvRule.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/TestEnvRule.java index 23b2c302c9..d4470637af 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/TestEnvRule.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/TestEnvRule.java @@ -25,6 +25,7 @@ import com.google.cloud.bigtable.admin.v2.models.Cluster; import com.google.cloud.bigtable.admin.v2.models.Instance; import com.google.common.base.Joiner; +import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.ImmutableSet; import java.io.IOException; @@ -69,6 +70,8 @@ public class TestEnvRule implements TestRule { private static final Logger LOGGER = Logger.getLogger(TestEnvRule.class.getName()); + private static final Boolean BIGTABLE_ENABLE_VERBOSE_GRPC_LOGS = + Boolean.getBoolean("bigtable.enable-grpc-logs"); private static final String BIGTABLE_GRPC_LOG_DIR = System.getProperty("bigtable.grpc-log-dir"); private static final String BIGTABLE_EMULATOR_HOST_ENV_VAR = "BIGTABLE_EMULATOR_HOST"; private static final String ENV_PROPERTY = "bigtable.env"; @@ -122,9 +125,14 @@ protected void before(Description description) throws Throwable { } private void configureLogging(Description description) throws IOException { - if (Strings.isNullOrEmpty(BIGTABLE_GRPC_LOG_DIR)) { + if (!BIGTABLE_ENABLE_VERBOSE_GRPC_LOGS) { return; } + Preconditions.checkState( + !Strings.isNullOrEmpty(BIGTABLE_GRPC_LOG_DIR), + "The property " + + BIGTABLE_GRPC_LOG_DIR + + " must be set when verbose grpc logs are enabled"); Files.createDirectories(Paths.get(BIGTABLE_GRPC_LOG_DIR)); From 75ee2f8e60aa7265ceb21d46daba5a99ff545442 Mon Sep 17 00:00:00 2001 From: Igor Bernstein Date: Mon, 13 Sep 2021 14:49:28 -0400 Subject: [PATCH 19/20] chore: fix grpc logs part 2 (#1005) This should've been part of dd5164dc. Maven doesnt automatically plumb maven properties to failsafe tests, so it must be done explicitly --- google-cloud-bigtable/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index 8c21a2cbb4..07213ccc80 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -323,6 +323,7 @@ emulator + ${bigtable.enable-grpc-logs} ${project.build.directory}/test-grpc-logs/emulator-it @@ -358,6 +359,7 @@ cloud ${bigtable.cfe-data-endpoint} ${bigtable.cfe-admin-endpoint} + ${bigtable.enable-grpc-logs} ${project.build.directory}/test-grpc-logs/prod-it @@ -407,6 +409,7 @@ cloud ${bigtable.cfe-data-batch-endpoint} ${bigtable.cfe-admin-endpoint} + ${bigtable.enable-grpc-logs} ${project.build.directory}/test-grpc-logs/prod-batch-it @@ -442,6 +445,7 @@ cloud ${bigtable.directpath-data-endpoint} ${bigtable.directpath-admin-endpoint} + ${bigtable.enable-grpc-logs} ${project.build.directory}/test-grpc-logs/directpath-it REQUIRE_DIRECT_PATH @@ -479,6 +483,7 @@ cloud ${bigtable.cfe-data-endpoint} ${bigtable.cfe-admin-endpoint} + ${bigtable.enable-grpc-logs} ${project.build.directory}/test-grpc-logs/cfe-it REQUIRE_CFE @@ -516,6 +521,7 @@ cloud ${bigtable.directpath-data-endpoint} ${bigtable.directpath-admin-endpoint} + ${bigtable.enable-grpc-logs} ${project.build.directory}/test-grpc-logs/directpath-ipv4only-it REQUIRE_DIRECT_PATH_IPV4 From 22590e60c9ffc6b65be7bcab0e642316f9cc178f Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 13 Sep 2021 15:23:38 -0400 Subject: [PATCH 20/20] chore: release 2.1.2 (#991) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 12 ++++++++++++ google-cloud-bigtable-bom/pom.xml | 14 +++++++------- google-cloud-bigtable-deps-bom/pom.xml | 2 +- google-cloud-bigtable-emulator/pom.xml | 8 ++++---- google-cloud-bigtable/pom.xml | 10 +++++----- .../java/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 | 2 +- proto-google-cloud-bigtable-admin-v2/pom.xml | 8 ++++---- proto-google-cloud-bigtable-v2/pom.xml | 8 ++++---- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 13 files changed, 54 insertions(+), 42 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a8773cd60..f733e99d90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +### [2.1.2](https://www.github.com/googleapis/java-bigtable/compare/v2.1.1...v2.1.2) (2021-09-13) + + +### Bug Fixes + +* parallel execution and verbose grpc logs ([#1004](https://www.github.com/googleapis/java-bigtable/issues/1004)) ([dd5164d](https://www.github.com/googleapis/java-bigtable/commit/dd5164dc9de7f060bb0dab79820cb43ac434d703)) + + +### Reverts + +* temporary workaround for maven wildcard excludes ([#989](https://www.github.com/googleapis/java-bigtable/issues/989)) ([148a928](https://www.github.com/googleapis/java-bigtable/commit/148a928e3f8f6d1e2ee1d1b119ca820d676802fd)) + ### [2.1.1](https://www.github.com/googleapis/java-bigtable/compare/v2.1.0...v2.1.1) (2021-09-01) diff --git a/google-cloud-bigtable-bom/pom.xml b/google-cloud-bigtable-bom/pom.xml index ba91d040fe..a90d956a9b 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.1.2-SNAPSHOT + 2.1.2 pom com.google.cloud @@ -62,32 +62,32 @@ com.google.cloud google-cloud-bigtable - 2.1.2-SNAPSHOT + 2.1.2 com.google.cloud google-cloud-bigtable-emulator - 0.138.2-SNAPSHOT + 0.138.2 com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 2.1.2-SNAPSHOT + 2.1.2 com.google.api.grpc grpc-google-cloud-bigtable-v2 - 2.1.2-SNAPSHOT + 2.1.2 com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 2.1.2-SNAPSHOT + 2.1.2 com.google.api.grpc proto-google-cloud-bigtable-v2 - 2.1.2-SNAPSHOT + 2.1.2 diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml index c1b6111477..98f4e0be6e 100644 --- a/google-cloud-bigtable-deps-bom/pom.xml +++ b/google-cloud-bigtable-deps-bom/pom.xml @@ -12,7 +12,7 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.1.2-SNAPSHOT + 2.1.2 pom diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml index 1c4b993fa7..6fb831dad3 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.138.2-SNAPSHOT + 0.138.2 Google Cloud Java - Bigtable Emulator https://github.com/googleapis/java-bigtable @@ -14,7 +14,7 @@ com.google.cloud google-cloud-bigtable-parent - 2.1.2-SNAPSHOT + 2.1.2 scm:git:git@github.com:googleapis/java-bigtable.git @@ -80,14 +80,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.1.2-SNAPSHOT + 2.1.2 pom import com.google.cloud google-cloud-bigtable-bom - 2.1.2-SNAPSHOT + 2.1.2 pom import diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index 07213ccc80..8f0ff451b0 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-bigtable - 2.1.2-SNAPSHOT + 2.1.2 jar Google Cloud Bigtable https://github.com/googleapis/java-bigtable @@ -12,11 +12,11 @@ com.google.cloud google-cloud-bigtable-parent - 2.1.2-SNAPSHOT + 2.1.2 - 2.1.2-SNAPSHOT + 2.1.2 google-cloud-bigtable @@ -43,14 +43,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.1.2-SNAPSHOT + 2.1.2 pom import com.google.cloud google-cloud-bigtable-bom - 2.1.2-SNAPSHOT + 2.1.2 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 47d1a92bcf..ee30ded214 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.1.2-SNAPSHOT"; + public static String VERSION = "2.1.2"; // {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 52502ef0f1..4019250512 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.1.2-SNAPSHOT + 2.1.2 grpc-google-cloud-bigtable-admin-v2 GRPC library for grpc-google-cloud-bigtable-admin-v2 com.google.cloud google-cloud-bigtable-parent - 2.1.2-SNAPSHOT + 2.1.2 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.1.2-SNAPSHOT + 2.1.2 pom import com.google.cloud google-cloud-bigtable-bom - 2.1.2-SNAPSHOT + 2.1.2 pom import diff --git a/grpc-google-cloud-bigtable-v2/pom.xml b/grpc-google-cloud-bigtable-v2/pom.xml index ef59b1ba2e..fe566bec9e 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.1.2-SNAPSHOT + 2.1.2 grpc-google-cloud-bigtable-v2 GRPC library for grpc-google-cloud-bigtable-v2 com.google.cloud google-cloud-bigtable-parent - 2.1.2-SNAPSHOT + 2.1.2 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.1.2-SNAPSHOT + 2.1.2 pom import com.google.cloud google-cloud-bigtable-bom - 2.1.2-SNAPSHOT + 2.1.2 pom import diff --git a/pom.xml b/pom.xml index 911fb15c30..974c338f27 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ google-cloud-bigtable-parent pom - 2.1.2-SNAPSHOT + 2.1.2 Google Cloud Bigtable Parent https://github.com/googleapis/java-bigtable diff --git a/proto-google-cloud-bigtable-admin-v2/pom.xml b/proto-google-cloud-bigtable-admin-v2/pom.xml index 8c7a822a86..5723da35fc 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.1.2-SNAPSHOT + 2.1.2 proto-google-cloud-bigtable-admin-v2 PROTO library for proto-google-cloud-bigtable-admin-v2 com.google.cloud google-cloud-bigtable-parent - 2.1.2-SNAPSHOT + 2.1.2 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.1.2-SNAPSHOT + 2.1.2 pom import com.google.cloud google-cloud-bigtable-bom - 2.1.2-SNAPSHOT + 2.1.2 pom import diff --git a/proto-google-cloud-bigtable-v2/pom.xml b/proto-google-cloud-bigtable-v2/pom.xml index 3b3eccf1d3..5bbc6e3cea 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.1.2-SNAPSHOT + 2.1.2 proto-google-cloud-bigtable-v2 PROTO library for proto-google-cloud-bigtable-v2 com.google.cloud google-cloud-bigtable-parent - 2.1.2-SNAPSHOT + 2.1.2 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.1.2-SNAPSHOT + 2.1.2 pom import com.google.cloud google-cloud-bigtable-bom - 2.1.2-SNAPSHOT + 2.1.2 pom import diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 9cd6757d45..e0d7c02af8 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-bigtable - 2.1.2-SNAPSHOT + 2.1.2 diff --git a/versions.txt b/versions.txt index 380c0ce601..8ec9409807 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-bigtable:2.1.1:2.1.2-SNAPSHOT -grpc-google-cloud-bigtable-admin-v2:2.1.1:2.1.2-SNAPSHOT -grpc-google-cloud-bigtable-v2:2.1.1:2.1.2-SNAPSHOT -proto-google-cloud-bigtable-admin-v2:2.1.1:2.1.2-SNAPSHOT -proto-google-cloud-bigtable-v2:2.1.1:2.1.2-SNAPSHOT -google-cloud-bigtable-emulator:0.138.1:0.138.2-SNAPSHOT +google-cloud-bigtable:2.1.2:2.1.2 +grpc-google-cloud-bigtable-admin-v2:2.1.2:2.1.2 +grpc-google-cloud-bigtable-v2:2.1.2:2.1.2 +proto-google-cloud-bigtable-admin-v2:2.1.2:2.1.2 +proto-google-cloud-bigtable-v2:2.1.2:2.1.2 +google-cloud-bigtable-emulator:0.138.2:0.138.2