From adb6723e2763d72314e5ac16dc1c0aa0f988c5f3 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 24 Aug 2021 08:48:24 -0700 Subject: [PATCH 01/14] chore: regenerate README (#513) This PR was generated using Autosynth. :rainbow:
Log from Synthtool ``` 2021-08-24 15:41:12,962 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py. On branch autosynth-readme nothing to commit, working tree clean 2021-08-24 15:41:14,118 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata. ```
Full log will be available here: https://source.cloud.google.com/results/invocations/8dee5b7f-ee50-40c6-ad0b-1242522739d9/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) --- .github/readme/synth.metadata/synth.metadata | 4 ++-- README.md | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 749ee64a4..ec17b04ed 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-datastore.git", - "sha": "a47a0ce1e6c70cedf1a2b02323b92f6509db99d4" + "sha": "001deacf1029f7b39d729685d796795cd98b72d4" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "a01e1a0bf70754f51450958b966bd673945d1e6e" + "sha": "8032ab5a32471d85ece8fc261df16cc40fbfa4fb" } } ] diff --git a/README.md b/README.md index 70050551f..e244defd2 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-datastore - 2.0.1 + 2.0.2 ``` @@ -56,13 +56,13 @@ compile 'com.google.cloud:google-cloud-datastore' If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datastore:2.0.1' +compile 'com.google.cloud:google-cloud-datastore:2.0.2' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.0.1" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.0.2" ``` ## Authentication From a99af57070fac891323169a55e5daa262473d439 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 24 Aug 2021 15:52:23 +0000 Subject: [PATCH 02/14] chore: release 2.0.4-SNAPSHOT (#514) :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). --- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 6 +++--- google-cloud-datastore/pom.xml | 4 ++-- pom.xml | 6 +++--- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- versions.txt | 10 +++++----- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 97b38c234..a78ed6342 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.0.3 + 2.0.4-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.0.3 + 2.0.4-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 1022b6861..3c0e67519 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.0.3 + 2.0.4-SNAPSHOT pom com.google.cloud @@ -52,12 +52,12 @@ com.google.api.grpc proto-google-cloud-datastore-v1 - 0.91.3 + 0.91.4-SNAPSHOT com.google.cloud google-cloud-datastore - 2.0.3 + 2.0.4-SNAPSHOT diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index e700fbcb6..e9886588a 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.0.3 + 2.0.4-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.0.3 + 2.0.4-SNAPSHOT google-cloud-datastore diff --git a/pom.xml b/pom.xml index ef1bfaed5..47d488a0c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.0.3 + 2.0.4-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -158,12 +158,12 @@ com.google.api.grpc proto-google-cloud-datastore-v1 - 0.91.3 + 0.91.4-SNAPSHOT com.google.cloud.datastore datastore-v1-proto-client - 2.0.3 + 2.0.4-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index e53922e2d..5334b7813 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.91.3 + 0.91.4-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.0.3 + 2.0.4-SNAPSHOT diff --git a/versions.txt b/versions.txt index 3d99f0d75..f394d63ae 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.0.3:2.0.3 -google-cloud-datastore-bom:2.0.3:2.0.3 -google-cloud-datastore-parent:2.0.3:2.0.3 -proto-google-cloud-datastore-v1:0.91.3:0.91.3 -datastore-v1-proto-client:2.0.3:2.0.3 +google-cloud-datastore:2.0.3:2.0.4-SNAPSHOT +google-cloud-datastore-bom:2.0.3:2.0.4-SNAPSHOT +google-cloud-datastore-parent:2.0.3:2.0.4-SNAPSHOT +proto-google-cloud-datastore-v1:0.91.3:0.91.4-SNAPSHOT +datastore-v1-proto-client:2.0.3:2.0.4-SNAPSHOT From e9db3f956dac1c56a376d5a57872a27181586994 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 24 Aug 2021 19:36:42 +0200 Subject: [PATCH 03/14] chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.0.3 (#516) --- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 39034df4c..3c31e1b0d 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-datastore - 2.0.2 + 2.0.3 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 173d7c111..5a5231b42 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.0.2 + 2.0.3 From 7ed9471255a4cec4e3e656eafd4a869356246980 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 24 Aug 2021 10:46:17 -0700 Subject: [PATCH 04/14] chore: regenerate README (#517) This PR was generated using Autosynth. :rainbow:
Log from Synthtool ``` 2021-08-24 17:38:56,551 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py. On branch autosynth-readme nothing to commit, working tree clean 2021-08-24 17:38:57,581 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata. ```
Full log will be available here: https://source.cloud.google.com/results/invocations/99b3cc22-ba48-4d98-a981-0d72b0f8d5b8/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) --- .github/readme/synth.metadata/synth.metadata | 2 +- README.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index ec17b04ed..395422d70 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-datastore.git", - "sha": "001deacf1029f7b39d729685d796795cd98b72d4" + "sha": "e9db3f956dac1c56a376d5a57872a27181586994" } }, { diff --git a/README.md b/README.md index e244defd2..08ea37bf9 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-datastore - 2.0.2 + 2.0.3 ``` @@ -56,13 +56,13 @@ compile 'com.google.cloud:google-cloud-datastore' If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datastore:2.0.2' +compile 'com.google.cloud:google-cloud-datastore:2.0.3' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.0.2" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.0.3" ``` ## Authentication From e4ae76cd1375baab3c59e381ccac40b62c3516f4 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Tue, 24 Aug 2021 14:32:46 -0400 Subject: [PATCH 05/14] ci: removing linkage-monitor from the required checks (#515) Linkage Monitor is no longer needed, because the Libraries BOM synchronizes with Google Cloud BOM and the shared dependencies BOM https://github.com/GoogleCloudPlatform/cloud-opensource-java/issues/2137 --- .github/sync-repo-settings.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index c123a3b45..5c3b3bd12 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -10,7 +10,6 @@ branchProtectionRules: requiredStatusCheckContexts: - dependencies (8) - dependencies (11) - - linkage-monitor - lint - clirr - units (8) @@ -25,7 +24,6 @@ branchProtectionRules: requiredStatusCheckContexts: - dependencies (8) - dependencies (11) - - linkage-monitor - lint - clirr - units (8) @@ -40,7 +38,6 @@ branchProtectionRules: requiredStatusCheckContexts: - dependencies (8) - dependencies (11) - - linkage-monitor - lint - clirr - units (7) From d36e7bc54c27b55d96f04c615453cb18dda5dcda Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 26 Aug 2021 09:06:10 -0700 Subject: [PATCH 06/14] chore: enable release-trigger bot (#518) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/ed02a3e1-b378-497e-80e9-bc65989974c2/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) Source-Link: https://github.com/googleapis/synthtool/commit/63cff634aabb85854caa511c5837ea6b45f42b4b --- .github/release-trigger.yml | 1 + synth.metadata | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 .github/release-trigger.yml diff --git a/.github/release-trigger.yml b/.github/release-trigger.yml new file mode 100644 index 000000000..d4ca94189 --- /dev/null +++ b/.github/release-trigger.yml @@ -0,0 +1 @@ +enabled: true diff --git a/synth.metadata b/synth.metadata index 418e22e1b..32a8913b6 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-datastore.git", - "sha": "67e1f0f1e48e5d45167cda3d53a8ae5f0597d712" + "sha": "e4ae76cd1375baab3c59e381ccac40b62c3516f4" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "ff01716e16d2c6e87eaf87197b753ac9fcbbed5d" + "sha": "63cff634aabb85854caa511c5837ea6b45f42b4b" } } ], @@ -44,6 +44,7 @@ ".github/generated-files-bot.yml", ".github/readme/synth.py", ".github/release-please.yml", + ".github/release-trigger.yml", ".github/snippet-bot.yml", ".github/sync-repo-settings.yaml", ".github/trusted-contribution.yml", From 76397bf7ce27804101a1622e82f436cac0dcd605 Mon Sep 17 00:00:00 2001 From: Aristide Niyungeko <2230766+aristide-n@users.noreply.github.com> Date: Thu, 26 Aug 2021 12:20:11 -0700 Subject: [PATCH 07/14] feat: support overriding the emulator download URL in LocalDatastoreHelper (#492) Fixes #376 --- .../cloud/datastore/testing/LocalDatastoreHelper.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java index 2867d7e30..e586f7e55 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java @@ -63,6 +63,8 @@ public class LocalDatastoreHelper extends BaseEmulatorHelper { private static final String MD5_CHECKSUM = "ec2237a0f0ac54964c6bd95e12c73720"; private static final String BIN_CMD_PORT_FLAG = "--port="; private static final URL EMULATOR_URL; + private static final String EMULATOR_URL_ENV_VAR = "DATASTORE_EMULATOR_URL"; + private static final String ACCESS_TOKEN = System.getenv("DATASTORE_EMULATOR_ACCESS_TOKEN"); // Common settings private static final String CONSISTENCY_FLAG = "--consistency="; @@ -72,7 +74,11 @@ public class LocalDatastoreHelper extends BaseEmulatorHelper { static { try { - EMULATOR_URL = new URL("http://storage.googleapis.com/gcd/tools/" + FILENAME); + if (System.getenv(EMULATOR_URL_ENV_VAR) == null) { + EMULATOR_URL = new URL("http://storage.googleapis.com/gcd/tools/" + FILENAME); + } else { + EMULATOR_URL = new URL(System.getenv(EMULATOR_URL_ENV_VAR)); + } } catch (MalformedURLException ex) { throw new IllegalStateException(ex); } @@ -147,7 +153,7 @@ private LocalDatastoreHelper(Builder builder) { gcloudCommand.add("--data-dir=" + getGcdPath()); } DownloadableEmulatorRunner downloadRunner = - new DownloadableEmulatorRunner(binCommand, EMULATOR_URL, MD5_CHECKSUM); + new DownloadableEmulatorRunner(binCommand, EMULATOR_URL, MD5_CHECKSUM, ACCESS_TOKEN); this.emulatorRunners = ImmutableList.of(gcloudRunner, downloadRunner); } From a6a5b33f51dcd632d187c1b790d59cb6454d1efd Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 27 Aug 2021 17:01:15 +0200 Subject: [PATCH 08/14] chore(deps): update dependency com.google.cloud:libraries-bom to v22 (#521) 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:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `21.0.0` -> `22.0.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/22.0.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/22.0.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/22.0.0/compatibility-slim/21.0.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/22.0.0/confidence-slim/21.0.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-datastore). --- 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 53efdf9a4..13f5ff1b6 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 21.0.0 + 22.0.0 pom import From 750e43caca5662e82511fd8adee6e1ac1bd19186 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 27 Aug 2021 08:12:24 -0700 Subject: [PATCH 09/14] chore: regenerate README (#522) This PR was generated using Autosynth. :rainbow:
Log from Synthtool ``` 2021-08-27 15:05:59,607 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py. On branch autosynth-readme nothing to commit, working tree clean 2021-08-27 15:06:00,634 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata. ```
Full log will be available here: https://source.cloud.google.com/results/invocations/1c2f57ff-17e8-439e-bdf8-73b2998a1e26/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 395422d70..84ddc0a9e 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-datastore.git", - "sha": "e9db3f956dac1c56a376d5a57872a27181586994" + "sha": "a6a5b33f51dcd632d187c1b790d59cb6454d1efd" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "8032ab5a32471d85ece8fc261df16cc40fbfa4fb" + "sha": "31728d872f50e439ded2f67fa8d67955b26a4e35" } } ] diff --git a/README.md b/README.md index 08ea37bf9..9a1dd40ba 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 - 21.0.0 + 22.0.0 pom import @@ -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:21.0.0') +implementation platform('com.google.cloud:libraries-bom:22.0.0') compile 'com.google.cloud:google-cloud-datastore' ``` From 60a95791ffe048e87fa6b0ad2c43bbc1b1838a24 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 31 Aug 2021 13:13:00 -0700 Subject: [PATCH 10/14] ci: removing linkage-monitor from the required checks (#520) Source-Author: Tomo Suzuki Source-Date: Wed Aug 25 13:18:10 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: e2aa5bcc3356d9e3b8b53de3b5c86226447d3a22 Source-Link: https://github.com/googleapis/synthtool/commit/e2aa5bcc3356d9e3b8b53de3b5c86226447d3a22 --- .github/workflows/ci.yaml | 13 ------------- synth.metadata | 4 ++-- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 65ae6ecdd..d510359d9 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -42,19 +42,6 @@ jobs: java-version: ${{matrix.java}} - run: java -version - run: .kokoro/dependencies.sh - linkage-monitor: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 - with: - java-version: 8 - - run: java -version - - name: Install artifacts to local Maven repository - run: .kokoro/build.sh - shell: bash - - name: Validate any conflicts with regard to com.google.cloud:libraries-bom (latest release) - uses: GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor lint: runs-on: ubuntu-latest steps: diff --git a/synth.metadata b/synth.metadata index 32a8913b6..01f54eb03 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-datastore.git", - "sha": "e4ae76cd1375baab3c59e381ccac40b62c3516f4" + "sha": "76397bf7ce27804101a1622e82f436cac0dcd605" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "63cff634aabb85854caa511c5837ea6b45f42b4b" + "sha": "e2aa5bcc3356d9e3b8b53de3b5c86226447d3a22" } } ], From 52f3d3ba0e9418e4f59d60fe3d19d6e7d6c2ce9e Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 31 Aug 2021 13:22:17 -0700 Subject: [PATCH 11/14] chore: regenerate README (#523) This PR was generated using Autosynth. :rainbow:
Log from Synthtool ``` 2021-08-31 20:15:05,805 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-datastore/.github/readme/synth.py. On branch autosynth-readme nothing to commit, working tree clean 2021-08-31 20:15:07,336 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata. ```
Full log will be available here: https://source.cloud.google.com/results/invocations/cb9d4e9c-e9b4-43a4-8159-5fd18ab10106/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 84ddc0a9e..b2d114f28 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-datastore.git", - "sha": "a6a5b33f51dcd632d187c1b790d59cb6454d1efd" + "sha": "60a95791ffe048e87fa6b0ad2c43bbc1b1838a24" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "31728d872f50e439ded2f67fa8d67955b26a4e35" + "sha": "9a238a0623879c3de129a376c6085d4a862f6eb9" } } ] diff --git a/README.md b/README.md index 9a1dd40ba..466574ffc 100644 --- a/README.md +++ b/README.md @@ -51,12 +51,12 @@ 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') -compile 'com.google.cloud:google-cloud-datastore' +implementation 'com.google.cloud:google-cloud-datastore' ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datastore:2.0.3' +implementation 'com.google.cloud:google-cloud-datastore:2.0.3' ``` If you are using SBT, add this to your dependencies From 81b9de5b8bc6e788618b2530a9f47ca97aa30d98 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 31 Aug 2021 22:50:45 +0200 Subject: [PATCH 12/14] deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v2.2.0 (#524) 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-shared-dependencies](https://togithub.com/googleapis/java-shared-dependencies) | `2.1.0` -> `2.2.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.2.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.2.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.2.0/compatibility-slim/2.1.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.2.0/confidence-slim/2.1.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-dependencies ### [`v2.2.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​220-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare210v220-2021-08-31) [Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v2.1.0...v2.2.0) ##### Dependencies - update dependency com.fasterxml.jackson:jackson-bom to v2.12.5 ([#​456](https://www.togithub.com/googleapis/java-shared-dependencies/issues/456)) ([05b58e8](https://www.github.com/googleapis/java-shared-dependencies/commit/05b58e84ff6617bdcbb1ea644aa6e061bdea0319)) - update dependency com.google.api:api-common to v2.0.2 ([#​450](https://www.togithub.com/googleapis/java-shared-dependencies/issues/450)) ([51caebe](https://www.github.com/googleapis/java-shared-dependencies/commit/51caebe89bfade98866f63952bf82bc663a0179a)) - update dependency com.google.http-client:google-http-client-bom to v1.40.0 ([#​455](https://www.togithub.com/googleapis/java-shared-dependencies/issues/455)) ([82a5e42](https://www.github.com/googleapis/java-shared-dependencies/commit/82a5e42b06570a2c7c9d53b03161b110a44487a1)) - update dependency com.google.oauth-client:google-oauth-client-bom to v1.32.1 ([#​447](https://www.togithub.com/googleapis/java-shared-dependencies/issues/447)) ([9d2b895](https://www.github.com/googleapis/java-shared-dependencies/commit/9d2b8958f62daa6a3015a8ac052762fb3d79b35b)) - update dependency io.grpc:grpc-bom to v1.40.1 ([#​451](https://www.togithub.com/googleapis/java-shared-dependencies/issues/451)) ([df668ea](https://www.github.com/googleapis/java-shared-dependencies/commit/df668ead8830a40acf9d5605d47f93c465b779c0)) - update gax.version to v2.4.0 ([#​458](https://www.togithub.com/googleapis/java-shared-dependencies/issues/458)) ([a797d9e](https://www.github.com/googleapis/java-shared-dependencies/commit/a797d9eb8a4bcb3025a9511eae61271278a4a5c9)) - update google.common-protos.version to v2.5.0 ([#​457](https://www.togithub.com/googleapis/java-shared-dependencies/issues/457)) ([38c7bb9](https://www.github.com/googleapis/java-shared-dependencies/commit/38c7bb925414d90ff3065650d06589f79bcab9b6)) - update google.core.version to v2.1.1 ([#​449](https://www.togithub.com/googleapis/java-shared-dependencies/issues/449)) ([b28723a](https://www.github.com/googleapis/java-shared-dependencies/commit/b28723ace0c27ebc73f23a2d094e0fe9ba8a9075)) - update google.core.version to v2.1.2 ([#​459](https://www.togithub.com/googleapis/java-shared-dependencies/issues/459)) ([df4d5b7](https://www.github.com/googleapis/java-shared-dependencies/commit/df4d5b7717386f5e0e2cca87bd9afc56b2c7aee8)) - update iam.version to v1.1.0 ([#​448](https://www.togithub.com/googleapis/java-shared-dependencies/issues/448)) ([3967928](https://www.github.com/googleapis/java-shared-dependencies/commit/39679287f3ef8c1cbca5dfc8aca3f69cfee3d4a6))
--- ### 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-datastore). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 47d488a0c..9c3dc6458 100644 --- a/pom.xml +++ b/pom.xml @@ -150,7 +150,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.1.0 + 2.2.0 pom import From 75c4ed81372d2032c8fc629d537900bd3f6fe032 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 31 Aug 2021 15:04:45 -0700 Subject: [PATCH 13/14] build(java): update renovate config to mark conformance tests as a test commit type (#525) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/5b325cc6-691a-4054-abaa-fd08ce604955/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) Source-Link: https://github.com/googleapis/synthtool/commit/9a238a0623879c3de129a376c6085d4a862f6eb9 --- renovate.json | 3 ++- synth.metadata | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/renovate.json b/renovate.json index 840e731d5..7bbedfd56 100644 --- a/renovate.json +++ b/renovate.json @@ -50,7 +50,8 @@ "^junit:junit", "^com.google.truth:truth", "^org.mockito:mockito-core", - "^org.objenesis:objenesis" + "^org.objenesis:objenesis", + "^com.google.cloud:google-cloud-conformance-tests" ], "semanticCommitType": "test", "semanticCommitScope": "deps" diff --git a/synth.metadata b/synth.metadata index 01f54eb03..aafeb97ec 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-datastore.git", - "sha": "76397bf7ce27804101a1622e82f436cac0dcd605" + "sha": "81b9de5b8bc6e788618b2530a9f47ca97aa30d98" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "e2aa5bcc3356d9e3b8b53de3b5c86226447d3a22" + "sha": "9a238a0623879c3de129a376c6085d4a862f6eb9" } } ], From e4da914b3f831e93410e07bb74f8bdf69d8f3309 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 1 Sep 2021 22:29:11 +0000 Subject: [PATCH 14/14] chore: release 2.1.0 (#519) :robot: I have created a release \*beep\* \*boop\* --- ## [2.1.0](https://www.github.com/googleapis/java-datastore/compare/v2.0.3...v2.1.0) (2021-08-31) ### Features * support overriding the emulator download URL in LocalDatastoreHelper ([#492](https://www.github.com/googleapis/java-datastore/issues/492)) ([76397bf](https://www.github.com/googleapis/java-datastore/commit/76397bf7ce27804101a1622e82f436cac0dcd605)), closes [#376](https://www.github.com/googleapis/java-datastore/issues/376) ### Dependencies * update dependency com.google.cloud:google-cloud-shared-dependencies to v2.2.0 ([#524](https://www.github.com/googleapis/java-datastore/issues/524)) ([81b9de5](https://www.github.com/googleapis/java-datastore/commit/81b9de5b8bc6e788618b2530a9f47ca97aa30d98)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- CHANGELOG.md | 12 ++++++++++++ datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 6 +++--- google-cloud-datastore/pom.xml | 4 ++-- pom.xml | 6 +++--- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- versions.txt | 10 +++++----- 7 files changed, 29 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b4bc7afb..44bc94082 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [2.1.0](https://www.github.com/googleapis/java-datastore/compare/v2.0.3...v2.1.0) (2021-08-31) + + +### Features + +* support overriding the emulator download URL in LocalDatastoreHelper ([#492](https://www.github.com/googleapis/java-datastore/issues/492)) ([76397bf](https://www.github.com/googleapis/java-datastore/commit/76397bf7ce27804101a1622e82f436cac0dcd605)), closes [#376](https://www.github.com/googleapis/java-datastore/issues/376) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.2.0 ([#524](https://www.github.com/googleapis/java-datastore/issues/524)) ([81b9de5](https://www.github.com/googleapis/java-datastore/commit/81b9de5b8bc6e788618b2530a9f47ca97aa30d98)) + ### [2.0.3](https://www.github.com/googleapis/java-datastore/compare/v2.0.2...v2.0.3) (2021-08-24) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index a78ed6342..15cb85e31 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.0.4-SNAPSHOT + 2.1.0 com.google.cloud google-cloud-datastore-parent - 2.0.4-SNAPSHOT + 2.1.0 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 3c0e67519..baf723a73 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.0.4-SNAPSHOT + 2.1.0 pom com.google.cloud @@ -52,12 +52,12 @@ com.google.api.grpc proto-google-cloud-datastore-v1 - 0.91.4-SNAPSHOT + 0.92.0 com.google.cloud google-cloud-datastore - 2.0.4-SNAPSHOT + 2.1.0 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index e9886588a..62396d1a0 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.0.4-SNAPSHOT + 2.1.0 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.0.4-SNAPSHOT + 2.1.0 google-cloud-datastore diff --git a/pom.xml b/pom.xml index 9c3dc6458..dbc85a988 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.0.4-SNAPSHOT + 2.1.0 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -158,12 +158,12 @@ com.google.api.grpc proto-google-cloud-datastore-v1 - 0.91.4-SNAPSHOT + 0.92.0 com.google.cloud.datastore datastore-v1-proto-client - 2.0.4-SNAPSHOT + 2.1.0 com.google.api.grpc diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 5334b7813..c204be7a9 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.91.4-SNAPSHOT + 0.92.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.0.4-SNAPSHOT + 2.1.0 diff --git a/versions.txt b/versions.txt index f394d63ae..d6bc02a65 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.0.3:2.0.4-SNAPSHOT -google-cloud-datastore-bom:2.0.3:2.0.4-SNAPSHOT -google-cloud-datastore-parent:2.0.3:2.0.4-SNAPSHOT -proto-google-cloud-datastore-v1:0.91.3:0.91.4-SNAPSHOT -datastore-v1-proto-client:2.0.3:2.0.4-SNAPSHOT +google-cloud-datastore:2.1.0:2.1.0 +google-cloud-datastore-bom:2.1.0:2.1.0 +google-cloud-datastore-parent:2.1.0:2.1.0 +proto-google-cloud-datastore-v1:0.92.0:0.92.0 +datastore-v1-proto-client:2.1.0:2.1.0