From 83155b99763aa7722143eafa49bfb36a8b3be906 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 16 Nov 2020 21:52:23 +0100 Subject: [PATCH 1/9] chore(deps): update dependency com.google.cloud:google-cloud-bigtable to v1.18.0 (#536) --- 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 779ca79ea9..0e566ada1d 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 - 1.17.3 + 1.18.0 From c9f983e6e6d8b575974a5d404d1eee1a4bffedd1 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 16 Nov 2020 21:04:04 +0000 Subject: [PATCH 2/9] chore: release 1.18.1-SNAPSHOT (#537) :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). --- 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 +++++----- 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 ++++++------ 11 files changed, 41 insertions(+), 41 deletions(-) diff --git a/google-cloud-bigtable-bom/pom.xml b/google-cloud-bigtable-bom/pom.xml index 5fe3384fe4..c79ea88ec0 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 - 1.18.0 + 1.18.1-SNAPSHOT pom com.google.cloud @@ -72,32 +72,32 @@ com.google.cloud google-cloud-bigtable - 1.18.0 + 1.18.1-SNAPSHOT com.google.cloud google-cloud-bigtable-emulator - 0.127.0 + 0.127.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 1.18.0 + 1.18.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-bigtable-v2 - 1.18.0 + 1.18.1-SNAPSHOT com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 1.18.0 + 1.18.1-SNAPSHOT com.google.api.grpc proto-google-cloud-bigtable-v2 - 1.18.0 + 1.18.1-SNAPSHOT diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml index b01ed2965b..f0428de99b 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 - 1.18.0 + 1.18.1-SNAPSHOT pom diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml index 05538d6945..6654bd31b4 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.127.0 + 0.127.1-SNAPSHOT Google Cloud Java - Bigtable Emulator https://github.com/googleapis/java-bigtable @@ -14,7 +14,7 @@ com.google.cloud google-cloud-bigtable-parent - 1.18.0 + 1.18.1-SNAPSHOT scm:git:git@github.com:googleapis/java-bigtable.git @@ -80,14 +80,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.18.0 + 1.18.1-SNAPSHOT pom import com.google.cloud google-cloud-bigtable-bom - 1.18.0 + 1.18.1-SNAPSHOT pom import diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index d0106ee047..4744034d1b 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-bigtable - 1.18.0 + 1.18.1-SNAPSHOT jar Google Cloud Bigtable https://github.com/googleapis/java-bigtable @@ -12,11 +12,11 @@ com.google.cloud google-cloud-bigtable-parent - 1.18.0 + 1.18.1-SNAPSHOT - 1.18.0 + 1.18.1-SNAPSHOT google-cloud-bigtable @@ -39,14 +39,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.18.0 + 1.18.1-SNAPSHOT pom import com.google.cloud google-cloud-bigtable-bom - 1.18.0 + 1.18.1-SNAPSHOT pom import diff --git a/grpc-google-cloud-bigtable-admin-v2/pom.xml b/grpc-google-cloud-bigtable-admin-v2/pom.xml index 34733f3fa0..5be949b2b2 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 - 1.18.0 + 1.18.1-SNAPSHOT grpc-google-cloud-bigtable-admin-v2 GRPC library for grpc-google-cloud-bigtable-admin-v2 com.google.cloud google-cloud-bigtable-parent - 1.18.0 + 1.18.1-SNAPSHOT @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.18.0 + 1.18.1-SNAPSHOT pom import com.google.cloud google-cloud-bigtable-bom - 1.18.0 + 1.18.1-SNAPSHOT pom import diff --git a/grpc-google-cloud-bigtable-v2/pom.xml b/grpc-google-cloud-bigtable-v2/pom.xml index 0437413085..c1b8b750fe 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 - 1.18.0 + 1.18.1-SNAPSHOT grpc-google-cloud-bigtable-v2 GRPC library for grpc-google-cloud-bigtable-v2 com.google.cloud google-cloud-bigtable-parent - 1.18.0 + 1.18.1-SNAPSHOT @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.18.0 + 1.18.1-SNAPSHOT pom import com.google.cloud google-cloud-bigtable-bom - 1.18.0 + 1.18.1-SNAPSHOT pom import diff --git a/pom.xml b/pom.xml index b7cbd4af10..e7a6bb3e96 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ google-cloud-bigtable-parent pom - 1.18.0 + 1.18.1-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 7aac6b1bf8..97a30ee4b7 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 - 1.18.0 + 1.18.1-SNAPSHOT proto-google-cloud-bigtable-admin-v2 PROTO library for proto-google-cloud-bigtable-admin-v2 com.google.cloud google-cloud-bigtable-parent - 1.18.0 + 1.18.1-SNAPSHOT @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.18.0 + 1.18.1-SNAPSHOT pom import com.google.cloud google-cloud-bigtable-bom - 1.18.0 + 1.18.1-SNAPSHOT pom import diff --git a/proto-google-cloud-bigtable-v2/pom.xml b/proto-google-cloud-bigtable-v2/pom.xml index 53f707e6c9..9bef270769 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 - 1.18.0 + 1.18.1-SNAPSHOT proto-google-cloud-bigtable-v2 PROTO library for proto-google-cloud-bigtable-v2 com.google.cloud google-cloud-bigtable-parent - 1.18.0 + 1.18.1-SNAPSHOT @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.18.0 + 1.18.1-SNAPSHOT pom import com.google.cloud google-cloud-bigtable-bom - 1.18.0 + 1.18.1-SNAPSHOT pom import diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 1218fa9766..1eda7cbf3f 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-bigtable - 1.18.0 + 1.18.1-SNAPSHOT diff --git a/versions.txt b/versions.txt index 856c3f5ca0..87c0d806e6 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-bigtable:1.18.0:1.18.0 -grpc-google-cloud-bigtable-admin-v2:1.18.0:1.18.0 -grpc-google-cloud-bigtable-v2:1.18.0:1.18.0 -proto-google-cloud-bigtable-admin-v2:1.18.0:1.18.0 -proto-google-cloud-bigtable-v2:1.18.0:1.18.0 -google-cloud-bigtable-emulator:0.127.0:0.127.0 +google-cloud-bigtable:1.18.0:1.18.1-SNAPSHOT +grpc-google-cloud-bigtable-admin-v2:1.18.0:1.18.1-SNAPSHOT +grpc-google-cloud-bigtable-v2:1.18.0:1.18.1-SNAPSHOT +proto-google-cloud-bigtable-admin-v2:1.18.0:1.18.1-SNAPSHOT +proto-google-cloud-bigtable-v2:1.18.0:1.18.1-SNAPSHOT +google-cloud-bigtable-emulator:0.127.0:0.127.1-SNAPSHOT From 5b954407b4d41653b9c8a859b15d77efc821aa2a Mon Sep 17 00:00:00 2001 From: Bonan Liu Date: Mon, 16 Nov 2020 16:15:46 -0500 Subject: [PATCH 3/9] test(fix): use consistent endpoint for all table admin clients in test (#533) --- .../admin/v2/it/BigtableBackupIT.java | 4 ++-- .../test_helpers/env/AbstractTestEnv.java | 6 +++++ .../bigtable/test_helpers/env/CloudEnv.java | 24 +++++++++++++++++++ .../test_helpers/env/EmulatorEnv.java | 12 ++++++++++ 4 files changed, 44 insertions(+), 2 deletions(-) diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableBackupIT.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableBackupIT.java index 10c4958b28..94246034ba 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableBackupIT.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableBackupIT.java @@ -102,14 +102,14 @@ public static void createClient() // Setup a prefix to avoid collisions between concurrent test runs prefix = String.format("020%d", System.currentTimeMillis()); - tableAdmin = BigtableTableAdminClient.create(testEnvRule.env().getProjectId(), targetInstance); + tableAdmin = testEnvRule.env().getTableAdminClientForInstance(targetInstance); testTable = tableAdmin.createTable( CreateTableRequest.of(generateId(TEST_TABLE_SUFFIX)).addFamily("cf1")); // Populate test data. - dataClient = BigtableDataClient.create(testEnvRule.env().getProjectId(), targetInstance); + dataClient = testEnvRule.env().getDataClientForInstance(targetInstance); byte[] rowBytes = new byte[1024]; Random random = new Random(); random.nextBytes(rowBytes); diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/AbstractTestEnv.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/AbstractTestEnv.java index c86403deb6..f183e5eea0 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/AbstractTestEnv.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/AbstractTestEnv.java @@ -22,6 +22,7 @@ import com.google.cloud.bigtable.admin.v2.models.Instance; import com.google.cloud.bigtable.data.v2.BigtableDataClient; import com.google.cloud.bigtable.data.v2.BigtableDataSettings; +import java.io.IOException; import org.threeten.bp.Instant; import org.threeten.bp.temporal.ChronoUnit; @@ -42,8 +43,13 @@ public abstract class AbstractTestEnv { public abstract BigtableDataClient getDataClient(); + public abstract BigtableDataClient getDataClientForInstance(String instanceId) throws IOException; + public abstract BigtableTableAdminClient getTableAdminClient(); + public abstract BigtableTableAdminClient getTableAdminClientForInstance(String instanceId) + throws IOException; + public abstract BigtableInstanceAdminClient getInstanceAdminClient(); public abstract BigtableDataSettings getDataClientSettings(); diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/CloudEnv.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/CloudEnv.java index cee19b29ae..6afe733ab7 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/CloudEnv.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/CloudEnv.java @@ -152,11 +152,35 @@ public BigtableDataClient getDataClient() { return dataClient; } + @Override + public BigtableDataClient getDataClientForInstance(String instanceId) throws IOException { + BigtableDataSettings.Builder settings = + BigtableDataSettings.newBuilder() + .setProjectId(dataSettings.getProjectId()) + .setInstanceId(instanceId); + settings + .stubSettings() + .setEndpoint(dataSettings.stubSettings().getEndpoint()) + .setTransportChannelProvider(dataSettings.stubSettings().getTransportChannelProvider()); + return BigtableDataClient.create(settings.build()); + } + @Override public BigtableTableAdminClient getTableAdminClient() { return tableAdminClient; } + @Override + public BigtableTableAdminClient getTableAdminClientForInstance(String instanceId) + throws IOException { + BigtableTableAdminSettings.Builder settings = + BigtableTableAdminSettings.newBuilder() + .setProjectId(tableAdminSettings.getProjectId()) + .setInstanceId(instanceId); + settings.stubSettings().setEndpoint(tableAdminSettings.stubSettings().getEndpoint()); + return BigtableTableAdminClient.create(settings.build()); + } + @Override public BigtableInstanceAdminClient getInstanceAdminClient() { return instanceAdminClient; diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/EmulatorEnv.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/EmulatorEnv.java index d1740fbfcd..edb9439dce 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/EmulatorEnv.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/EmulatorEnv.java @@ -23,6 +23,7 @@ import com.google.cloud.bigtable.data.v2.BigtableDataSettings; import com.google.cloud.bigtable.emulator.v2.Emulator; import com.google.common.base.Strings; +import java.io.IOException; import java.nio.file.Paths; public class EmulatorEnv extends AbstractTestEnv { @@ -104,11 +105,22 @@ public BigtableDataClient getDataClient() { return dataClient; } + @Override + public BigtableDataClient getDataClientForInstance(String instanceId) throws IOException { + throw new UnsupportedOperationException("Could not create a data client for another instance."); + } + @Override public BigtableTableAdminClient getTableAdminClient() { return tableAdminClient; } + @Override + public BigtableTableAdminClient getTableAdminClientForInstance(String instanceId) + throws IOException { + throw new UnsupportedOperationException("Could not create a table admin for another instance."); + } + @Override public BigtableInstanceAdminClient getInstanceAdminClient() { throw new UnsupportedOperationException("InstanceAdminClient is not supported with emulator"); From 03fd036587aafb94a4a9c09d17ab155c8f7e7e3a Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 18 Nov 2020 14:42:26 -0800 Subject: [PATCH 4/9] build(java): use actions/github-script v3 tag rather than full semver (#539) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/90c590d5-0563-47bf-bafc-d8333db6ebbb/targets - [ ] To automatically regenerate this PR, check this box. Source-Link: https://github.com/googleapis/synthtool/commit/7fcc405a579d5d53a726ff3da1b7c8c08f0f2d58 --- .github/workflows/approve-readme.yaml | 2 +- .github/workflows/auto-release.yaml | 2 +- synth.metadata | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml index e2d841d6c5..7513acaebc 100644 --- a/.github/workflows/approve-readme.yaml +++ b/.github/workflows/approve-readme.yaml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme' steps: - - uses: actions/github-script@v3.0.0 + - uses: actions/github-script@v3 with: github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} script: | diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml index bc1554aecb..2b6cdbc976 100644 --- a/.github/workflows/auto-release.yaml +++ b/.github/workflows/auto-release.yaml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest if: contains(github.head_ref, 'release-v') steps: - - uses: actions/github-script@v3.0.0 + - uses: actions/github-script@v3 with: github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} debug: true diff --git a/synth.metadata b/synth.metadata index 3314f7c8da..7ee29a9560 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-bigtable.git", - "sha": "0b029774d171403f1770a0cb3b6e0f0a6904f1ef" + "sha": "5b954407b4d41653b9c8a859b15d77efc821aa2a" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "7d652819519dfa24da9e14548232e4aaba71a11c" + "sha": "7fcc405a579d5d53a726ff3da1b7c8c08f0f2d58" } } ], From cf8a6b13770a399f02052a80df38fa0531f9277d Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 19 Nov 2020 16:46:04 +0100 Subject: [PATCH 5/9] chore(deps): update dependency com.google.cloud:libraries-bom to v16 (#540) --- 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 e0c4d6f039..fd7b5d1503 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 15.1.0 + 16.1.0 pom import From b1b0455ec1c4db7244ce5037e17eb301b26a7337 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 23 Nov 2020 09:22:04 -0800 Subject: [PATCH 6/9] chore(java): retry staging portion of the release with backoff (#541) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/47723bad-582c-43dd-9712-b89133a40f21/targets - [ ] To automatically regenerate this PR, check this box. Source-Link: https://github.com/googleapis/synthtool/commit/68742c6016bf0d16948a572633d17955a8737414 --- .kokoro/common.sh | 1 - .kokoro/release/stage.sh | 17 ++++++++++------- synth.metadata | 4 ++-- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.kokoro/common.sh b/.kokoro/common.sh index a8d0ea04d3..ace89f45a9 100644 --- a/.kokoro/common.sh +++ b/.kokoro/common.sh @@ -25,7 +25,6 @@ function retry_with_backoff { # allow a failures to continue set +e - echo "${command}" ${command} exit_code=$? diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh index 3c482cbc55..16126d2eb5 100755 --- a/.kokoro/release/stage.sh +++ b/.kokoro/release/stage.sh @@ -20,19 +20,22 @@ python3 -m pip install gcp-releasetool python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /tmp/publisher-script source $(dirname "$0")/common.sh +source $(dirname "$0")/../common.sh MAVEN_SETTINGS_FILE=$(realpath $(dirname "$0")/../../)/settings.xml pushd $(dirname "$0")/../../ setup_environment_secrets create_settings_xml_file "settings.xml" -mvn clean install deploy -B \ - --settings ${MAVEN_SETTINGS_FILE} \ - -DskipTests=true \ - -DperformRelease=true \ - -Dgpg.executable=gpg \ - -Dgpg.passphrase=${GPG_PASSPHRASE} \ - -Dgpg.homedir=${GPG_HOMEDIR} +# attempt to stage 3 times with exponential backoff (starting with 10 seconds) +retry_with_backoff 3 10 \ + mvn clean install deploy -B \ + --settings ${MAVEN_SETTINGS_FILE} \ + -DskipTests=true \ + -DperformRelease=true \ + -Dgpg.executable=gpg \ + -Dgpg.passphrase=${GPG_PASSPHRASE} \ + -Dgpg.homedir=${GPG_HOMEDIR} if [[ -n "${AUTORELEASE_PR}" ]] then diff --git a/synth.metadata b/synth.metadata index 7ee29a9560..63738e479f 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-bigtable.git", - "sha": "5b954407b4d41653b9c8a859b15d77efc821aa2a" + "sha": "cf8a6b13770a399f02052a80df38fa0531f9277d" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "7fcc405a579d5d53a726ff3da1b7c8c08f0f2d58" + "sha": "68742c6016bf0d16948a572633d17955a8737414" } } ], From af0da54b469282d51f04e19a0eb475a2abf76ed9 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 24 Nov 2020 08:16:20 -0800 Subject: [PATCH 7/9] build(java): enable blunderbuss for samples (#542) Source-Author: Jeff Ching Source-Date: Mon Nov 23 10:23:01 2020 -0800 Source-Repo: googleapis/synthtool Source-Sha: 943bb78606d035001123030067dffcc34f4645f2 Source-Link: https://github.com/googleapis/synthtool/commit/943bb78606d035001123030067dffcc34f4645f2 --- .github/blunderbuss.yml | 7 +++++++ synth.metadata | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 .github/blunderbuss.yml diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml new file mode 100644 index 0000000000..1a23ea42b1 --- /dev/null +++ b/.github/blunderbuss.yml @@ -0,0 +1,7 @@ +# Configuration for the Blunderbuss GitHub app. For more info see +# https://github.com/googleapis/repo-automation-bots/tree/master/packages/blunderbuss +assign_prs_by: +- labels: + - samples + to: + - googleapis/java-samples-reviewers \ No newline at end of file diff --git a/synth.metadata b/synth.metadata index 63738e479f..90aabbe1ee 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-bigtable.git", - "sha": "cf8a6b13770a399f02052a80df38fa0531f9277d" + "sha": "b1b0455ec1c4db7244ce5037e17eb301b26a7337" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "68742c6016bf0d16948a572633d17955a8737414" + "sha": "943bb78606d035001123030067dffcc34f4645f2" } } ], @@ -48,6 +48,7 @@ ".github/ISSUE_TEMPLATE/feature_request.md", ".github/ISSUE_TEMPLATE/support_request.md", ".github/PULL_REQUEST_TEMPLATE.md", + ".github/blunderbuss.yml", ".github/generated-files-bot.yml", ".github/readme/synth.py", ".github/release-please.yml", From 070bda21b9ec93bb187626eeb46e7212951a9ebf Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 2 Dec 2020 19:46:46 +0100 Subject: [PATCH 8/9] deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v0.16.0 (#546) --- 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 f0428de99b..ef2ea99045 100644 --- a/google-cloud-bigtable-deps-bom/pom.xml +++ b/google-cloud-bigtable-deps-bom/pom.xml @@ -79,7 +79,7 @@ com.google.cloud google-cloud-shared-dependencies - 0.15.0 + 0.16.0 pom import From eba6207fbd075c0166fa37b6779608d2d81bfd86 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 2 Dec 2020 19:04:02 +0000 Subject: [PATCH 9/9] chore: release 1.18.1 (#547) :robot: I have created a release \*beep\* \*boop\* --- ### [1.18.1](https://www.github.com/googleapis/java-bigtable/compare/v1.18.0...v1.18.1) (2020-12-02) ### Dependencies * update dependency com.google.cloud:google-cloud-shared-dependencies to v0.16.0 ([#546](https://www.github.com/googleapis/java-bigtable/issues/546)) ([070bda2](https://www.github.com/googleapis/java-bigtable/commit/070bda21b9ec93bb187626eeb46e7212951a9ebf)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). --- CHANGELOG.md | 7 +++++++ README.md | 6 +++--- 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 +++++----- 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, 51 insertions(+), 44 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d31006aef..935630aba1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [1.18.1](https://www.github.com/googleapis/java-bigtable/compare/v1.18.0...v1.18.1) (2020-12-02) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.16.0 ([#546](https://www.github.com/googleapis/java-bigtable/issues/546)) ([070bda2](https://www.github.com/googleapis/java-bigtable/commit/070bda21b9ec93bb187626eeb46e7212951a9ebf)) + ## [1.18.0](https://www.github.com/googleapis/java-bigtable/compare/v1.17.3...v1.18.0) (2020-11-13) diff --git a/README.md b/README.md index 2f3b015d6e..c2b6cedffe 100644 --- a/README.md +++ b/README.md @@ -16,16 +16,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-bigtable - 1.18.0 + 1.18.1 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-bigtable:1.18.0' +compile 'com.google.cloud:google-cloud-bigtable:1.18.1' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "1.18.0" +libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "1.18.1" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-bigtable-bom/pom.xml b/google-cloud-bigtable-bom/pom.xml index c79ea88ec0..2c08c5dba0 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 - 1.18.1-SNAPSHOT + 1.18.1 pom com.google.cloud @@ -72,32 +72,32 @@ com.google.cloud google-cloud-bigtable - 1.18.1-SNAPSHOT + 1.18.1 com.google.cloud google-cloud-bigtable-emulator - 0.127.1-SNAPSHOT + 0.127.1 com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 1.18.1-SNAPSHOT + 1.18.1 com.google.api.grpc grpc-google-cloud-bigtable-v2 - 1.18.1-SNAPSHOT + 1.18.1 com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 1.18.1-SNAPSHOT + 1.18.1 com.google.api.grpc proto-google-cloud-bigtable-v2 - 1.18.1-SNAPSHOT + 1.18.1 diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml index ef2ea99045..1445512a16 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 - 1.18.1-SNAPSHOT + 1.18.1 pom diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml index 6654bd31b4..3467e7ed32 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.127.1-SNAPSHOT + 0.127.1 Google Cloud Java - Bigtable Emulator https://github.com/googleapis/java-bigtable @@ -14,7 +14,7 @@ com.google.cloud google-cloud-bigtable-parent - 1.18.1-SNAPSHOT + 1.18.1 scm:git:git@github.com:googleapis/java-bigtable.git @@ -80,14 +80,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.18.1-SNAPSHOT + 1.18.1 pom import com.google.cloud google-cloud-bigtable-bom - 1.18.1-SNAPSHOT + 1.18.1 pom import diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index 4744034d1b..3b69426265 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-bigtable - 1.18.1-SNAPSHOT + 1.18.1 jar Google Cloud Bigtable https://github.com/googleapis/java-bigtable @@ -12,11 +12,11 @@ com.google.cloud google-cloud-bigtable-parent - 1.18.1-SNAPSHOT + 1.18.1 - 1.18.1-SNAPSHOT + 1.18.1 google-cloud-bigtable @@ -39,14 +39,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.18.1-SNAPSHOT + 1.18.1 pom import com.google.cloud google-cloud-bigtable-bom - 1.18.1-SNAPSHOT + 1.18.1 pom import diff --git a/grpc-google-cloud-bigtable-admin-v2/pom.xml b/grpc-google-cloud-bigtable-admin-v2/pom.xml index 5be949b2b2..a63916e506 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 - 1.18.1-SNAPSHOT + 1.18.1 grpc-google-cloud-bigtable-admin-v2 GRPC library for grpc-google-cloud-bigtable-admin-v2 com.google.cloud google-cloud-bigtable-parent - 1.18.1-SNAPSHOT + 1.18.1 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.18.1-SNAPSHOT + 1.18.1 pom import com.google.cloud google-cloud-bigtable-bom - 1.18.1-SNAPSHOT + 1.18.1 pom import diff --git a/grpc-google-cloud-bigtable-v2/pom.xml b/grpc-google-cloud-bigtable-v2/pom.xml index c1b8b750fe..238175ce21 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 - 1.18.1-SNAPSHOT + 1.18.1 grpc-google-cloud-bigtable-v2 GRPC library for grpc-google-cloud-bigtable-v2 com.google.cloud google-cloud-bigtable-parent - 1.18.1-SNAPSHOT + 1.18.1 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.18.1-SNAPSHOT + 1.18.1 pom import com.google.cloud google-cloud-bigtable-bom - 1.18.1-SNAPSHOT + 1.18.1 pom import diff --git a/pom.xml b/pom.xml index e7a6bb3e96..48feff6c49 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ google-cloud-bigtable-parent pom - 1.18.1-SNAPSHOT + 1.18.1 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 97a30ee4b7..200211ac9c 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 - 1.18.1-SNAPSHOT + 1.18.1 proto-google-cloud-bigtable-admin-v2 PROTO library for proto-google-cloud-bigtable-admin-v2 com.google.cloud google-cloud-bigtable-parent - 1.18.1-SNAPSHOT + 1.18.1 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.18.1-SNAPSHOT + 1.18.1 pom import com.google.cloud google-cloud-bigtable-bom - 1.18.1-SNAPSHOT + 1.18.1 pom import diff --git a/proto-google-cloud-bigtable-v2/pom.xml b/proto-google-cloud-bigtable-v2/pom.xml index 9bef270769..b82ca895e2 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 - 1.18.1-SNAPSHOT + 1.18.1 proto-google-cloud-bigtable-v2 PROTO library for proto-google-cloud-bigtable-v2 com.google.cloud google-cloud-bigtable-parent - 1.18.1-SNAPSHOT + 1.18.1 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.18.1-SNAPSHOT + 1.18.1 pom import com.google.cloud google-cloud-bigtable-bom - 1.18.1-SNAPSHOT + 1.18.1 pom import diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 1eda7cbf3f..d6ae06d104 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-bigtable - 1.18.1-SNAPSHOT + 1.18.1 diff --git a/versions.txt b/versions.txt index 87c0d806e6..e09e55d54d 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-bigtable:1.18.0:1.18.1-SNAPSHOT -grpc-google-cloud-bigtable-admin-v2:1.18.0:1.18.1-SNAPSHOT -grpc-google-cloud-bigtable-v2:1.18.0:1.18.1-SNAPSHOT -proto-google-cloud-bigtable-admin-v2:1.18.0:1.18.1-SNAPSHOT -proto-google-cloud-bigtable-v2:1.18.0:1.18.1-SNAPSHOT -google-cloud-bigtable-emulator:0.127.0:0.127.1-SNAPSHOT +google-cloud-bigtable:1.18.1:1.18.1 +grpc-google-cloud-bigtable-admin-v2:1.18.1:1.18.1 +grpc-google-cloud-bigtable-v2:1.18.1:1.18.1 +proto-google-cloud-bigtable-admin-v2:1.18.1:1.18.1 +proto-google-cloud-bigtable-v2:1.18.1:1.18.1 +google-cloud-bigtable-emulator:0.127.1:0.127.1