From cc23b99c1fad166c1cc8b072ace0920cac250201 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 4 Feb 2022 01:30:42 +0000 Subject: [PATCH 01/23] chore(main): release 2.2.5-SNAPSHOT (#634) :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 780bfea9a..efb2dad09 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.2.4 + 2.2.5-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.2.4 + 2.2.5-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index ea9969cd1..bb4c4af8c 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.2.4 + 2.2.5-SNAPSHOT pom com.google.cloud @@ -52,12 +52,12 @@ com.google.api.grpc proto-google-cloud-datastore-v1 - 0.93.4 + 0.93.5-SNAPSHOT com.google.cloud google-cloud-datastore - 2.2.4 + 2.2.5-SNAPSHOT diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 2f1c9e710..a723c28f5 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.2.4 + 2.2.5-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.2.4 + 2.2.5-SNAPSHOT google-cloud-datastore diff --git a/pom.xml b/pom.xml index 18b84bd54..59aab6c2c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.2.4 + 2.2.5-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.93.4 + 0.93.5-SNAPSHOT com.google.cloud.datastore datastore-v1-proto-client - 2.2.4 + 2.2.5-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 1a96a91ad..c76cdc1b2 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.93.4 + 0.93.5-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.2.4 + 2.2.5-SNAPSHOT diff --git a/versions.txt b/versions.txt index 2bbb42f5c..05561e8ca 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.2.4:2.2.4 -google-cloud-datastore-bom:2.2.4:2.2.4 -google-cloud-datastore-parent:2.2.4:2.2.4 -proto-google-cloud-datastore-v1:0.93.4:0.93.4 -datastore-v1-proto-client:2.2.4:2.2.4 +google-cloud-datastore:2.2.4:2.2.5-SNAPSHOT +google-cloud-datastore-bom:2.2.4:2.2.5-SNAPSHOT +google-cloud-datastore-parent:2.2.4:2.2.5-SNAPSHOT +proto-google-cloud-datastore-v1:0.93.4:0.93.5-SNAPSHOT +datastore-v1-proto-client:2.2.4:2.2.5-SNAPSHOT From 74d6d7396f756d81c8ff258505b7c69c3c6344b0 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 4 Feb 2022 11:12:57 -0800 Subject: [PATCH 02/23] chore: add kokoro config to run nightly integration test on java11.0.14 (#635) Source-Author: Neenu Shaji Source-Date: Thu Feb 3 13:21:25 2022 -0500 Source-Repo: googleapis/synthtool Source-Sha: 010e6b0541130bef2cfe453380a31bea959278c5 Source-Link: https://github.com/googleapis/synthtool/commit/010e6b0541130bef2cfe453380a31bea959278c5 --- .kokoro/nightly/java11-integration.cfg | 37 ++++++++++++++++++++++++++ synth.metadata | 5 ++-- 2 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 .kokoro/nightly/java11-integration.cfg diff --git a/.kokoro/nightly/java11-integration.cfg b/.kokoro/nightly/java11-integration.cfg new file mode 100644 index 000000000..58049cc38 --- /dev/null +++ b/.kokoro/nightly/java11-integration.cfg @@ -0,0 +1,37 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-public-resources/java11014" +} + +env_vars: { + key: "JOB_TYPE" + value: "integration" +} +# TODO: remove this after we've migrated all tests and scripts +env_vars: { + key: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_CLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "ENABLE_FLAKYBOT" + value: "true" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "secret_manager/java-it-service-account" +} + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "java-it-service-account" +} diff --git a/synth.metadata b/synth.metadata index 4ff1edde0..b2f526b6c 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-datastore.git", - "sha": "ea973af5ab5296a08f75f322706e0f9cd58fcba6" + "sha": "1810bae27175ea5db1fa8ea78a36fc717461f496" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "466412a75d636d69bcf8a42d9a5f956e73ac421d" + "sha": "010e6b0541130bef2cfe453380a31bea959278c5" } } ], @@ -61,6 +61,7 @@ ".kokoro/dependencies.sh", ".kokoro/nightly/common.cfg", ".kokoro/nightly/integration.cfg", + ".kokoro/nightly/java11-integration.cfg", ".kokoro/nightly/java11.cfg", ".kokoro/nightly/java7.cfg", ".kokoro/nightly/java8-osx.cfg", From 2507460d86e700adb470a282097604cfb98a555e Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 8 Feb 2022 18:40:49 +0100 Subject: [PATCH 03/23] build(deps): update dependency com.google.cloud:google-cloud-shared-config to v1.2.7 (#638) 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-config](https://togithub.com/googleapis/java-shared-config) | `1.2.6` -> `1.2.7` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.7/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.7/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.7/compatibility-slim/1.2.6)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.7/confidence-slim/1.2.6)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-config ### [`v1.2.7`](https://togithub.com/googleapis/java-shared-config/blob/HEAD/CHANGELOG.md#​127-httpsgithubcomgoogleapisjava-shared-configcomparev126v127-2022-02-04) [Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.2.6...v1.2.7)
--- ### 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, click this checkbox. --- 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). --- google-cloud-datastore-bom/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index bb4c4af8c..310d1d781 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud google-cloud-shared-config - 1.2.6 + 1.2.7 Google Cloud datastore BOM diff --git a/pom.xml b/pom.xml index 59aab6c2c..a01e575da 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.2.6 + 1.2.7 From c3c9fb7dcd6bd29aaedc3b64db2323d463d6ddf9 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 8 Feb 2022 20:14:49 +0100 Subject: [PATCH 04/23] chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.2.4 (#636) 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-datastore](https://togithub.com/googleapis/java-datastore) | `2.2.3` -> `2.2.4` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.4/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.4/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.4/compatibility-slim/2.2.3)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.2.4/confidence-slim/2.2.3)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-datastore ### [`v2.2.4`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#​224-httpsgithubcomgoogleapisjava-datastorecomparev223v224-2022-02-03) [Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.2.3...v2.2.4)
--- ### 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, click this checkbox. --- 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/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 bc339cb3e..3484131b6 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.2.3 + 2.2.4 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 452a0c260..b6625214c 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.2.3 + 2.2.4 From 577978cf5ecc5b644599ea98927534ca7a71a8d8 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 8 Feb 2022 23:14:52 +0100 Subject: [PATCH 05/23] chore(deps): update dependency com.google.cloud:libraries-bom to v24.3.0 (#639) 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://cloud.google.com/java/docs/bom) ([source](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java)) | `24.2.0` -> `24.3.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/24.3.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/24.3.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/24.3.0/compatibility-slim/24.2.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/24.3.0/confidence-slim/24.2.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, click this checkbox. --- 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 ee1384b09..becb3dbe5 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 24.2.0 + 24.3.0 pom import From d8ce0e7df9c297977c674bd35def7fec957bfce0 Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Mon, 14 Feb 2022 16:40:52 -0500 Subject: [PATCH 06/23] chore: migrate to owlbot (#584) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: migrate to owlbot * update owlbot * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * fix readme partials * fix xmls Co-authored-by: Kristen O'Leary Co-authored-by: Owl Bot --- .github/.OwlBot.lock.yaml | 3 + .github/.OwlBot.yaml | 25 + .github/workflows/approve-readme.yaml | 15 + .github/workflows/auto-release.yaml | 27 +- .github/workflows/ci.yaml | 15 + .github/workflows/samples.yaml | 15 + .kokoro/build.bat | 15 + .readme-partials.yaml | 10 +- .repo-metadata.json | 5 +- README.md | 17 +- datastore-v1-proto-client/pom.xml | 2 +- google-cloud-datastore-bom/pom.xml | 12 +- google-cloud-datastore/pom.xml | 4 +- .../google/cloud/datastore/package-info.java | 4 +- .../cloud/datastore/testing/package-info.java | 2 +- synth.py => owlbot.py | 52 +- pom.xml | 14 +- proto-google-cloud-datastore-v1/pom.xml | 2 +- .../example/datastore/QuickstartSample.java | 7 +- .../google/datastore/snippets/TaskList.java | 25 +- .../example/datastore/QuickstartSampleIT.java | 4 +- .../datastore/snippets/ConceptsTest.java | 502 ++++++++++-------- versions.txt | 2 - 23 files changed, 465 insertions(+), 314 deletions(-) create mode 100644 .github/.OwlBot.lock.yaml create mode 100644 .github/.OwlBot.yaml rename synth.py => owlbot.py (55%) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml new file mode 100644 index 000000000..3aedd6c11 --- /dev/null +++ b/.github/.OwlBot.lock.yaml @@ -0,0 +1,3 @@ +docker: + digest: sha256:3c950ed12391ebaffd1ee66d0374766a1c50144ebe6a7a0042300b2e6bb5856b + image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml new file mode 100644 index 000000000..d110678c0 --- /dev/null +++ b/.github/.OwlBot.yaml @@ -0,0 +1,25 @@ +# 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. +# 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. + +docker: + image: "gcr.io/cloud-devrel-public-resources/owlbot-java:latest" +deep-remove-regex: +- "/proto-google-.*/src" + +deep-preserve-regex: +- "/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java" + +deep-copy-regex: +- source: "/google/datastore/(v.*)/.*-java/proto-google-.*/src" + dest: "/owl-bot-staging/$1/proto-google-cloud-datastore-$1/src" diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml index c51324279..1bb182327 100644 --- a/.github/workflows/approve-readme.yaml +++ b/.github/workflows/approve-readme.yaml @@ -1,3 +1,18 @@ +# Copyright 2022 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# Github action job to test core java library features on +# downstream client libraries before they are released. on: pull_request: name: auto-merge-readme diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml index 59c7cadde..18e23230d 100644 --- a/.github/workflows/auto-release.yaml +++ b/.github/workflows/auto-release.yaml @@ -1,3 +1,18 @@ +# Copyright 2022 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# Github action job to test core java library features on +# downstream client libraries before they are released. on: pull_request: name: auto-release @@ -16,13 +31,13 @@ jobs: return; } - // only approve PRs like "chore: release " - if ( !context.payload.pull_request.title.startsWith("chore: release") ) { + // only approve PRs like "chore(main): release " + if ( !context.payload.pull_request.title.startsWith("chore(main): release") ) { return; } // only approve PRs with pom.xml and versions.txt changes - const filesPromise = github.pulls.listFiles.endpoint({ + const filesPromise = github.rest.pulls.listFiles.endpoint({ owner: context.repo.owner, repo: context.repo.repo, pull_number: context.payload.pull_request.number, @@ -54,7 +69,7 @@ jobs: return; } - const promise = github.pulls.list.endpoint({ + const promise = github.rest.pulls.list.endpoint({ owner: context.repo.owner, repo: context.repo.repo, state: 'open' @@ -71,7 +86,7 @@ jobs: } // approve release PR - await github.pulls.createReview({ + await github.rest.pulls.createReview({ owner: context.repo.owner, repo: context.repo.repo, body: 'Rubber stamped release!', @@ -80,7 +95,7 @@ jobs: }); // attach kokoro:force-run and automerge labels - await github.issues.addLabels({ + await github.rest.issues.addLabels({ owner: context.repo.owner, repo: context.repo.repo, issue_number: context.payload.pull_request.number, diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 05de1f60d..6b5e56aaa 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,3 +1,18 @@ +# Copyright 2022 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# Github action job to test core java library features on +# downstream client libraries before they are released. on: push: branches: diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml index c46230a78..d5d964df1 100644 --- a/.github/workflows/samples.yaml +++ b/.github/workflows/samples.yaml @@ -1,3 +1,18 @@ +# Copyright 2022 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# Github action job to test core java library features on +# downstream client libraries before they are released. on: pull_request: name: samples diff --git a/.kokoro/build.bat b/.kokoro/build.bat index 05826ad93..cc602c9eb 100644 --- a/.kokoro/build.bat +++ b/.kokoro/build.bat @@ -1,3 +1,18 @@ :: See documentation in type-shell-output.bat +# Copyright 2022 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# Github action job to test core java library features on +# downstream client libraries before they are released. "C:\Program Files\Git\bin\bash.exe" %~dp0build.sh diff --git a/.readme-partials.yaml b/.readme-partials.yaml index 0796b52e5..971616778 100644 --- a/.readme-partials.yaml +++ b/.readme-partials.yaml @@ -111,12 +111,12 @@ custom_content: | This library has tools to help write tests for code that uses the Datastore. - See [TESTING.md](https://github.com/googleapis/google-cloud-java/blob/master/TESTING.md#testing-code-that-uses-datastore) to read more about testing. + See [TESTING.md](https://github.com/googleapis/google-cloud-java/blob/main/TESTING.md#testing-code-that-uses-datastore) to read more about testing. Example Applications -------------------- - - [`Bookshelf`](https://github.com/GoogleCloudPlatform/getting-started-java/tree/master/bookshelf) - An App Engine app that manages a virtual bookshelf. + - [`Bookshelf`](https://github.com/GoogleCloudPlatform/getting-started-java/tree/main/bookshelf) - An App Engine app that manages a virtual bookshelf. - This app uses `google-cloud` to interface with Cloud Datastore and Cloud Storage. It also uses Cloud SQL, another Google Cloud Platform service. - - [`Flexible Environment/Datastore example`](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/flexible/datastore) - A simple app that uses Cloud Datastore to list the last 10 IP addresses that visited your site. - - [`SparkDemo`](https://github.com/GoogleCloudPlatform/java-docs-samples/blob/master/flexible/sparkjava) - An example of using `google-cloud-datastore` from within the SparkJava and App Engine Flexible Environment frameworks. - - Read about how it works on the example's [README page](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/flexible/sparkjava#how-does-it-work). + - [`Flexible Environment/Datastore example`](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/main/flexible/datastore) - A simple app that uses Cloud Datastore to list the last 10 IP addresses that visited your site. + - [`SparkDemo`](https://github.com/GoogleCloudPlatform/java-docs-samples/blob/main/flexible/sparkjava) - An example of using `google-cloud-datastore` from within the SparkJava and App Engine Flexible Environment frameworks. + - Read about how it works on the example's [README page](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/main/flexible/sparkjava#how-does-it-work). diff --git a/.repo-metadata.json b/.repo-metadata.json index 565a33748..72965ea86 100644 --- a/.repo-metadata.json +++ b/.repo-metadata.json @@ -12,5 +12,8 @@ "codeowner_team": "@googleapis/firestore-dpe", "api_id": "datastore.googleapis.com", "library_type": "GAPIC_COMBO", - "api_description": "is a fully managed, schemaless database for\nstoring non-relational data. Cloud Datastore automatically scales with\nyour users and supports ACID transactions, high availability of reads and\nwrites, strong consistency for reads and ancestor queries, and eventual\nconsistency for all other queries." + "api_description": "is a fully managed, schemaless database for\nstoring non-relational data. Cloud Datastore automatically scales with\nyour users and supports ACID transactions, high availability of reads and\nwrites, strong consistency for reads and ancestor queries, and eventual\nconsistency for all other queries.", + "excluded_dependencies": "grpc-google-cloud-datastore-v1", + "extra_versioned_modules": "datastore-v1-proto-client", + "excluded_poms": "grpc-google-cloud-datastore-v1" } diff --git a/README.md b/README.md index c956dab0d..e43387695 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 - 23.0.0 + 24.3.0 pom import @@ -41,7 +41,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-datastore - 2.1.0 + 2.2.4 ``` @@ -49,20 +49,20 @@ 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:23.0.0') +implementation platform('com.google.cloud:libraries-bom:24.3.0') implementation 'com.google.cloud:google-cloud-datastore' ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.1.0' +implementation 'com.google.cloud:google-cloud-datastore:2.2.4' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.1.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.2.4" ``` ## Authentication @@ -243,7 +243,7 @@ To get help, follow the instructions in the [shared Troubleshooting document][tr ## Supported Java Versions -Java 7 or above is required for using this client. +Java 8 or above is required for using this client. Google's Java client libraries, [Google Cloud Client Libraries][cloudlibs] @@ -312,7 +312,6 @@ Apache 2.0 - See [LICENSE][license] for more information. Java Version | Status ------------ | ------ -Java 7 | [![Kokoro CI][kokoro-badge-image-1]][kokoro-badge-link-1] Java 8 | [![Kokoro CI][kokoro-badge-image-2]][kokoro-badge-link-2] Java 8 OSX | [![Kokoro CI][kokoro-badge-image-3]][kokoro-badge-link-3] Java 8 Windows | [![Kokoro CI][kokoro-badge-image-4]][kokoro-badge-link-4] @@ -321,7 +320,7 @@ Java 11 | [![Kokoro CI][kokoro-badge-image-5]][kokoro-badge-link-5] Java is a registered trademark of Oracle and/or its affiliates. [product-docs]: https://cloud.google.com/datastore -[javadocs]: https://googleapis.dev/java/google-cloud-datastore/latest/index.html +[javadocs]: https://cloud.google.com/java/docs/reference/google-cloud-datastore/latest/history [kokoro-badge-image-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java7.svg [kokoro-badge-link-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java7.html [kokoro-badge-image-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java8.svg @@ -332,7 +331,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-4]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java8-win.html [kokoro-badge-image-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.svg [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html -[stability-image]: https://img.shields.io/badge/stability-ga-green +[stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg [maven-version-link]: https://search.maven.org/search?q=g:com.google.cloud%20AND%20a:google-cloud-datastore&core=gav [authentication]: https://github.com/googleapis/google-cloud-java#authentication diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index efb2dad09..0e0e5e422 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -24,7 +24,7 @@ com.google.cloud google-cloud-datastore-parent - 2.2.5-SNAPSHOT + 2.2.5-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 310d1d781..13f831b33 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 com.google.cloud @@ -49,16 +49,16 @@ - - com.google.api.grpc - proto-google-cloud-datastore-v1 - 0.93.5-SNAPSHOT - com.google.cloud google-cloud-datastore 2.2.5-SNAPSHOT + + com.google.api.grpc + proto-google-cloud-datastore-v1 + 0.93.5-SNAPSHOT + diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index a723c28f5..dbdff3bf3 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.2.5-SNAPSHOT + 2.2.5-SNAPSHOT google-cloud-datastore diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/package-info.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/package-info.java index e2c598534..f0f35511f 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/package-info.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/package-info.java @@ -19,7 +19,7 @@ * *

Here's a simple usage example for using google-cloud from App/Compute Engine. This example * shows how to create a Datastore entity. For the complete source code see + * href="https://github.com/googleapis/google-cloud-java/tree/main/google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/snippets/CreateEntity.java"> * CreateEntity.java. * *

{@code
@@ -36,7 +36,7 @@
  *
  * 

This second example shows how to get and update a Datastore entity if it exists. For the * complete source code see + * href="https://github.com/googleapis/google-cloud-java/main/master/google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/snippets/UpdateEntity.java"> * UpdateEntity.java. * *

{@code
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/package-info.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/package-info.java
index 007bb3d99..86a13feff 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/package-info.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/package-info.java
@@ -34,7 +34,7 @@
  * }
* * @see + * href="https://github.com/googleapis/google-cloud-java/main/master/TESTING.md#testing-code-that-uses-datastore"> * Google Cloud Java tools for testing */ package com.google.cloud.datastore.testing; diff --git a/synth.py b/owlbot.py similarity index 55% rename from synth.py rename to owlbot.py index 7220e8879..784f35a40 100644 --- a/synth.py +++ b/owlbot.py @@ -1,10 +1,10 @@ -# Copyright 2018 Google LLC +# 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. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://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, @@ -12,16 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -"""This script is used to synthesize generated parts of this library.""" - import synthtool as s -import synthtool.gcp as gcp -import synthtool.languages.java as java - -AUTOSYNTH_MULTIPLE_COMMITS = True - -gapic = gcp.GAPICBazel() - +from synthtool.languages import java protobuf_header = "// Generated by the protocol buffer compiler. DO NOT EDIT!" # License header license_header = """/* @@ -40,31 +32,17 @@ * limitations under the License. */ """ - service = 'datastore' -versions = ['v1'] - -for version in versions: - library = gapic.java_library( - service=service, - version=version, - bazel_target=f'//google/{service}/{version}:google-cloud-{service}-{version}-java', - proto_path=f'google/{service}/{version}', - ) - - library = library / f'google-cloud-{service}-{version}-java' - - s.replace( - library / f'proto-google-cloud-{service}-{version}-java/src/**/*.java', - protobuf_header, - f'{license_header}{protobuf_header}' - ) - - # Datastore only generates protos - s.copy(library / f'proto-google-cloud-{service}-{version}-java/src', f'proto-google-cloud-{service}-{version}/src') - - java.format_code('google-cloud-datastore/src') - java.format_code(f'proto-google-cloud-{service}-{version}/src') - +version = 'v1' + +for library in s.get_staging_dirs(): + # put any special-case replacements here + s.replace( + f'owl-bot-staging/v1/proto-google-cloud-{service}-{version}-java/src/**/*.java', + protobuf_header, + f'{license_header}{protobuf_header}' + ) + s.move(library) + +s.remove_staging_dirs() java.common_templates() - diff --git a/pom.xml b/pom.xml index a01e575da..9049b1003 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.2.5-SNAPSHOT + 2.2.5-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -155,6 +155,11 @@ import + + com.google.cloud + google-cloud-datastore + 2.2.1-SNAPSHOT + com.google.api.grpc proto-google-cloud-datastore-v1 @@ -206,9 +211,10 @@ - datastore-v1-proto-client - proto-google-cloud-datastore-v1 google-cloud-datastore + proto-google-cloud-datastore-v1 + datastore-v1-proto-client google-cloud-datastore-bom - + + diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index c76cdc1b2..06798a186 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -10,7 +10,7 @@ com.google.cloud google-cloud-datastore-parent - 2.2.5-SNAPSHOT + 2.2.5-SNAPSHOT diff --git a/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java b/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java index ba1a67706..437ceb3a0 100644 --- a/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java +++ b/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java @@ -36,20 +36,17 @@ public static void main(String... args) throws Exception { Key taskKey = datastore.newKeyFactory().setKind(kind).newKey(name); // Prepares the new entity - Entity task = Entity.newBuilder(taskKey) - .set("description", "Buy milk") - .build(); + Entity task = Entity.newBuilder(taskKey).set("description", "Buy milk").build(); // Saves the entity datastore.put(task); System.out.printf("Saved %s: %s%n", task.getKey().getName(), task.getString("description")); - //Retrieve entity + // Retrieve entity Entity retrieved = datastore.get(taskKey); System.out.printf("Retrieved %s: %s%n", taskKey.getName(), retrieved.getString("description")); - } } // [END datastore_quickstart] diff --git a/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java b/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java index 3f035d3e3..135bedded 100644 --- a/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java +++ b/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java @@ -54,11 +54,14 @@ public class TaskList { */ Key addTask(String description) { Key key = datastore.allocateId(keyFactory.newKey()); - Entity task = Entity.newBuilder(key) - .set("description", StringValue.newBuilder(description).setExcludeFromIndexes(true).build()) - .set("created", Timestamp.now()) - .set("done", false) - .build(); + Entity task = + Entity.newBuilder(key) + .set( + "description", + StringValue.newBuilder(description).setExcludeFromIndexes(true).build()) + .set("created", Timestamp.now()) + .set("done", false) + .build(); datastore.put(task); return key; } @@ -128,8 +131,12 @@ static List formatTasks(Iterator tasks) { strings.add( String.format("%d : %s (done)", task.getKey().getId(), task.getString("description"))); } else { - strings.add(String.format("%d : %s (created %s)", task.getKey().getId(), - task.getString("description"), task.getTimestamp("created"))); + strings.add( + String.format( + "%d : %s (created %s)", + task.getKey().getId(), + task.getString("description"), + task.getTimestamp("created"))); } } return strings; @@ -198,8 +205,8 @@ private void assertArgsLength(String[] args, int expectedLength) { /** * Exercises the methods defined in this class. * - *

Assumes that you are authenticated using the Google Cloud SDK (using - * {@code gcloud auth application-default login}). + *

Assumes that you are authenticated using the Google Cloud SDK (using {@code gcloud auth + * application-default login}). */ public static void main(String[] args) throws Exception { TaskList taskList = new TaskList(); diff --git a/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java b/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java index 6bb2dfe30..1d46f20a4 100644 --- a/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java +++ b/samples/snippets/src/test/java/com/example/datastore/QuickstartSampleIT.java @@ -29,9 +29,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -/** - * Tests for quickstart sample. - */ +/** Tests for quickstart sample. */ @RunWith(JUnit4.class) @SuppressWarnings("checkstyle:abbreviationaswordinname") public class QuickstartSampleIT { diff --git a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java index 92500ddf9..1d10f1f6d 100644 --- a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java +++ b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java @@ -75,9 +75,7 @@ import org.junit.runners.JUnit4; import org.threeten.bp.Duration; -/** - * Contains Cloud Datastore snippets demonstrating concepts for documentation. - */ +/** Contains Cloud Datastore snippets demonstrating concepts for documentation. */ @RunWith(JUnit4.class) public class ConceptsTest { @@ -92,8 +90,7 @@ public class ConceptsTest { private Timestamp endDate; private Timestamp includedDate; - @Rule - public ExpectedException thrown = ExpectedException.none(); + @Rule public ExpectedException thrown = ExpectedException.none(); /** * Starts the local Datastore emulator. @@ -107,7 +104,7 @@ public static void beforeClass() throws IOException, InterruptedException { } /** - * Initializes Datastore and cleans out any residual values. Also initializes global variables + * Initializes Datastore and cleans out any residual values. Also initializes global variables * used for testing. */ @Before @@ -163,10 +160,12 @@ public void testNamedKey() { @Test public void testKeyWithParent() { // [START datastore_key_with_parent] - Key taskKey = datastore.newKeyFactory() - .addAncestors(PathElement.of("TaskList", "default")) - .setKind("Task") - .newKey("sampleTask"); + Key taskKey = + datastore + .newKeyFactory() + .addAncestors(PathElement.of("TaskList", "default")) + .setKind("Task") + .newKey("sampleTask"); // [END datastore_key_with_parent] assertValidKey(taskKey); } @@ -174,9 +173,11 @@ public void testKeyWithParent() { @Test public void testKeyWithMultilevelParent() { // [START datastore_key_with_multilevel_parent] - KeyFactory keyFactory = datastore.newKeyFactory() - .addAncestors(PathElement.of("User", "Alice"), PathElement.of("TaskList", "default")) - .setKind("Task"); + KeyFactory keyFactory = + datastore + .newKeyFactory() + .addAncestors(PathElement.of("User", "Alice"), PathElement.of("TaskList", "default")) + .setKind("Task"); Key taskKey = keyFactory.newKey("sampleTask"); // [END datastore_key_with_multilevel_parent] assertValidKey(taskKey); @@ -190,16 +191,19 @@ private void assertValidEntity(Entity original) { @Test public void testEntityWithParent() { // [START datastore_entity_with_parent] - Key taskKey = datastore.newKeyFactory() - .addAncestors(PathElement.of("TaskList", "default")) - .setKind("Task") - .newKey("sampleTask"); - Entity task = Entity.newBuilder(taskKey) - .set("category", "Personal") - .set("done", false) - .set("priority", 4) - .set("description", "Learn Cloud Datastore") - .build(); + Key taskKey = + datastore + .newKeyFactory() + .addAncestors(PathElement.of("TaskList", "default")) + .setKind("Task") + .newKey("sampleTask"); + Entity task = + Entity.newBuilder(taskKey) + .set("category", "Personal") + .set("done", false) + .set("priority", 4) + .set("description", "Learn Cloud Datastore") + .build(); // [END datastore_entity_with_parent] assertValidEntity(task); } @@ -207,15 +211,17 @@ public void testEntityWithParent() { @Test public void testProperties() { // [START datastore_properties] - Entity task = Entity.newBuilder(taskKey) - .set("category", "Personal") - .set("created", Timestamp.now()) - .set("done", false) - .set("priority", 4) - .set("percent_complete", 10.0) - .set("description", - StringValue.newBuilder("Learn Cloud Datastore").setExcludeFromIndexes(true).build()) - .build(); + Entity task = + Entity.newBuilder(taskKey) + .set("category", "Personal") + .set("created", Timestamp.now()) + .set("done", false) + .set("priority", 4) + .set("percent_complete", 10.0) + .set( + "description", + StringValue.newBuilder("Learn Cloud Datastore").setExcludeFromIndexes(true).build()) + .build(); // [END datastore_properties] assertValidEntity(task); } @@ -223,10 +229,11 @@ public void testProperties() { @Test public void testArrayValue() { // [START datastore_array_value] - Entity task = Entity.newBuilder(taskKey) - .set("tags", "fun", "programming") - .set("collaborators", ListValue.of("alice", "bob")) - .build(); + Entity task = + Entity.newBuilder(taskKey) + .set("tags", "fun", "programming") + .set("collaborators", ListValue.of("alice", "bob")) + .build(); // [END datastore_array_value] assertValidEntity(task); } @@ -234,15 +241,14 @@ public void testArrayValue() { @Test public void testBasicEntity() { // [START datastore_basic_entity] - Key taskKey = datastore.newKeyFactory() - .setKind("Task") - .newKey("sampleTask"); - Entity task = Entity.newBuilder(taskKey) - .set("category", "Personal") - .set("done", false) - .set("priority", 4) - .set("description", "Learn Cloud Datastore") - .build(); + Key taskKey = datastore.newKeyFactory().setKind("Task").newKey("sampleTask"); + Entity task = + Entity.newBuilder(taskKey) + .set("category", "Personal") + .set("done", false) + .set("priority", 4) + .set("description", "Learn Cloud Datastore") + .build(); // [END datastore_basic_entity] assertValidEntity(task); } @@ -293,18 +299,20 @@ public void testDelete() { } private List setUpBatchTests(Key taskKey1, Key taskKey2) { - Entity task1 = Entity.newBuilder(taskKey1) - .set("category", "Personal") - .set("done", false) - .set("priority", 4) - .set("description", "Learn Cloud Datastore") - .build(); - Entity task2 = Entity.newBuilder(taskKey2) - .set("category", "Personal") - .set("done", false) - .set("priority", 5) - .set("description", "Integrate Cloud Datastore") - .build(); + Entity task1 = + Entity.newBuilder(taskKey1) + .set("category", "Personal") + .set("done", false) + .set("priority", 4) + .set("description", "Learn Cloud Datastore") + .build(); + Entity task2 = + Entity.newBuilder(taskKey2) + .set("category", "Personal") + .set("done", false) + .set("priority", 5) + .set("description", "Integrate Cloud Datastore") + .build(); datastore.put(task1, task2); return ImmutableList.of(task1, task2); } @@ -312,18 +320,20 @@ private List setUpBatchTests(Key taskKey1, Key taskKey2) { @Test public void testBatchUpsert() { // [START datastore_batch_upsert] - FullEntity task1 = FullEntity.newBuilder(keyFactory.newKey()) - .set("category", "Personal") - .set("done", false) - .set("priority", 4) - .set("description", "Learn Cloud Datastore") - .build(); - FullEntity task2 = Entity.newBuilder(keyFactory.newKey()) - .set("category", "Personal") - .set("done", false) - .set("priority", 5) - .set("description", "Integrate Cloud Datastore") - .build(); + FullEntity task1 = + FullEntity.newBuilder(keyFactory.newKey()) + .set("category", "Personal") + .set("done", false) + .set("priority", 4) + .set("description", "Learn Cloud Datastore") + .build(); + FullEntity task2 = + Entity.newBuilder(keyFactory.newKey()) + .set("category", "Personal") + .set("done", false) + .set("priority", 5) + .set("description", "Integrate Cloud Datastore") + .build(); List tasks = datastore.add(task1, task2); Key taskKey1 = tasks.get(0).getKey(); Key taskKey2 = tasks.get(1).getKey(); @@ -357,21 +367,25 @@ public void testBatchDelete() { } private void setUpQueryTests() { - Key taskKey = datastore.newKeyFactory() - .setKind("Task") - .addAncestors(PathElement.of("TaskList", "default")) - .newKey("someTask"); - datastore.put(Entity.newBuilder(taskKey) - .set("category", "Personal") - .set("done", false) - .set("completed", false) - .set("priority", 4) - .set("created", includedDate) - .set("percent_complete", 10.0) - .set("description", - StringValue.newBuilder("Learn Cloud Datastore").setExcludeFromIndexes(true).build()) - .set("tag", "fun", "l", "programming") - .build()); + Key taskKey = + datastore + .newKeyFactory() + .setKind("Task") + .addAncestors(PathElement.of("TaskList", "default")) + .newKey("someTask"); + datastore.put( + Entity.newBuilder(taskKey) + .set("category", "Personal") + .set("done", false) + .set("completed", false) + .set("priority", 4) + .set("created", includedDate) + .set("percent_complete", 10.0) + .set( + "description", + StringValue.newBuilder("Learn Cloud Datastore").setExcludeFromIndexes(true).build()) + .set("tag", "fun", "l", "programming") + .build()); } private V assertValidQuery(Query query) { @@ -390,12 +404,14 @@ private void assertInvalidQuery(Query query) { public void testBasicQuery() { setUpQueryTests(); // [START datastore_basic_query] - Query query = Query.newEntityQueryBuilder() - .setKind("Task") - .setFilter(CompositeFilter.and( - PropertyFilter.eq("done", false), PropertyFilter.ge("priority", 4))) - .setOrderBy(OrderBy.desc("priority")) - .build(); + Query query = + Query.newEntityQueryBuilder() + .setKind("Task") + .setFilter( + CompositeFilter.and( + PropertyFilter.eq("done", false), PropertyFilter.ge("priority", 4))) + .setOrderBy(OrderBy.desc("priority")) + .build(); // [END datastore_basic_query] assertValidQuery(query); } @@ -416,8 +432,10 @@ public void testPropertyFilter() { setUpQueryTests(); // [START datastore_property_filter] Query query = - Query.newEntityQueryBuilder().setKind("Task").setFilter(PropertyFilter.eq("done", false)) - .build(); + Query.newEntityQueryBuilder() + .setKind("Task") + .setFilter(PropertyFilter.eq("done", false)) + .build(); // [END datastore_property_filter] assertValidQuery(query); } @@ -426,11 +444,13 @@ public void testPropertyFilter() { public void testCompositeFilter() { setUpQueryTests(); // [START datastore_composite_filter] - Query query = Query.newEntityQueryBuilder() - .setKind("Task") - .setFilter( - CompositeFilter.and(PropertyFilter.eq("done", false), PropertyFilter.eq("priority", 4))) - .build(); + Query query = + Query.newEntityQueryBuilder() + .setKind("Task") + .setFilter( + CompositeFilter.and( + PropertyFilter.eq("done", false), PropertyFilter.eq("priority", 4))) + .build(); // [END datastore_composite_filter] assertValidQuery(query); } @@ -439,10 +459,11 @@ public void testCompositeFilter() { public void testKeyFilter() { setUpQueryTests(); // [START datastore_key_filter] - Query query = Query.newEntityQueryBuilder() - .setKind("Task") - .setFilter(PropertyFilter.gt("__key__", keyFactory.newKey("someTask"))) - .build(); + Query query = + Query.newEntityQueryBuilder() + .setKind("Task") + .setFilter(PropertyFilter.gt("__key__", keyFactory.newKey("someTask"))) + .build(); // [END datastore_key_filter] assertValidQuery(query); } @@ -471,10 +492,11 @@ public void testDescendingSort() { public void testMultiSort() { setUpQueryTests(); // [START datastore_multi_sort] - Query query = Query.newEntityQueryBuilder() - .setKind("Task") - .setOrderBy(OrderBy.desc("priority"), OrderBy.asc("created")) - .build(); + Query query = + Query.newEntityQueryBuilder() + .setKind("Task") + .setOrderBy(OrderBy.desc("priority"), OrderBy.asc("created")) + .build(); // [END datastore_multi_sort] assertValidQuery(query); } @@ -494,11 +516,13 @@ public void testKindlessQuery() { public void testAncestorQuery() { setUpQueryTests(); // [START datastore_ancestor_query] - Query query = Query.newEntityQueryBuilder() - .setKind("Task") - .setFilter(PropertyFilter.hasAncestor( - datastore.newKeyFactory().setKind("TaskList").newKey("default"))) - .build(); + Query query = + Query.newEntityQueryBuilder() + .setKind("Task") + .setFilter( + PropertyFilter.hasAncestor( + datastore.newKeyFactory().setKind("TaskList").newKey("default"))) + .build(); // [END datastore_ancestor_query] assertValidQuery(query); } @@ -507,10 +531,11 @@ public void testAncestorQuery() { public void testProjectionQuery() { setUpQueryTests(); // [START datastore_projection_query] - Query query = Query.newProjectionEntityQueryBuilder() - .setKind("Task") - .setProjection("priority", "percent_complete") - .build(); + Query query = + Query.newProjectionEntityQueryBuilder() + .setKind("Task") + .setProjection("priority", "percent_complete") + .build(); // [END datastore_projection_query] assertValidQuery(query); } @@ -518,10 +543,11 @@ public void testProjectionQuery() { @Test public void testRunProjectionQuery() { setUpQueryTests(); - Query query = Query.newProjectionEntityQueryBuilder() - .setKind("Task") - .setProjection("priority", "percent_complete") - .build(); + Query query = + Query.newProjectionEntityQueryBuilder() + .setKind("Task") + .setProjection("priority", "percent_complete") + .build(); // [START datastore_run_query_projection] List priorities = new LinkedList<>(); List percentCompletes = new LinkedList<>(); @@ -549,12 +575,13 @@ public void testKeysOnlyQuery() { public void testDistinctOnQuery() { setUpQueryTests(); // [START datastore_distinct_on_query] - Query query = Query.newProjectionEntityQueryBuilder() - .setKind("Task") - .setProjection("category", "priority") - .setDistinctOn("category") - .setOrderBy(OrderBy.asc("category"), OrderBy.asc("priority")) - .build(); + Query query = + Query.newProjectionEntityQueryBuilder() + .setKind("Task") + .setProjection("category", "priority") + .setDistinctOn("category") + .setOrderBy(OrderBy.asc("category"), OrderBy.asc("priority")) + .build(); // [END datastore_distinct_on_query] assertValidQuery(query); } @@ -563,11 +590,13 @@ public void testDistinctOnQuery() { public void testArrayValueInequalityRange() { setUpQueryTests(); // [START datastore_array_value_inequality_range] - Query query = Query.newEntityQueryBuilder() - .setKind("Task") - .setFilter(CompositeFilter.and( - PropertyFilter.gt("tag", "learn"), PropertyFilter.lt("tag", "math"))) - .build(); + Query query = + Query.newEntityQueryBuilder() + .setKind("Task") + .setFilter( + CompositeFilter.and( + PropertyFilter.gt("tag", "learn"), PropertyFilter.lt("tag", "math"))) + .build(); // [END datastore_array_value_inequality_range] QueryResults results = datastore.run(query); assertFalse(results.hasNext()); @@ -577,11 +606,13 @@ public void testArrayValueInequalityRange() { public void testArrayValueEquality() { setUpQueryTests(); // [START datastore_array_value_equality] - Query query = Query.newEntityQueryBuilder() - .setKind("Task") - .setFilter(CompositeFilter.and( - PropertyFilter.eq("tag", "fun"), PropertyFilter.eq("tag", "programming"))) - .build(); + Query query = + Query.newEntityQueryBuilder() + .setKind("Task") + .setFilter( + CompositeFilter.and( + PropertyFilter.eq("tag", "fun"), PropertyFilter.eq("tag", "programming"))) + .build(); // [END datastore_array_value_equality] assertValidQuery(query); } @@ -590,11 +621,13 @@ public void testArrayValueEquality() { public void testInequalityRange() { setUpQueryTests(); // [START datastore_inequality_range] - Query query = Query.newEntityQueryBuilder() - .setKind("Task") - .setFilter(CompositeFilter.and( - PropertyFilter.gt("created", startDate), PropertyFilter.lt("created", endDate))) - .build(); + Query query = + Query.newEntityQueryBuilder() + .setKind("Task") + .setFilter( + CompositeFilter.and( + PropertyFilter.gt("created", startDate), PropertyFilter.lt("created", endDate))) + .build(); // [END datastore_inequality_range] assertValidQuery(query); } @@ -602,11 +635,13 @@ public void testInequalityRange() { @Test public void testInequalityInvalid() { // [START datastore_inequality_invalid] - Query query = Query.newEntityQueryBuilder() - .setKind("Task") - .setFilter(CompositeFilter.and( - PropertyFilter.gt("created", startDate), PropertyFilter.gt("priority", 3))) - .build(); + Query query = + Query.newEntityQueryBuilder() + .setKind("Task") + .setFilter( + CompositeFilter.and( + PropertyFilter.gt("created", startDate), PropertyFilter.gt("priority", 3))) + .build(); // [END datastore_inequality_invalid] assertInvalidQuery(query); } @@ -615,11 +650,15 @@ public void testInequalityInvalid() { public void testEqualAndInequalityRange() { setUpQueryTests(); // [START datastore_equal_and_inequality_range] - Query query = Query.newEntityQueryBuilder() - .setKind("Task") - .setFilter(CompositeFilter.and(PropertyFilter.eq("priority", 4), - PropertyFilter.gt("created", startDate), PropertyFilter.lt("created", endDate))) - .build(); + Query query = + Query.newEntityQueryBuilder() + .setKind("Task") + .setFilter( + CompositeFilter.and( + PropertyFilter.eq("priority", 4), + PropertyFilter.gt("created", startDate), + PropertyFilter.lt("created", endDate))) + .build(); // [END datastore_equal_and_inequality_range] assertValidQuery(query); } @@ -628,11 +667,12 @@ public void testEqualAndInequalityRange() { public void testInequalitySort() { setUpQueryTests(); // [START datastore_inequality_sort] - Query query = Query.newEntityQueryBuilder() - .setKind("Task") - .setFilter(PropertyFilter.gt("priority", 3)) - .setOrderBy(OrderBy.asc("priority"), OrderBy.asc("created")) - .build(); + Query query = + Query.newEntityQueryBuilder() + .setKind("Task") + .setFilter(PropertyFilter.gt("priority", 3)) + .setOrderBy(OrderBy.asc("priority"), OrderBy.asc("created")) + .build(); // [END datastore_inequality_sort] assertValidQuery(query); } @@ -640,11 +680,12 @@ public void testInequalitySort() { @Test public void testInequalitySortInvalidNotSame() { // [START datastore_inequality_sort_invalid_not_same] - Query query = Query.newEntityQueryBuilder() - .setKind("Task") - .setFilter(PropertyFilter.gt("priority", 3)) - .setOrderBy(OrderBy.asc("created")) - .build(); + Query query = + Query.newEntityQueryBuilder() + .setKind("Task") + .setFilter(PropertyFilter.gt("priority", 3)) + .setOrderBy(OrderBy.asc("created")) + .build(); // [END datastore_inequality_sort_invalid_not_same] assertInvalidQuery(query); } @@ -652,11 +693,12 @@ public void testInequalitySortInvalidNotSame() { @Test public void testInequalitySortInvalidNotFirst() { // [START datastore_inequality_sort_invalid_not_first] - Query query = Query.newEntityQueryBuilder() - .setKind("Task") - .setFilter(PropertyFilter.gt("priority", 3)) - .setOrderBy(OrderBy.asc("created"), OrderBy.asc("priority")) - .build(); + Query query = + Query.newEntityQueryBuilder() + .setKind("Task") + .setFilter(PropertyFilter.gt("priority", 3)) + .setOrderBy(OrderBy.asc("created"), OrderBy.asc("priority")) + .build(); // [END datastore_inequality_sort_invalid_not_first] assertInvalidQuery(query); } @@ -682,8 +724,8 @@ public void testCursorPaging() { private Cursor cursorPaging(int pageSize, Cursor pageCursor) { // [START datastore_cursor_paging] - EntityQuery.Builder queryBuilder = Query.newEntityQueryBuilder().setKind("Task") - .setLimit(pageSize); + EntityQuery.Builder queryBuilder = + Query.newEntityQueryBuilder().setKind("Task").setLimit(pageSize); if (pageCursor != null) { queryBuilder.setStartCursor(pageCursor); } @@ -701,11 +743,13 @@ private Cursor cursorPaging(int pageSize, Cursor pageCursor) { public void testEventualConsistentQuery() { setUpQueryTests(); // [START datastore_eventual_consistent_query] - Query query = Query.newEntityQueryBuilder() - .setKind("Task") - .setFilter(PropertyFilter.hasAncestor( - datastore.newKeyFactory().setKind("TaskList").newKey("default"))) - .build(); + Query query = + Query.newEntityQueryBuilder() + .setKind("Task") + .setFilter( + PropertyFilter.hasAncestor( + datastore.newKeyFactory().setKind("TaskList").newKey("default"))) + .build(); datastore.run(query, ReadOption.eventualConsistency()); // [END datastore_eventual_consistent_query] assertValidQuery(query); @@ -715,10 +759,11 @@ public void testEventualConsistentQuery() { public void testUnindexedPropertyQuery() { setUpQueryTests(); // [START datastore_unindexed_property_query] - Query query = Query.newEntityQueryBuilder() - .setKind("Task") - .setFilter(PropertyFilter.eq("description", "A task description")) - .build(); + Query query = + Query.newEntityQueryBuilder() + .setKind("Task") + .setFilter(PropertyFilter.eq("description", "A task description")) + .build(); // [END datastore_unindexed_property_query] QueryResults results = datastore.run(query); assertFalse(results.hasNext()); @@ -727,11 +772,12 @@ public void testUnindexedPropertyQuery() { @Test public void testExplodingProperties() { // [START datastore_exploding_properties] - Entity task = Entity.newBuilder(taskKey) - .set("tags", "fun", "programming", "learn") - .set("collaborators", "alice", "bob", "charlie") - .set("created", Timestamp.now()) - .build(); + Entity task = + Entity.newBuilder(taskKey) + .set("tags", "fun", "programming", "learn") + .set("collaborators", "alice", "bob", "charlie") + .set("created", Timestamp.now()) + .build(); // [END datastore_exploding_properties] assertValidEntity(task); } @@ -766,8 +812,8 @@ void transferFunds(Key fromKey, Key toKey, long amount) { Entity updatedFrom = Entity.newBuilder(from).set("balance", from.getLong("balance") - amount).build(); Entity to = entities.get(1); - Entity updatedTo = Entity.newBuilder(to).set("balance", to.getLong("balance") + amount) - .build(); + Entity updatedTo = + Entity.newBuilder(to).set("balance", to.getLong("balance") + amount).build(); txn.put(updatedFrom, updatedTo); txn.commit(); } finally { @@ -831,17 +877,16 @@ public void testTransactionalSingleEntityGroupReadOnly() { // [START datastore_transactional_single_entity_group_read_only] Entity taskList; QueryResults tasks; - Transaction txn = datastore.newTransaction( - TransactionOptions.newBuilder() - .setReadOnly(ReadOnly.newBuilder().build()) - .build() - ); + Transaction txn = + datastore.newTransaction( + TransactionOptions.newBuilder().setReadOnly(ReadOnly.newBuilder().build()).build()); try { taskList = txn.get(taskListKey); - Query query = Query.newEntityQueryBuilder() - .setKind("Task") - .setFilter(PropertyFilter.hasAncestor(taskListKey)) - .build(); + Query query = + Query.newEntityQueryBuilder() + .setKind("Task") + .setFilter(PropertyFilter.hasAncestor(taskListKey)) + .build(); tasks = txn.run(query); txn.commit(); } finally { @@ -862,12 +907,14 @@ public void testNamespaceRunQuery() { KeyFactory keyFactory = datastore.newKeyFactory().setKind("__namespace__"); Key startNamespace = keyFactory.newKey("g"); Key endNamespace = keyFactory.newKey("h"); - Query query = Query.newKeyQueryBuilder() - .setKind("__namespace__") - .setFilter(CompositeFilter.and( - PropertyFilter.gt("__key__", startNamespace), - PropertyFilter.lt("__key__", endNamespace))) - .build(); + Query query = + Query.newKeyQueryBuilder() + .setKind("__namespace__") + .setFilter( + CompositeFilter.and( + PropertyFilter.gt("__key__", startNamespace), + PropertyFilter.lt("__key__", endNamespace))) + .build(); List namespaces = new ArrayList<>(); QueryResults results = datastore.run(query); while (results.hasNext()) { @@ -910,8 +957,18 @@ public void testPropertyRunQuery() { properties.add(propertyName); } // [END datastore_property_run_query] - Map> expected = ImmutableMap.of("Task", ImmutableSet.of( - "done", "category", "done", "completed", "priority", "created", "percent_complete", "tag")); + Map> expected = + ImmutableMap.of( + "Task", + ImmutableSet.of( + "done", + "category", + "done", + "completed", + "priority", + "created", + "percent_complete", + "tag")); assertEquals(expected, propertiesByKind); } @@ -920,10 +977,11 @@ public void testPropertyByKindRunQuery() { setUpQueryTests(); // [START datastore_property_by_kind_run_query] Key key = datastore.newKeyFactory().setKind("__kind__").newKey("Task"); - Query query = Query.newEntityQueryBuilder() - .setKind("__property__") - .setFilter(PropertyFilter.hasAncestor(key)) - .build(); + Query query = + Query.newEntityQueryBuilder() + .setKind("__property__") + .setFilter(PropertyFilter.hasAncestor(key)) + .build(); QueryResults results = datastore.run(query); Map> representationsByProperty = new HashMap<>(); while (results.hasNext()) { @@ -940,15 +998,16 @@ public void testPropertyByKindRunQuery() { } } // [END datastore_property_by_kind_run_query] - Map> expected = ImmutableMap.>builder() - .put("category", Collections.singleton("STRING")) - .put("done", Collections.singleton("BOOLEAN")) - .put("completed", Collections.singleton("BOOLEAN")) - .put("priority", Collections.singleton("INT64")) - .put("created", Collections.singleton("INT64")) - .put("percent_complete", Collections.singleton("DOUBLE")) - .put("tag", Collections.singleton("STRING")) - .build(); + Map> expected = + ImmutableMap.>builder() + .put("category", Collections.singleton("STRING")) + .put("done", Collections.singleton("BOOLEAN")) + .put("completed", Collections.singleton("BOOLEAN")) + .put("priority", Collections.singleton("INT64")) + .put("created", Collections.singleton("INT64")) + .put("percent_complete", Collections.singleton("DOUBLE")) + .put("tag", Collections.singleton("STRING")) + .build(); assertEquals(expected, representationsByProperty); } @@ -956,14 +1015,17 @@ public void testPropertyByKindRunQuery() { public void testPropertyFilteringRunQuery() { setUpQueryTests(); // [START datastore_property_filtering_run_query] - Key startKey = datastore.newKeyFactory() - .setKind("__property__") - .addAncestors(PathElement.of("__kind__", "Task")) - .newKey("priority"); - Query query = Query.newKeyQueryBuilder() - .setKind("__property__") - .setFilter(PropertyFilter.ge("__key__", startKey)) - .build(); + Key startKey = + datastore + .newKeyFactory() + .setKind("__property__") + .addAncestors(PathElement.of("__kind__", "Task")) + .newKey("priority"); + Query query = + Query.newKeyQueryBuilder() + .setKind("__property__") + .setFilter(PropertyFilter.ge("__key__", startKey)) + .build(); Map> propertiesByKind = new HashMap<>(); QueryResults keys = datastore.run(query); while (keys.hasNext()) { diff --git a/versions.txt b/versions.txt index 05561e8ca..829809f01 100644 --- a/versions.txt +++ b/versions.txt @@ -3,7 +3,5 @@ google-cloud-datastore:2.2.4:2.2.5-SNAPSHOT google-cloud-datastore-bom:2.2.4:2.2.5-SNAPSHOT -google-cloud-datastore-parent:2.2.4:2.2.5-SNAPSHOT proto-google-cloud-datastore-v1:0.93.4:0.93.5-SNAPSHOT datastore-v1-proto-client:2.2.4:2.2.5-SNAPSHOT - From 648f89239d62d41941159a9584e8f636360ae0db Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 15 Feb 2022 01:06:52 +0100 Subject: [PATCH 07/23] build(deps): update dependency org.sonatype.plugins:nexus-staging-maven-plugin to v1.6.10 (#642) 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.sonatype.plugins:nexus-staging-maven-plugin](http://www.sonatype.com/) ([source](https://togithub.com/sonatype/nexus-maven-plugins)) | `1.6.8` -> `1.6.10` | [![age](https://badges.renovateapi.com/packages/maven/org.sonatype.plugins:nexus-staging-maven-plugin/1.6.10/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.sonatype.plugins:nexus-staging-maven-plugin/1.6.10/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.sonatype.plugins:nexus-staging-maven-plugin/1.6.10/compatibility-slim/1.6.8)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.sonatype.plugins:nexus-staging-maven-plugin/1.6.10/confidence-slim/1.6.8)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes

sonatype/nexus-maven-plugins ### [`v1.6.10`](https://togithub.com/sonatype/nexus-maven-plugins/compare/release-1.6.9...release-1.6.10) [Compare Source](https://togithub.com/sonatype/nexus-maven-plugins/compare/release-1.6.9...release-1.6.10)
--- ### 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, click this checkbox. --- 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/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/pom.xml b/samples/pom.xml index 093ab12a3..97b39da49 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -46,7 +46,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.8 + 1.6.10 true From ee16bcedbc0a742377afa59b94e1e8c70a6890a0 Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Tue, 15 Feb 2022 11:11:53 -0500 Subject: [PATCH 08/23] chore: make owlbot check required (#594) --- .github/sync-repo-settings.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index ebdf852e9..ac06e4c3d 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -16,6 +16,7 @@ branchProtectionRules: - units (11) - 'Kokoro - Test: Integration' - cla/google + - OwlBot Post Processor - pattern: 1.106.5-sp isAdminEnforced: true requiredApprovingReviewCount: 1 @@ -59,6 +60,7 @@ branchProtectionRules: - units (11) - 'Kokoro - Test: Integration' - cla/google + - OwlBot Post Processor permissionRules: - team: yoshi-admins permission: admin From 5d0f48403f6746bb7901b13aa223e4de31c3c5a4 Mon Sep 17 00:00:00 2001 From: Patrick Costello Date: Tue, 15 Feb 2022 08:57:44 -0800 Subject: [PATCH 09/23] fix: Use ImmutableMap.Bulder.buildOrThrow() instead of build(). (#632) --- .../src/main/java/com/google/cloud/datastore/GqlQuery.java | 2 +- .../src/main/java/com/google/cloud/datastore/ReadOption.java | 2 +- .../src/main/java/com/google/cloud/datastore/ValueType.java | 2 +- .../src/test/java/com/google/cloud/datastore/ValueTest.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java index df198f1f0..2b99fd0a9 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java @@ -449,7 +449,7 @@ public Map getNamedBindings() { for (Map.Entry binding : namedBindings.entrySet()) { builder.put(binding.getKey(), binding.getValue().getCursorOrValue()); } - return builder.build(); + return builder.buildOrThrow(); } /** Returns an immutable list of positional bindings (using original order). */ diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java index 5e8c092fc..69fe58513 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java @@ -62,6 +62,6 @@ static Map, ReadOption> asImmutableMap(ReadOption... for (ReadOption option : options) { builder.put(option.getClass(), option); } - return builder.build(); + return builder.buildOrThrow(); } } diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueType.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueType.java index 72bacca69..13e3c7af6 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueType.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueType.java @@ -76,7 +76,7 @@ public enum ValueType { builder.put(fieldId, valueType); } } - DESCRIPTOR_TO_TYPE_MAP = builder.build(); + DESCRIPTOR_TO_TYPE_MAP = builder.buildOrThrow(); } , B extends ValueBuilder> ValueType( diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ValueTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ValueTest.java index 365fcae72..8d53dc736 100644 --- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ValueTest.java +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ValueTest.java @@ -58,7 +58,7 @@ public class ValueTest { .put(ValueType.RAW_VALUE, new Object[] {RawValue.class, RAW_VALUE.get()}) .put(ValueType.LAT_LNG, new Object[] {LatLngValue.class, LAT_LNG_VALUE.get()}) .put(ValueType.STRING, new Object[] {StringValue.class, STRING_VALUE.get()}) - .build(); + .buildOrThrow(); private ImmutableMap> typeToValue; @@ -110,7 +110,7 @@ public void setUp() throws Exception { assertTrue("Could not find an of method for " + valueClass, found); } } - typeToValue = builder.build(); + typeToValue = builder.buildOrThrow(); } @Test From b793e7d1bfb8ade4a76f05321c94ab79c8bd6442 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 17 Feb 2022 14:35:11 +0100 Subject: [PATCH 10/23] build(deps): update dependency org.sonatype.plugins:nexus-staging-maven-plugin to v1.6.11 (#644) 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.sonatype.plugins:nexus-staging-maven-plugin](http://www.sonatype.com/) ([source](https://togithub.com/sonatype/nexus-maven-plugins)) | `1.6.10` -> `1.6.11` | [![age](https://badges.renovateapi.com/packages/maven/org.sonatype.plugins:nexus-staging-maven-plugin/1.6.11/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.sonatype.plugins:nexus-staging-maven-plugin/1.6.11/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.sonatype.plugins:nexus-staging-maven-plugin/1.6.11/compatibility-slim/1.6.10)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.sonatype.plugins:nexus-staging-maven-plugin/1.6.11/confidence-slim/1.6.10)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
sonatype/nexus-maven-plugins ### [`v1.6.11`](https://togithub.com/sonatype/nexus-maven-plugins/compare/release-1.6.10...release-1.6.11) [Compare Source](https://togithub.com/sonatype/nexus-maven-plugins/compare/release-1.6.10...release-1.6.11)
--- ### 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, click this checkbox. --- 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/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/pom.xml b/samples/pom.xml index 97b39da49..7061e1504 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -46,7 +46,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.10 + 1.6.11 true From f728901b4984f1cc79a02ecc2ff631322974d761 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Thu, 24 Feb 2022 21:04:12 -0500 Subject: [PATCH 11/23] docs(sample): Add sample for native image support in Datastore (#640) * docs(sample): add native image sample for Datastore --- samples/native-image-sample/README.md | 96 ++++++++++++ samples/native-image-sample/pom.xml | 147 ++++++++++++++++++ .../datastore/NativeImageDatastoreSample.java | 137 ++++++++++++++++ .../ITNativeImageDatastoreSample.java | 75 +++++++++ samples/pom.xml | 1 + 5 files changed, 456 insertions(+) create mode 100644 samples/native-image-sample/README.md create mode 100644 samples/native-image-sample/pom.xml create mode 100644 samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java create mode 100644 samples/native-image-sample/src/test/java/com/example/datastore/ITNativeImageDatastoreSample.java diff --git a/samples/native-image-sample/README.md b/samples/native-image-sample/README.md new file mode 100644 index 000000000..94d053bdc --- /dev/null +++ b/samples/native-image-sample/README.md @@ -0,0 +1,96 @@ +# Datastore Sample Application with Native Image + +This application uses the [Google Cloud Datastore client library](https://cloud.google.com/datastore/docs/reference/libraries) and is compatible with Native Image compilation. + +This sample runs through some basic operations of creating/deleting entities, running queries, and running transaction code. + +## Setup Instructions + +You will need to follow these prerequisite steps in order to run the samples: + +1. If you have not already, [create a Google Cloud Platform Project](https://cloud.google.com/resource-manager/docs/creating-managing-projects#creating_a_project). + +2. Install the [Google Cloud SDK](https://cloud.google.com/sdk/) which will allow you to run the sample with your project's credentials. + + Once installed, log in with Application Default Credentials using the following command: + + ``` + gcloud auth application-default login + ``` + + **Note:** Authenticating with Application Default Credentials is convenient to use during development, but we recommend [alternate methods of authentication](https://cloud.google.com/docs/authentication/production) during production use. + +3. Install the GraalVM compiler. + + You can follow the [official installation instructions](https://www.graalvm.org/docs/getting-started/#install-graalvm) from the GraalVM website. + After following the instructions, ensure that you install the native image extension installed by running: + + ``` + gu install native-image + ``` + + Once you finish following the instructions, verify that the default version of Java is set to the GraalVM version by running `java -version` in a terminal. + + You will see something similar to the below output: + + ``` + $ java -version + + openjdk version "11.0.7" 2020-04-14 + OpenJDK Runtime Environment GraalVM CE 20.1.0 (build 11.0.7+10-jvmci-20.1-b02) + OpenJDK 64-Bit Server VM GraalVM CE 20.1.0 (build 11.0.7+10-jvmci-20.1-b02, mixed mode, sharing) + ``` +## Sample +1. **(Optional)** If you wish to run the application against the [Datastore emulator](https://cloud.google.com/sdk/gcloud/reference/beta/emulators/datastore), ensure that you have the [Google Cloud SDK](https://cloud.google.com/sdk) installed. + + In a new terminal window, start the emulator via `gcloud`: + + ``` + gcloud beta emulators datastore start --host-port=localhost:9010 + ``` + + Leave the emulator running in this terminal for now. + In the next section, we will run the sample application against the Datastore emulator instance. + +2. Navigate to this directory and compile the application with the native image compiler. + + ``` + mvn package -P native -DskipTests + ``` + +3. **(Optional)** If you're using the emulator, export the `DATASTORE_EMULATOR_HOST` as an environment variable in your terminal. + + ``` + export DATASTORE_EMULATOR_HOST=localhost:9010 + ``` + + The Datastore Client Libraries will detect this environment variable and automatically connect to the emulator instance if this variable is set. + +4. Run the application. + + ``` + ./target/native-image-sample + ``` + +5. The application will run through some basic Datastore operations and log some output statements. + + ``` + Successfully added entity. + Reading entity: 1cf34cc1-2b8a-4945-9fc4-058f03dcd08e + Successfully deleted entity: 1cf34cc1-2b8a-4945-9fc4-058f03dcd08e + Run fake transaction code. + Found entity: + name=de4f36f4-3936-4252-98d3-e0d56d485254 + kind=test-kind + namespace=nativeimage-test-namespace + properties={description=StringValue{valueType=STRING, excludeFromIndexes=false, meaning=0, value=hello world}} + Ran transaction callable. + ``` + +### Sample Integration test with Native Image Support + +In order to run the sample integration test as a native image, call the following command: + + ``` + mvn test -Pnative + ``` diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml new file mode 100644 index 000000000..e0031c993 --- /dev/null +++ b/samples/native-image-sample/pom.xml @@ -0,0 +1,147 @@ + + + 4.0.0 + com.example.datastore + native-image-sample + Native Image Sample + https://github.com/googleapis/java-datastore + + + + com.google.cloud.samples + shared-configuration + 1.2.0 + + + + 11 + 11 + UTF-8 + + + + + + com.google.cloud + libraries-bom + 24.2.0 + pom + import + + + + + + + com.google.cloud + google-cloud-datastore + + + + junit + junit + 4.13.2 + test + + + com.google.truth + truth + 1.1.3 + test + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + com.example.datastore.NativeImageDatastoreSample + + + + + + + + + + + + native + + + + com.google.cloud + native-image-support + 0.12.4 + + + org.junit.vintage + junit-vintage-engine + 5.8.2 + test + + + org.graalvm.buildtools + junit-platform-native + 0.9.9 + test + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + 2.22.2 + + + **/IT* + + + + + org.graalvm.buildtools + native-maven-plugin + 0.9.9 + true + + com.example.datastore.NativeImageDatastoreSample + + + --no-fallback + --no-server + + + + + build-native + + build + test + + package + + + test-native + + test + + test + + + + + + + + \ No newline at end of file diff --git a/samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java b/samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java new file mode 100644 index 000000000..54d27985e --- /dev/null +++ b/samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java @@ -0,0 +1,137 @@ +/* + * Copyright 2020-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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.example.datastore; + +import com.google.cloud.datastore.Datastore; +import com.google.cloud.datastore.DatastoreOptions; +import com.google.cloud.datastore.Entity; +import com.google.cloud.datastore.Key; +import com.google.cloud.datastore.Query; +import com.google.cloud.datastore.QueryResults; +import com.google.cloud.datastore.StructuredQuery; +import com.google.cloud.datastore.Transaction; +import java.time.Duration; +import java.time.Instant; +import java.util.UUID; + +/** + * Sample Datastore Application. + */ +public class NativeImageDatastoreSample { + + /* Datastore namespace where entities will be created. */ + private static final String TEST_NAMESPACE = "nativeimage-test-namespace"; + + /* Datastore kind used. */ + private static final String TEST_KIND = "test-kind"; + + /** + * Entrypoint to the Datastore sample application. + */ + public static void main(String[] args) { + Instant startTime = Instant.now(); + Datastore datastore = DatastoreOptions.getDefaultInstance().getService(); + + String testId = UUID.randomUUID().toString(); + + addEntity(datastore, testId); + getEntity(datastore, testId); + deleteEntity(datastore, testId); + + runTransaction(datastore); + + String id = UUID.randomUUID().toString(); + Key key = createKey(datastore, id); + runTransactionCallable(datastore, key); + Instant endTime = Instant.now(); + Duration duration = Duration.between(startTime, endTime); + System.out.println("Duration: " + duration.toString()); + } + + static void addEntity(Datastore datastore, String id) { + Key key = createKey(datastore, id); + Entity entity = Entity.newBuilder(key) + .set("description", "hello world") + .build(); + datastore.add(entity); + System.out.println("Successfully added entity."); + } + + static void getEntity(Datastore datastore, String id) { + Key key = createKey(datastore, id); + Entity entity = datastore.get(key); + System.out.println("Reading entity: " + entity.getKey().getName()); + } + + static void deleteEntity(Datastore datastore, String id) { + Key key = createKey(datastore, id); + datastore.delete(key); + + Entity entity = datastore.get(key); + if (entity == null) { + System.out.println("Successfully deleted entity: " + id); + } else { + throw new RuntimeException("Failed to delete entity: " + id); + } + } + + static void runTransactionCallable(Datastore datastore, Key entityKey) { + datastore.runInTransaction(client -> { + Entity entity = Entity.newBuilder(entityKey) + .set("description", "hello world") + .build(); + datastore.add(entity); + + StructuredQuery query = + Query.newEntityQueryBuilder() + .setNamespace(TEST_NAMESPACE) + .setKind(TEST_KIND) + .build(); + + QueryResults results = datastore.run(query); + while (results.hasNext()) { + Entity result = results.next(); + String name = result.getKey().getName(); + String kind = result.getKey().getKind(); + String namespace = result.getKey().getNamespace(); + System.out.println( + "Found entity:" + "\n\t\tname=" + name + "\n\t\tkind=" + kind + "\n\t\tnamespace=" + + namespace + "\n\t\tproperties=" + result.getProperties().toString()); + } + + datastore.delete(entityKey); + return null; + }); + + System.out.println("Ran transaction callable."); + } + + private static void runTransaction(Datastore datastore) { + Transaction transaction = datastore.newTransaction(); + transaction.commit(); + transaction = datastore.newTransaction(); + transaction.rollback(); + System.out.println("Run fake transaction code."); + } + + static Key createKey(Datastore datastore, String id) { + return datastore.newKeyFactory() + .setNamespace(TEST_NAMESPACE) + .setKind(TEST_KIND) + .newKey(id); + } +} \ No newline at end of file diff --git a/samples/native-image-sample/src/test/java/com/example/datastore/ITNativeImageDatastoreSample.java b/samples/native-image-sample/src/test/java/com/example/datastore/ITNativeImageDatastoreSample.java new file mode 100644 index 000000000..315ecd909 --- /dev/null +++ b/samples/native-image-sample/src/test/java/com/example/datastore/ITNativeImageDatastoreSample.java @@ -0,0 +1,75 @@ +/* + * Copyright 2022 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.example.datastore; + +import static com.google.common.truth.Truth.assertThat; + +import com.google.cloud.datastore.Datastore; +import com.google.cloud.datastore.DatastoreOptions; +import com.google.cloud.datastore.Key; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; +import java.util.UUID; +import org.junit.Before; +import org.junit.Test; + +/** + * Tests for {@link com.example.datastore.NativeImageDatastoreSample} + */ +public class ITNativeImageDatastoreSample { + + private Datastore datastore; + private ByteArrayOutputStream bout; + private PrintStream out; + + @Before + public void setUp() { + datastore = DatastoreOptions.getDefaultInstance().getService(); + bout = new ByteArrayOutputStream(); + out = new PrintStream(bout); + System.setOut(out); + + } + + @Test + public void testAddAndGetEntity() { + bout.reset(); + String testId = "test-id-" + UUID.randomUUID(); + NativeImageDatastoreSample.addEntity(datastore, testId); + NativeImageDatastoreSample.getEntity(datastore, testId); + assertThat(bout.toString()).contains( + "Reading entity: " + testId); + + NativeImageDatastoreSample.deleteEntity(datastore, testId); + } + + @Test + public void testRunTransactionalCallable() { + bout.reset(); + String testId = "test-id-" + UUID.randomUUID(); + Key key = NativeImageDatastoreSample.createKey(datastore, testId); + NativeImageDatastoreSample.runTransactionCallable(datastore, key); + assertThat(bout.toString()).contains( + "Found entity:" + "\n\t\tname=" + testId + "\n\t\tkind=test-kind" + + "\n\t\tnamespace=nativeimage-test-namespace" + + "\n\t\tproperties={description=StringValue{valueType=STRING, excludeFromIndexes=false," + + " meaning=0, value=hello world}}\n" + + "Ran transaction callable."); + + NativeImageDatastoreSample.deleteEntity(datastore, "test-id"); + } +} \ No newline at end of file diff --git a/samples/pom.xml b/samples/pom.xml index 7061e1504..c06f96333 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -31,6 +31,7 @@ install-without-bom snapshot snippets + native-image-sample From 78227f5cdd26d8ddb0cdfa49c44728e717de6584 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 25 Feb 2022 22:04:35 +0000 Subject: [PATCH 12/23] ci: pull request template includes sample format (#1357) (#649) Source-Link: https://github.com/googleapis/synthtool/commit/e122cb03ea37652946651346736d99b9dcc4311f Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:387835a1375a0049ec44e02542c844302854c732d8291bdf8e472c0ff70a8f67 --- .github/.OwlBot.lock.yaml | 15 +++- .github/PULL_REQUEST_TEMPLATE.md | 3 + README.md | 1 + .../datastore/NativeImageDatastoreSample.java | 74 +++++++++---------- .../ITNativeImageDatastoreSample.java | 26 +++---- 5 files changed, 65 insertions(+), 54 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 3aedd6c11..9351fdfb9 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,16 @@ +# Copyright 2022 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. docker: - digest: sha256:3c950ed12391ebaffd1ee66d0374766a1c50144ebe6a7a0042300b2e6bb5856b image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest + digest: sha256:387835a1375a0049ec44e02542c844302854c732d8291bdf8e472c0ff70a8f67 diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index df85b451c..a2a811fab 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -5,3 +5,6 @@ Thank you for opening a Pull Request! Before submitting your PR, there are a few - [ ] Appropriate docs were updated (if necessary) Fixes # ☕️ + +If you write sample code, please follow the [samples format]( +https://github.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md). diff --git a/README.md b/README.md index e43387695..098cc8f2a 100644 --- a/README.md +++ b/README.md @@ -232,6 +232,7 @@ Samples are in the [`samples/`](https://github.com/googleapis/java-datastore/tre | Sample | Source Code | Try it | | --------------------------- | --------------------------------- | ------ | +| Native Image Datastore Sample | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java) | | Quickstart Sample | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java) | | Task List | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java) | diff --git a/samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java b/samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java index 54d27985e..7ce5c900a 100644 --- a/samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java +++ b/samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java @@ -28,9 +28,7 @@ import java.time.Instant; import java.util.UUID; -/** - * Sample Datastore Application. - */ +/** Sample Datastore Application. */ public class NativeImageDatastoreSample { /* Datastore namespace where entities will be created. */ @@ -39,9 +37,7 @@ public class NativeImageDatastoreSample { /* Datastore kind used. */ private static final String TEST_KIND = "test-kind"; - /** - * Entrypoint to the Datastore sample application. - */ + /** Entrypoint to the Datastore sample application. */ public static void main(String[] args) { Instant startTime = Instant.now(); Datastore datastore = DatastoreOptions.getDefaultInstance().getService(); @@ -64,9 +60,7 @@ public static void main(String[] args) { static void addEntity(Datastore datastore, String id) { Key key = createKey(datastore, id); - Entity entity = Entity.newBuilder(key) - .set("description", "hello world") - .build(); + Entity entity = Entity.newBuilder(key).set("description", "hello world").build(); datastore.add(entity); System.out.println("Successfully added entity."); } @@ -90,32 +84,35 @@ static void deleteEntity(Datastore datastore, String id) { } static void runTransactionCallable(Datastore datastore, Key entityKey) { - datastore.runInTransaction(client -> { - Entity entity = Entity.newBuilder(entityKey) - .set("description", "hello world") - .build(); - datastore.add(entity); - - StructuredQuery query = - Query.newEntityQueryBuilder() - .setNamespace(TEST_NAMESPACE) - .setKind(TEST_KIND) - .build(); - - QueryResults results = datastore.run(query); - while (results.hasNext()) { - Entity result = results.next(); - String name = result.getKey().getName(); - String kind = result.getKey().getKind(); - String namespace = result.getKey().getNamespace(); - System.out.println( - "Found entity:" + "\n\t\tname=" + name + "\n\t\tkind=" + kind + "\n\t\tnamespace=" - + namespace + "\n\t\tproperties=" + result.getProperties().toString()); - } - - datastore.delete(entityKey); - return null; - }); + datastore.runInTransaction( + client -> { + Entity entity = Entity.newBuilder(entityKey).set("description", "hello world").build(); + datastore.add(entity); + + StructuredQuery query = + Query.newEntityQueryBuilder().setNamespace(TEST_NAMESPACE).setKind(TEST_KIND).build(); + + QueryResults results = datastore.run(query); + while (results.hasNext()) { + Entity result = results.next(); + String name = result.getKey().getName(); + String kind = result.getKey().getKind(); + String namespace = result.getKey().getNamespace(); + System.out.println( + "Found entity:" + + "\n\t\tname=" + + name + + "\n\t\tkind=" + + kind + + "\n\t\tnamespace=" + + namespace + + "\n\t\tproperties=" + + result.getProperties().toString()); + } + + datastore.delete(entityKey); + return null; + }); System.out.println("Ran transaction callable."); } @@ -129,9 +126,6 @@ private static void runTransaction(Datastore datastore) { } static Key createKey(Datastore datastore, String id) { - return datastore.newKeyFactory() - .setNamespace(TEST_NAMESPACE) - .setKind(TEST_KIND) - .newKey(id); + return datastore.newKeyFactory().setNamespace(TEST_NAMESPACE).setKind(TEST_KIND).newKey(id); } -} \ No newline at end of file +} diff --git a/samples/native-image-sample/src/test/java/com/example/datastore/ITNativeImageDatastoreSample.java b/samples/native-image-sample/src/test/java/com/example/datastore/ITNativeImageDatastoreSample.java index 315ecd909..710f18367 100644 --- a/samples/native-image-sample/src/test/java/com/example/datastore/ITNativeImageDatastoreSample.java +++ b/samples/native-image-sample/src/test/java/com/example/datastore/ITNativeImageDatastoreSample.java @@ -27,9 +27,7 @@ import org.junit.Before; import org.junit.Test; -/** - * Tests for {@link com.example.datastore.NativeImageDatastoreSample} - */ +/** Tests for {@link com.example.datastore.NativeImageDatastoreSample} */ public class ITNativeImageDatastoreSample { private Datastore datastore; @@ -42,7 +40,6 @@ public void setUp() { bout = new ByteArrayOutputStream(); out = new PrintStream(bout); System.setOut(out); - } @Test @@ -51,8 +48,7 @@ public void testAddAndGetEntity() { String testId = "test-id-" + UUID.randomUUID(); NativeImageDatastoreSample.addEntity(datastore, testId); NativeImageDatastoreSample.getEntity(datastore, testId); - assertThat(bout.toString()).contains( - "Reading entity: " + testId); + assertThat(bout.toString()).contains("Reading entity: " + testId); NativeImageDatastoreSample.deleteEntity(datastore, testId); } @@ -63,13 +59,17 @@ public void testRunTransactionalCallable() { String testId = "test-id-" + UUID.randomUUID(); Key key = NativeImageDatastoreSample.createKey(datastore, testId); NativeImageDatastoreSample.runTransactionCallable(datastore, key); - assertThat(bout.toString()).contains( - "Found entity:" + "\n\t\tname=" + testId + "\n\t\tkind=test-kind" - + "\n\t\tnamespace=nativeimage-test-namespace" - + "\n\t\tproperties={description=StringValue{valueType=STRING, excludeFromIndexes=false," - + " meaning=0, value=hello world}}\n" - + "Ran transaction callable."); + assertThat(bout.toString()) + .contains( + "Found entity:" + + "\n\t\tname=" + + testId + + "\n\t\tkind=test-kind" + + "\n\t\tnamespace=nativeimage-test-namespace" + + "\n\t\tproperties={description=StringValue{valueType=STRING, excludeFromIndexes=false," + + " meaning=0, value=hello world}}\n" + + "Ran transaction callable."); NativeImageDatastoreSample.deleteEntity(datastore, "test-id"); } -} \ No newline at end of file +} From 8d85b64faa72265851e92562f5381ace1088c066 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 28 Feb 2022 23:20:32 +0100 Subject: [PATCH 13/23] deps: update actions/setup-java action to v3 (#648) 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 | Type | Update | Change | |---|---|---|---| | [actions/setup-java](https://togithub.com/actions/setup-java) | action | major | `v1` -> `v3` | | [actions/setup-java](https://togithub.com/actions/setup-java) | action | major | `v2` -> `v3` | --- ### Release Notes
actions/setup-java ### [`v3`](https://togithub.com/actions/setup-java/compare/v2...v3) [Compare Source](https://togithub.com/actions/setup-java/compare/v2...v3) ### [`v2`](https://togithub.com/actions/setup-java/compare/v1...v2) [Compare Source](https://togithub.com/actions/setup-java/compare/v1...v2)
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- 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). From d6e2a16fe2e6dfd07892ff6928118a4a031de9f2 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 28 Feb 2022 23:34:13 +0100 Subject: [PATCH 14/23] deps: update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.10 (#647) 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.graalvm.buildtools:native-maven-plugin](https://togithub.com/graalvm/native-build-tools) | `0.9.9` -> `0.9.10` | [![age](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.10/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.10/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.10/compatibility-slim/0.9.9)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.10/confidence-slim/0.9.9)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
graalvm/native-build-tools ### [`v0.9.10`](https://togithub.com/graalvm/native-build-tools/releases/0.9.10) [Compare Source](https://togithub.com/graalvm/native-build-tools/compare/0.9.9...0.9.10) #### What's Changed Read what's new in the [documentation](https://graalvm.github.io/native-build-tools/latest/index.html#changelog). - Introduce skipNativeTests flag in Maven plugin by [@​sbrannen](https://togithub.com/sbrannen) in [https://github.com/graalvm/native-build-tools/pull/193](https://togithub.com/graalvm/native-build-tools/pull/193) - Fix system property breaking build cacheability by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/192](https://togithub.com/graalvm/native-build-tools/pull/192) - Make sure executable ends with `.exe` under Windows by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/199](https://togithub.com/graalvm/native-build-tools/pull/199) - Make it possible to override the classpath by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/200](https://togithub.com/graalvm/native-build-tools/pull/200) - Upgrade to Gradle 7.4 by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/202](https://togithub.com/graalvm/native-build-tools/pull/202) - Fix race condition if tests are executed in parallel by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/195](https://togithub.com/graalvm/native-build-tools/pull/195) - Add support for `@arg` file by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/205](https://togithub.com/graalvm/native-build-tools/pull/205) **Full Changelog**: https://github.com/graalvm/native-build-tools/compare/0.9.9...0.9.10
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- 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/native-image-sample/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml index e0031c993..e3b91be00 100644 --- a/samples/native-image-sample/pom.xml +++ b/samples/native-image-sample/pom.xml @@ -112,7 +112,7 @@ org.graalvm.buildtools native-maven-plugin - 0.9.9 + 0.9.10 true com.example.datastore.NativeImageDatastoreSample From c62a39074a44e58222115b05f14e3ffdd52273c0 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 28 Feb 2022 23:56:23 +0100 Subject: [PATCH 15/23] deps: update dependency org.graalvm.buildtools:junit-platform-native to v0.9.10 (#646) 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.graalvm.buildtools:junit-platform-native](https://togithub.com/graalvm/native-build-tools) | `0.9.9` -> `0.9.10` | [![age](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.10/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.10/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.10/compatibility-slim/0.9.9)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.10/confidence-slim/0.9.9)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
graalvm/native-build-tools ### [`v0.9.10`](https://togithub.com/graalvm/native-build-tools/releases/0.9.10) [Compare Source](https://togithub.com/graalvm/native-build-tools/compare/0.9.9...0.9.10) #### What's Changed Read what's new in the [documentation](https://graalvm.github.io/native-build-tools/latest/index.html#changelog). - Introduce skipNativeTests flag in Maven plugin by [@​sbrannen](https://togithub.com/sbrannen) in [https://github.com/graalvm/native-build-tools/pull/193](https://togithub.com/graalvm/native-build-tools/pull/193) - Fix system property breaking build cacheability by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/192](https://togithub.com/graalvm/native-build-tools/pull/192) - Make sure executable ends with `.exe` under Windows by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/199](https://togithub.com/graalvm/native-build-tools/pull/199) - Make it possible to override the classpath by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/200](https://togithub.com/graalvm/native-build-tools/pull/200) - Upgrade to Gradle 7.4 by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/202](https://togithub.com/graalvm/native-build-tools/pull/202) - Fix race condition if tests are executed in parallel by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/195](https://togithub.com/graalvm/native-build-tools/pull/195) - Add support for `@arg` file by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/205](https://togithub.com/graalvm/native-build-tools/pull/205) **Full Changelog**: https://github.com/graalvm/native-build-tools/compare/0.9.9...0.9.10
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- 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/native-image-sample/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml index e3b91be00..0352a305f 100644 --- a/samples/native-image-sample/pom.xml +++ b/samples/native-image-sample/pom.xml @@ -91,7 +91,7 @@ org.graalvm.buildtools junit-platform-native - 0.9.9 + 0.9.10 test
From b4495542bb086e7e169fea10795342e78aac2e1e Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 1 Mar 2022 18:46:25 +0100 Subject: [PATCH 16/23] deps: update dependency com.google.cloud:native-image-support to v0.12.5 (#650) 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:native-image-support](https://togithub.com/googleapis/java-core) | `0.12.4` -> `0.12.5` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.5/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.5/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.5/compatibility-slim/0.12.4)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.5/confidence-slim/0.12.4)](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, click this checkbox. --- 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/native-image-sample/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml index 0352a305f..37bfecaa2 100644 --- a/samples/native-image-sample/pom.xml +++ b/samples/native-image-sample/pom.xml @@ -80,7 +80,7 @@ com.google.cloud native-image-support - 0.12.4 + 0.12.5 org.junit.vintage From eda44efd14d8b4a6e8df8dbfb24317382b072aa1 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 1 Mar 2022 22:34:19 +0000 Subject: [PATCH 17/23] chore: update github actions (#1361) (#652) * chore: update github actions * chore: update Source-Link: https://github.com/googleapis/synthtool/commit/1622741e6877d4b335b137ac7e07f7f32d4e5af7 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:e3746f84955528d0fe24bf2e4df89875d6ce5a036af01b9c326d61a38838523a --- .github/.OwlBot.lock.yaml | 2 +- .github/workflows/approve-readme.yaml | 2 +- .github/workflows/auto-release.yaml | 2 +- .github/workflows/ci.yaml | 20 ++++++++++---------- .github/workflows/samples.yaml | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 9351fdfb9..53941094c 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:387835a1375a0049ec44e02542c844302854c732d8291bdf8e472c0ff70a8f67 + digest: sha256:e3746f84955528d0fe24bf2e4df89875d6ce5a036af01b9c326d61a38838523a diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml index 1bb182327..f5fc7d516 100644 --- a/.github/workflows/approve-readme.yaml +++ b/.github/workflows/approve-readme.yaml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme' steps: - - uses: actions/github-script@v5 + - uses: actions/github-script@v6 with: github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} script: | diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml index 18e23230d..7a106d007 100644 --- a/.github/workflows/auto-release.yaml +++ b/.github/workflows/auto-release.yaml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest if: contains(github.head_ref, 'release-please') steps: - - uses: actions/github-script@v5 + - uses: actions/github-script@v6 with: github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} debug: true diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6b5e56aaa..83ef7f9c2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -27,8 +27,8 @@ jobs: matrix: java: [8, 11, 17] steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: ${{matrix.java}} @@ -39,8 +39,8 @@ jobs: windows: runs-on: windows-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: 8 @@ -54,8 +54,8 @@ jobs: matrix: java: [8, 11, 17] steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: ${{matrix.java}} @@ -64,8 +64,8 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: 11 @@ -76,8 +76,8 @@ jobs: clirr: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: 8 diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml index d5d964df1..de737e92a 100644 --- a/.github/workflows/samples.yaml +++ b/.github/workflows/samples.yaml @@ -20,8 +20,8 @@ jobs: checkstyle: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: java-version: 8 - name: Run checkstyle From adc952c482641e00f12ccf296b8b160e6664058d Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 2 Mar 2022 19:53:36 +0100 Subject: [PATCH 18/23] chore(deps): update dependency com.google.cloud:libraries-bom to v24.4.0 (#655) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps): update dependency com.google.cloud:libraries-bom to v24.4.0 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot --- README.md | 4 ++-- samples/native-image-sample/pom.xml | 2 +- samples/snippets/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 098cc8f2a..b98315046 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 - 24.3.0 + 24.4.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:24.3.0') +implementation platform('com.google.cloud:libraries-bom:24.4.0') implementation 'com.google.cloud:google-cloud-datastore' ``` diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml index 37bfecaa2..bfcfec05d 100644 --- a/samples/native-image-sample/pom.xml +++ b/samples/native-image-sample/pom.xml @@ -27,7 +27,7 @@ com.google.cloud libraries-bom - 24.2.0 + 24.4.0 pom import diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index becb3dbe5..d0f043054 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 24.3.0 + 24.4.0 pom import From 5e69833713421d7deee2f4cf2f50a725270c36e0 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 2 Mar 2022 19:53:51 +0100 Subject: [PATCH 19/23] deps: update dependency com.google.cloud:native-image-support to v0.12.6 (#654) --- samples/native-image-sample/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml index bfcfec05d..421b4f278 100644 --- a/samples/native-image-sample/pom.xml +++ b/samples/native-image-sample/pom.xml @@ -80,7 +80,7 @@ com.google.cloud native-image-support - 0.12.5 + 0.12.6 org.junit.vintage From b95ee9635173617cd13605928b306974c70423e8 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Wed, 2 Mar 2022 13:58:56 -0500 Subject: [PATCH 20/23] docs(sample): Use Java 8 for Native Image sample (#656) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs(sample): Use Java 8 for Native Image sample * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * fix formatting Co-authored-by: Owl Bot --- samples/native-image-sample/pom.xml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml index 421b4f278..70d0675a1 100644 --- a/samples/native-image-sample/pom.xml +++ b/samples/native-image-sample/pom.xml @@ -17,8 +17,9 @@ - 11 - 11 + + 1.8 + 1.8 UTF-8 @@ -62,8 +63,7 @@ - com.example.datastore.NativeImageDatastoreSample - + com.example.datastore.NativeImageDatastoreSample @@ -115,8 +115,7 @@ 0.9.10 true - com.example.datastore.NativeImageDatastoreSample - + com.example.datastore.NativeImageDatastoreSample --no-fallback --no-server From 5692998d3f527dd88d058ffe2bd24492031fbe40 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 2 Mar 2022 19:22:26 +0000 Subject: [PATCH 21/23] chore: fix license header in build.bat (#1363) (#657) * chore: fix license header in build.bat * chore: add disctribution field for setup-java action Source-Link: https://github.com/googleapis/synthtool/commit/4fea5f40a9075f3ba205ede0b453010cf080e194 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:df8d7b2cc0dbc65871e7edd86601901a0612b272fa3f7f0eb590c5c53aa5f92e --- .github/.OwlBot.lock.yaml | 2 +- .github/workflows/samples.yaml | 1 + .kokoro/build.bat | 30 +++++++++++++++--------------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 53941094c..3473042c0 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:e3746f84955528d0fe24bf2e4df89875d6ce5a036af01b9c326d61a38838523a + digest: sha256:df8d7b2cc0dbc65871e7edd86601901a0612b272fa3f7f0eb590c5c53aa5f92e diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml index de737e92a..912ed8b2b 100644 --- a/.github/workflows/samples.yaml +++ b/.github/workflows/samples.yaml @@ -23,6 +23,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: + distribution: zulu java-version: 8 - name: Run checkstyle run: mvn -P lint --quiet --batch-mode checkstyle:check diff --git a/.kokoro/build.bat b/.kokoro/build.bat index cc602c9eb..067cf4a4c 100644 --- a/.kokoro/build.bat +++ b/.kokoro/build.bat @@ -1,18 +1,18 @@ +:: Copyright 2022 Google LLC +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. +:: Github action job to test core java library features on +:: downstream client libraries before they are released. :: See documentation in type-shell-output.bat -# Copyright 2022 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# Github action job to test core java library features on -# downstream client libraries before they are released. "C:\Program Files\Git\bin\bash.exe" %~dp0build.sh From 03162a69c01c5cddc524b99325900196aa26cd0d Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 2 Mar 2022 22:48:28 +0100 Subject: [PATCH 22/23] deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v2.8.0 (#653) 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.7.0` -> `2.8.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.8.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.8.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.8.0/compatibility-slim/2.7.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.8.0/confidence-slim/2.7.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-dependencies ### [`v2.8.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/HEAD/CHANGELOG.md#​280-httpsgithubcomgoogleapisjava-shared-dependenciescomparev270v280-2022-03-02) [Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v2.7.0...v2.8.0) ##### Dependencies - update dependency com.google.api-client:google-api-client-bom to v1.33.2 ([#​602](https://togithub.com/googleapis/java-shared-dependencies/issues/602)) ([85b132f](https://togithub.com/googleapis/java-shared-dependencies/commit/85b132f5830772646025b6a9fbbb970a941b86b5)) - update dependency com.google.api:api-common to v2.1.4 ([#​605](https://togithub.com/googleapis/java-shared-dependencies/issues/605)) ([ca7d49a](https://togithub.com/googleapis/java-shared-dependencies/commit/ca7d49aee26b6d90abd2afd61c20861d2307fe9c)) - update dependency com.google.auth:google-auth-library-bom to v1.5.3 ([#​614](https://togithub.com/googleapis/java-shared-dependencies/issues/614)) ([e6413f3](https://togithub.com/googleapis/java-shared-dependencies/commit/e6413f3b1be78473ace7085c344eda2d78cdf01a)) - update dependency com.google.cloud:google-cloud-core to v2.5.6 ([#​621](https://togithub.com/googleapis/java-shared-dependencies/issues/621)) ([3d5669f](https://togithub.com/googleapis/java-shared-dependencies/commit/3d5669f215689dd2df71200ffe37d5a9d385cda8)) - update dependency com.google.code.gson:gson to v2.9.0 ([#​611](https://togithub.com/googleapis/java-shared-dependencies/issues/611)) ([f59c28d](https://togithub.com/googleapis/java-shared-dependencies/commit/f59c28d8cd30ada1237f7722135ba148dce6315e)) - update dependency com.google.http-client:google-http-client-bom to v1.41.4 ([#​608](https://togithub.com/googleapis/java-shared-dependencies/issues/608)) ([f9a4f23](https://togithub.com/googleapis/java-shared-dependencies/commit/f9a4f23d3a32148ac59e53eaae6558ccbceca12c)) - update dependency com.google.oauth-client:google-oauth-client-bom to v1.33.1 ([#​606](https://togithub.com/googleapis/java-shared-dependencies/issues/606)) ([3882494](https://togithub.com/googleapis/java-shared-dependencies/commit/3882494770d48fcc02ed19088aa06612a8e440eb)) - update dependency com.google.protobuf:protobuf-bom to v3.19.4 ([#​593](https://togithub.com/googleapis/java-shared-dependencies/issues/593)) ([1e155bf](https://togithub.com/googleapis/java-shared-dependencies/commit/1e155bfc957bbb7e25d2e0994cdecaa81843bdc5)) - update dependency io.grpc:grpc-bom to v1.44.1 ([#​613](https://togithub.com/googleapis/java-shared-dependencies/issues/613)) ([3038a2c](https://togithub.com/googleapis/java-shared-dependencies/commit/3038a2c86cd20c91b65f2d7926eeb739147a68db)) - update dependency junit:junit to v4.13.2 ([#​607](https://togithub.com/googleapis/java-shared-dependencies/issues/607)) ([987e617](https://togithub.com/googleapis/java-shared-dependencies/commit/987e61796c7a093e005fe8832cf39275c391b2c1)) - update dependency org.checkerframework:checker-qual to v3.21.3 ([#​596](https://togithub.com/googleapis/java-shared-dependencies/issues/596)) ([ac5083c](https://togithub.com/googleapis/java-shared-dependencies/commit/ac5083cd010924dc128f041c2cdbab20166a6bf0)) - update gax.version to v2.12.2 ([#​592](https://togithub.com/googleapis/java-shared-dependencies/issues/592)) ([713ff8d](https://togithub.com/googleapis/java-shared-dependencies/commit/713ff8dd94f939c417524616bc47c771a3fbe0cf)) - update google.common-protos.version to v2.7.4 ([#​603](https://togithub.com/googleapis/java-shared-dependencies/issues/603)) ([bb9b4c7](https://togithub.com/googleapis/java-shared-dependencies/commit/bb9b4c7e39552cc73b3b9d4c826b26e8cb74459f)) - update google.core.version ([#​599](https://togithub.com/googleapis/java-shared-dependencies/issues/599)) ([327d0df](https://togithub.com/googleapis/java-shared-dependencies/commit/327d0df9b57203c0d4f426de0380770d3d7910d6)) - update iam.version to v1.2.6 ([#​598](https://togithub.com/googleapis/java-shared-dependencies/issues/598)) ([2801439](https://togithub.com/googleapis/java-shared-dependencies/commit/280143964c7c3b93a8d7f67215ba2cc74ffce761))
--- ### 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, click this checkbox. --- 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 9049b1003..ede7af17e 100644 --- a/pom.xml +++ b/pom.xml @@ -150,7 +150,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.7.0 + 2.8.0 pom import From 486fe80301f8452bd63c1049fa42f103c3c21590 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 2 Mar 2022 22:04:28 +0000 Subject: [PATCH 23/23] chore(main): release 2.2.5 (#643) :robot: I have created a release *beep* *boop* --- ### [2.2.5](https://github.com/googleapis/java-datastore/compare/v2.2.4...v2.2.5) (2022-03-02) ### Bug Fixes * Use ImmutableMap.Bulder.buildOrThrow() instead of build(). ([#632](https://github.com/googleapis/java-datastore/issues/632)) ([5d0f484](https://github.com/googleapis/java-datastore/commit/5d0f48403f6746bb7901b13aa223e4de31c3c5a4)) ### Documentation * **sample:** Add sample for native image support in Datastore ([#640](https://github.com/googleapis/java-datastore/issues/640)) ([f728901](https://github.com/googleapis/java-datastore/commit/f728901b4984f1cc79a02ecc2ff631322974d761)) * **sample:** Use Java 8 for Native Image sample ([#656](https://github.com/googleapis/java-datastore/issues/656)) ([b95ee96](https://github.com/googleapis/java-datastore/commit/b95ee9635173617cd13605928b306974c70423e8)) ### Dependencies * update actions/setup-java action to v3 ([#648](https://github.com/googleapis/java-datastore/issues/648)) ([8d85b64](https://github.com/googleapis/java-datastore/commit/8d85b64faa72265851e92562f5381ace1088c066)) * update dependency com.google.cloud:google-cloud-shared-dependencies to v2.8.0 ([#653](https://github.com/googleapis/java-datastore/issues/653)) ([03162a6](https://github.com/googleapis/java-datastore/commit/03162a69c01c5cddc524b99325900196aa26cd0d)) * update dependency com.google.cloud:native-image-support to v0.12.5 ([#650](https://github.com/googleapis/java-datastore/issues/650)) ([b449554](https://github.com/googleapis/java-datastore/commit/b4495542bb086e7e169fea10795342e78aac2e1e)) * update dependency com.google.cloud:native-image-support to v0.12.6 ([#654](https://github.com/googleapis/java-datastore/issues/654)) ([5e69833](https://github.com/googleapis/java-datastore/commit/5e69833713421d7deee2f4cf2f50a725270c36e0)) * update dependency org.graalvm.buildtools:junit-platform-native to v0.9.10 ([#646](https://github.com/googleapis/java-datastore/issues/646)) ([c62a390](https://github.com/googleapis/java-datastore/commit/c62a39074a44e58222115b05f14e3ffdd52273c0)) * update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.10 ([#647](https://github.com/googleapis/java-datastore/issues/647)) ([d6e2a16](https://github.com/googleapis/java-datastore/commit/d6e2a16fe2e6dfd07892ff6928118a4a031de9f2)) --- 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 | 23 +++++++++++++++++++++++ datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 6 +++--- google-cloud-datastore/pom.xml | 4 ++-- pom.xml | 8 ++++---- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- versions.txt | 8 ++++---- 7 files changed, 40 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e2ccb7f5f..42cbadf85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,28 @@ # Changelog +### [2.2.5](https://github.com/googleapis/java-datastore/compare/v2.2.4...v2.2.5) (2022-03-02) + + +### Bug Fixes + +* Use ImmutableMap.Bulder.buildOrThrow() instead of build(). ([#632](https://github.com/googleapis/java-datastore/issues/632)) ([5d0f484](https://github.com/googleapis/java-datastore/commit/5d0f48403f6746bb7901b13aa223e4de31c3c5a4)) + + +### Documentation + +* **sample:** Add sample for native image support in Datastore ([#640](https://github.com/googleapis/java-datastore/issues/640)) ([f728901](https://github.com/googleapis/java-datastore/commit/f728901b4984f1cc79a02ecc2ff631322974d761)) +* **sample:** Use Java 8 for Native Image sample ([#656](https://github.com/googleapis/java-datastore/issues/656)) ([b95ee96](https://github.com/googleapis/java-datastore/commit/b95ee9635173617cd13605928b306974c70423e8)) + + +### Dependencies + +* update actions/setup-java action to v3 ([#648](https://github.com/googleapis/java-datastore/issues/648)) ([8d85b64](https://github.com/googleapis/java-datastore/commit/8d85b64faa72265851e92562f5381ace1088c066)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.8.0 ([#653](https://github.com/googleapis/java-datastore/issues/653)) ([03162a6](https://github.com/googleapis/java-datastore/commit/03162a69c01c5cddc524b99325900196aa26cd0d)) +* update dependency com.google.cloud:native-image-support to v0.12.5 ([#650](https://github.com/googleapis/java-datastore/issues/650)) ([b449554](https://github.com/googleapis/java-datastore/commit/b4495542bb086e7e169fea10795342e78aac2e1e)) +* update dependency com.google.cloud:native-image-support to v0.12.6 ([#654](https://github.com/googleapis/java-datastore/issues/654)) ([5e69833](https://github.com/googleapis/java-datastore/commit/5e69833713421d7deee2f4cf2f50a725270c36e0)) +* update dependency org.graalvm.buildtools:junit-platform-native to v0.9.10 ([#646](https://github.com/googleapis/java-datastore/issues/646)) ([c62a390](https://github.com/googleapis/java-datastore/commit/c62a39074a44e58222115b05f14e3ffdd52273c0)) +* update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.10 ([#647](https://github.com/googleapis/java-datastore/issues/647)) ([d6e2a16](https://github.com/googleapis/java-datastore/commit/d6e2a16fe2e6dfd07892ff6928118a4a031de9f2)) + ### [2.2.4](https://github.com/googleapis/java-datastore/compare/v2.2.3...v2.2.4) (2022-02-03) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 0e0e5e422..33e64545a 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.2.5-SNAPSHOT + 2.2.5 com.google.cloud google-cloud-datastore-parent - 2.2.5-SNAPSHOT + 2.2.5 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 13f831b33..3f4bf5024 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.2.5-SNAPSHOT + 2.2.5 pom com.google.cloud @@ -52,12 +52,12 @@ com.google.cloud google-cloud-datastore - 2.2.5-SNAPSHOT + 2.2.5 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.93.5-SNAPSHOT + 0.93.5 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index dbdff3bf3..3027c465f 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.2.5-SNAPSHOT + 2.2.5 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.2.5-SNAPSHOT + 2.2.5 google-cloud-datastore diff --git a/pom.xml b/pom.xml index ede7af17e..cf4b22b5b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.2.5-SNAPSHOT + 2.2.5 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -158,17 +158,17 @@ com.google.cloud google-cloud-datastore - 2.2.1-SNAPSHOT + 2.2.5 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.93.5-SNAPSHOT + 0.93.5 com.google.cloud.datastore datastore-v1-proto-client - 2.2.5-SNAPSHOT + 2.2.5 com.google.api.grpc diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 06798a186..4bc81ed23 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.93.5-SNAPSHOT + 0.93.5 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.2.5-SNAPSHOT + 2.2.5 diff --git a/versions.txt b/versions.txt index 829809f01..314218ba3 100644 --- a/versions.txt +++ b/versions.txt @@ -1,7 +1,7 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.2.4:2.2.5-SNAPSHOT -google-cloud-datastore-bom:2.2.4:2.2.5-SNAPSHOT -proto-google-cloud-datastore-v1:0.93.4:0.93.5-SNAPSHOT -datastore-v1-proto-client:2.2.4:2.2.5-SNAPSHOT +google-cloud-datastore:2.2.5:2.2.5 +google-cloud-datastore-bom:2.2.5:2.2.5 +proto-google-cloud-datastore-v1:0.93.5:0.93.5 +datastore-v1-proto-client:2.2.5:2.2.5