From 61d62077f1b99b24c38c106af79224f6af4c6ed2 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 20 Oct 2021 15:38:22 +0000 Subject: [PATCH 01/15] chore: release 2.1.4-SNAPSHOT (#561) :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 9acfad51b..77cc049be 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.1.3 + 2.1.4-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.1.3 + 2.1.4-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 87e00820a..d6cc1f980 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.1.3 + 2.1.4-SNAPSHOT pom com.google.cloud @@ -52,12 +52,12 @@ com.google.api.grpc proto-google-cloud-datastore-v1 - 0.92.3 + 0.92.4-SNAPSHOT com.google.cloud google-cloud-datastore - 2.1.3 + 2.1.4-SNAPSHOT diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 8752a4949..e5fa2510d 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.1.3 + 2.1.4-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.1.3 + 2.1.4-SNAPSHOT google-cloud-datastore diff --git a/pom.xml b/pom.xml index f17d3d4a4..700330c35 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.1.3 + 2.1.4-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -158,12 +158,12 @@ com.google.api.grpc proto-google-cloud-datastore-v1 - 0.92.3 + 0.92.4-SNAPSHOT com.google.cloud.datastore datastore-v1-proto-client - 2.1.3 + 2.1.4-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 25bdf9fb1..ae898339d 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.92.3 + 0.92.4-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.1.3 + 2.1.4-SNAPSHOT diff --git a/versions.txt b/versions.txt index fa67597e0..fc91221c8 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.1.3:2.1.3 -google-cloud-datastore-bom:2.1.3:2.1.3 -google-cloud-datastore-parent:2.1.3:2.1.3 -proto-google-cloud-datastore-v1:0.92.3:0.92.3 -datastore-v1-proto-client:2.1.3:2.1.3 +google-cloud-datastore:2.1.3:2.1.4-SNAPSHOT +google-cloud-datastore-bom:2.1.3:2.1.4-SNAPSHOT +google-cloud-datastore-parent:2.1.3:2.1.4-SNAPSHOT +proto-google-cloud-datastore-v1:0.92.3:0.92.4-SNAPSHOT +datastore-v1-proto-client:2.1.3:2.1.4-SNAPSHOT From 97843352b2b3d9f66c7365e382cb32f9fa1b2ab1 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 20 Oct 2021 20:04:43 +0200 Subject: [PATCH 02/15] chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.1.3 (#562) --- 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 9ebf579a5..912c42c05 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.1.2 + 2.1.3 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 99bd4d939..177213aeb 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.1.2 + 2.1.3 From d4bef0e0f2ac83bcc37be38c9f6ab08be863071b Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 22 Oct 2021 00:12:28 +0200 Subject: [PATCH 03/15] build(deps): update dependency com.google.cloud:google-cloud-shared-config to v1.2.0 (#563) 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.1.0` -> `1.2.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.0/compatibility-slim/1.1.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.0/confidence-slim/1.1.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-config ### [`v1.2.0`](https://togithub.com/googleapis/java-shared-config/blob/master/CHANGELOG.md#​120-httpswwwgithubcomgoogleapisjava-shared-configcomparev110v120-2021-10-21) [Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.1.0...v1.2.0) ##### Features - Introduce Native Image testing build script changes ([#​1240](https://www.togithub.com/googleapis/java-shared-config/issues/1240)) ([#​334](https://www.togithub.com/googleapis/java-shared-config/issues/334)) ([4643cf1](https://www.github.com/googleapis/java-shared-config/commit/4643cf15be0b37fa8fa905d544d438cda7ef2ecd)) ##### Bug Fixes - **java:** downgrade native maven plugin version ([#​335](https://www.togithub.com/googleapis/java-shared-config/issues/335)) ([5834284](https://www.github.com/googleapis/java-shared-config/commit/5834284176fb34713d10082ce04f3b6abba85ad8))
--- ### 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 d6cc1f980..aa710d562 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.1.0 + 1.2.0 Google Cloud datastore BOM diff --git a/pom.xml b/pom.xml index 700330c35..2a8c36992 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.1.0 + 1.2.0 From 238f73cf4104fdbf09739f6afcd4b44da8fde6ad Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 25 Oct 2021 08:20:56 -0700 Subject: [PATCH 04/15] build: Introduce Native Image testing build script changes (#556) Adds additional switch case to build.sh to accommodate native image testing. Source-Author: Daniel Zou Source-Date: Mon Oct 18 11:42:09 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: d45942be8066ad57bd0509f4a16e1fac78ecc50f Source-Link: https://github.com/googleapis/synthtool/commit/d45942be8066ad57bd0509f4a16e1fac78ecc50f --- .kokoro/build.sh | 5 +++++ .kokoro/presubmit/graalvm-native.cfg | 33 ++++++++++++++++++++++++++++ synth.metadata | 5 +++-- 3 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 .kokoro/presubmit/graalvm-native.cfg diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 9ddc69070..2939c4431 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -69,6 +69,11 @@ integration) verify RETURN_CODE=$? ;; +graalvm) + # Run Unit and Integration Tests with Native Image + mvn test -Pnative -Penable-integration-tests + RETURN_CODE=$? + ;; samples) SAMPLES_DIR=samples # only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise. diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg new file mode 100644 index 000000000..4c7225ec9 --- /dev/null +++ b/.kokoro/presubmit/graalvm-native.cfg @@ -0,0 +1,33 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/graalvm" +} + +env_vars: { + key: "JOB_TYPE" + value: "graalvm" +} + +# 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: "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 09d17998c..69218d9f2 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-datastore.git", - "sha": "baddb6a311134d64b5e5894b661a7f7191c1b325" + "sha": "68223857df0fbcce40ee0eda9db4eea9347536b3" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "a4be3384ccb92364795d981f2863f6986fcee620" + "sha": "d45942be8066ad57bd0509f4a16e1fac78ecc50f" } } ], @@ -71,6 +71,7 @@ ".kokoro/presubmit/clirr.cfg", ".kokoro/presubmit/common.cfg", ".kokoro/presubmit/dependencies.cfg", + ".kokoro/presubmit/graalvm-native.cfg", ".kokoro/presubmit/integration.cfg", ".kokoro/presubmit/java11.cfg", ".kokoro/presubmit/java7.cfg", From 71da2cac4ee52802876bb2e8975757a2196c3ee3 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 25 Oct 2021 08:30:12 -0700 Subject: [PATCH 05/15] chore: protobuf 3.18.1 (#555) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/6c36d33a-e118-40fa-be81-d54f579fe14f/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) PiperOrigin-RevId: 403132955 Source-Link: https://github.com/googleapis/googleapis/commit/d2977af9e9f1fc0c9dc8368352daa032471f3c63 --- .../java/com/google/datastore/v1/AllocateIdsRequest.java | 4 ++-- .../com/google/datastore/v1/BeginTransactionRequest.java | 4 ++-- .../main/java/com/google/datastore/v1/CommitRequest.java | 4 ++-- .../src/main/java/com/google/datastore/v1/GqlQuery.java | 4 ++-- .../src/main/java/com/google/datastore/v1/Key.java | 4 ++-- .../main/java/com/google/datastore/v1/KindExpression.java | 4 ++-- .../main/java/com/google/datastore/v1/LookupRequest.java | 4 ++-- .../main/java/com/google/datastore/v1/PartitionId.java | 8 ++++---- .../java/com/google/datastore/v1/PropertyReference.java | 4 ++-- .../java/com/google/datastore/v1/ReserveIdsRequest.java | 8 ++++---- .../java/com/google/datastore/v1/RollbackRequest.java | 4 ++-- .../java/com/google/datastore/v1/RunQueryRequest.java | 4 ++-- synth.metadata | 4 ++-- 13 files changed, 30 insertions(+), 30 deletions(-) diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java index b2136418f..1f66e0364 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java @@ -269,7 +269,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < keys_.size(); i++) { output.writeMessage(1, keys_.get(i)); } - if (!getProjectIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 8, projectId_); } unknownFields.writeTo(output); @@ -284,7 +284,7 @@ public int getSerializedSize() { for (int i = 0; i < keys_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, keys_.get(i)); } - if (!getProjectIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java index 2002ba542..05fdca81f 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java @@ -238,7 +238,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getProjectIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 8, projectId_); } if (transactionOptions_ != null) { @@ -253,7 +253,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getProjectIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_); } if (transactionOptions_ != null) { diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java index 8cb52b2d0..c981ef1ef 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java @@ -606,7 +606,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < mutations_.size(); i++) { output.writeMessage(6, mutations_.get(i)); } - if (!getProjectIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 8, projectId_); } unknownFields.writeTo(output); @@ -629,7 +629,7 @@ public int getSerializedSize() { for (int i = 0; i < mutations_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, mutations_.get(i)); } - if (!getProjectIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java index 03a1fbd1e..c4c693fc7 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java @@ -455,7 +455,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getQueryStringBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(queryString_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, queryString_); } if (allowLiterals_ != false) { @@ -475,7 +475,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getQueryStringBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(queryString_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, queryString_); } if (allowLiterals_ != false) { diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java index 3e58eb2a5..d813ff65a 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java @@ -591,7 +591,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getKindBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kind_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, kind_); } if (idTypeCase_ == 2) { @@ -609,7 +609,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getKindBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kind_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, kind_); } if (idTypeCase_ == 2) { diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java index 879ce1ff6..4e99be454 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java @@ -174,7 +174,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } unknownFields.writeTo(output); @@ -186,7 +186,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java index ce7c5ec6c..d4d01de69 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java @@ -331,7 +331,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < keys_.size(); i++) { output.writeMessage(3, keys_.get(i)); } - if (!getProjectIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 8, projectId_); } unknownFields.writeTo(output); @@ -349,7 +349,7 @@ public int getSerializedSize() { for (int i = 0; i < keys_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, keys_.get(i)); } - if (!getProjectIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java index ab8e5d834..6ae103685 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java @@ -246,10 +246,10 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getProjectIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, projectId_); } - if (!getNamespaceIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(namespaceId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 4, namespaceId_); } unknownFields.writeTo(output); @@ -261,10 +261,10 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getProjectIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, projectId_); } - if (!getNamespaceIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(namespaceId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, namespaceId_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java index 6b46643de..c7489ac5d 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java @@ -176,7 +176,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, name_); } unknownFields.writeTo(output); @@ -188,7 +188,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, name_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java index 2b4d518f5..069747718 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java @@ -326,10 +326,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < keys_.size(); i++) { output.writeMessage(1, keys_.get(i)); } - if (!getProjectIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 8, projectId_); } - if (!getDatabaseIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_); } unknownFields.writeTo(output); @@ -344,10 +344,10 @@ public int getSerializedSize() { for (int i = 0; i < keys_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, keys_.get(i)); } - if (!getProjectIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_); } - if (!getDatabaseIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java index 919ba78a9..d7037cd40 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java @@ -202,7 +202,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!transaction_.isEmpty()) { output.writeBytes(1, transaction_); } - if (!getProjectIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 8, projectId_); } unknownFields.writeTo(output); @@ -217,7 +217,7 @@ public int getSerializedSize() { if (!transaction_.isEmpty()) { size += com.google.protobuf.CodedOutputStream.computeBytesSize(1, transaction_); } - if (!getProjectIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java index e95e1d653..8b9d57bad 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java @@ -502,7 +502,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (queryTypeCase_ == 7) { output.writeMessage(7, (com.google.datastore.v1.GqlQuery) queryType_); } - if (!getProjectIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 8, projectId_); } unknownFields.writeTo(output); @@ -530,7 +530,7 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeMessageSize( 7, (com.google.datastore.v1.GqlQuery) queryType_); } - if (!getProjectIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_); } size += unknownFields.getSerializedSize(); diff --git a/synth.metadata b/synth.metadata index 69218d9f2..ca96a7d9a 100644 --- a/synth.metadata +++ b/synth.metadata @@ -11,8 +11,8 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "f6dd7e47620566925a4b3f1ce029e74e1b2f2516", - "internalRef": "359781040" + "sha": "d2977af9e9f1fc0c9dc8368352daa032471f3c63", + "internalRef": "403132955" } }, { From eb47af6ea878c7b53e5e63531c3285d30daa1f30 Mon Sep 17 00:00:00 2001 From: kolea2 <45548808+kolea2@users.noreply.github.com> Date: Mon, 25 Oct 2021 14:12:13 -0400 Subject: [PATCH 06/15] build: configure branch 2.1.x as a release branch (#564) --- .github/release-please.yml | 4 ++++ .github/sync-repo-settings.yaml | 14 ++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/.github/release-please.yml b/.github/release-please.yml index 4a9e95940..5968fe28e 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -10,3 +10,7 @@ branches: handleGHRelease: true releaseType: java-yoshi branch: java7 + - bumpMinorPreMajor: true + handleGHRelease: true + releaseType: java-backport + branch: 2.1.x diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index aaee18453..ebdf852e9 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -45,6 +45,20 @@ branchProtectionRules: - units (11) - 'Kokoro - Test: Integration' - cla/google + - pattern: 2.1.x + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - dependencies (8) + - dependencies (11) + - lint + - clirr + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - cla/google permissionRules: - team: yoshi-admins permission: admin From a23066fcd13f4ad373ab16f13df014a23f639390 Mon Sep 17 00:00:00 2001 From: kolea2 <45548808+kolea2@users.noreply.github.com> Date: Mon, 25 Oct 2021 17:10:15 -0400 Subject: [PATCH 07/15] feat: next release to 2.2.0 (#567) From 19dd87fc0c929be278256d8fc25e0bf1fde29769 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 25 Oct 2021 16:41:12 -0700 Subject: [PATCH 08/15] fix(java): java 17 dependency arguments (#569) Source-Author: kolea2 <45548808+kolea2@users.noreply.github.com> Source-Date: Mon Oct 25 11:06:10 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: cb2755306975de4c54ea549c9deb25703b3731bb Source-Link: https://github.com/googleapis/synthtool/commit/cb2755306975de4c54ea549c9deb25703b3731bb --- .kokoro/dependencies.sh | 10 ++++------ synth.metadata | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 9a5105d7e..d7476cfe9 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -38,15 +38,13 @@ function determineMavenOpts() { | sed -E 's/^(1\.[0-9]\.0).*$/\1/g' ) - case $javaVersion in - "17") + if [[ $javaVersion == 17* ]] + then # MaxPermSize is no longer supported as of jdk 17 echo -n "-Xmx1024m" - ;; - *) + else echo -n "-Xmx1024m -XX:MaxPermSize=128m" - ;; - esac + fi } export MAVEN_OPTS=$(determineMavenOpts) diff --git a/synth.metadata b/synth.metadata index ca96a7d9a..e0077640c 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-datastore.git", - "sha": "68223857df0fbcce40ee0eda9db4eea9347536b3" + "sha": "a23066fcd13f4ad373ab16f13df014a23f639390" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "d45942be8066ad57bd0509f4a16e1fac78ecc50f" + "sha": "cb2755306975de4c54ea549c9deb25703b3731bb" } } ], From 2d1a6d04a7b0c167495955e2988e563d74b97fc3 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 27 Oct 2021 16:42:59 +0200 Subject: [PATCH 09/15] chore(deps): update dependency com.google.cloud:libraries-bom to v24 (#571) --- 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 7e6533348..65ba1e584 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 23.1.0 + 24.0.0 pom import From 18ab54aa1ba7e909a9a5ce6524cc89193579a3e7 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 4 Nov 2021 15:24:21 -0700 Subject: [PATCH 10/15] chore(java): remove pin on Apache Maven 3.8.1 from github actions (#573) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/b95706bc-5492-4d4a-9b4a-6487b19cad52/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) Source-Link: https://github.com/googleapis/synthtool/commit/79d7936da1cf04ce1b4ead7d2c10dccccd852caf --- .github/workflows/ci.yaml | 17 +---------------- synth.metadata | 4 ++-- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2425d7234..d95a11a26 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,9 +12,6 @@ jobs: java: [8, 11, 17] steps: - uses: actions/checkout@v2 - - uses: stCarolas/setup-maven@v4 - with: - maven-version: 3.8.1 - uses: actions/setup-java@v2 with: distribution: zulu @@ -27,9 +24,6 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v2 - - uses: stCarolas/setup-maven@v4 - with: - maven-version: 3.8.1 - uses: actions/setup-java@v2 with: distribution: zulu @@ -45,9 +39,6 @@ jobs: java: [8, 11, 17] steps: - uses: actions/checkout@v2 - - uses: stCarolas/setup-maven@v4 - with: - maven-version: 3.8.1 - uses: actions/setup-java@v2 with: distribution: zulu @@ -58,9 +49,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: stCarolas/setup-maven@v4 - with: - maven-version: 3.8.1 - uses: actions/setup-java@v2 with: distribution: zulu @@ -73,9 +61,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: stCarolas/setup-maven@v4 - with: - maven-version: 3.8.1 - uses: actions/setup-java@v2 with: distribution: zulu @@ -83,4 +68,4 @@ jobs: - run: java -version - run: .kokoro/build.sh env: - JOB_TYPE: clirr + JOB_TYPE: clirr \ No newline at end of file diff --git a/synth.metadata b/synth.metadata index e0077640c..caa62109e 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-datastore.git", - "sha": "a23066fcd13f4ad373ab16f13df014a23f639390" + "sha": "2d1a6d04a7b0c167495955e2988e563d74b97fc3" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "cb2755306975de4c54ea549c9deb25703b3731bb" + "sha": "79d7936da1cf04ce1b4ead7d2c10dccccd852caf" } } ], From 0216b37f564967954cfdfd31edd300aebbcaabb8 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 9 Nov 2021 00:24:11 +0100 Subject: [PATCH 11/15] build(deps): update dependency com.google.cloud:google-cloud-shared-config to v1.2.1 (#575) 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.0` -> `1.2.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.1/compatibility-slim/1.2.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.1/confidence-slim/1.2.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-config ### [`v1.2.1`](https://togithub.com/googleapis/java-shared-config/blob/master/CHANGELOG.md#​121-httpswwwgithubcomgoogleapisjava-shared-configcomparev120v121-2021-11-08) [Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.2.0...v1.2.1)
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, 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 aa710d562..3f7188f12 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.0 + 1.2.1 Google Cloud datastore BOM diff --git a/pom.xml b/pom.xml index 2a8c36992..868c959ed 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.2.0 + 1.2.1 From 6e98e3dda60298b60629dcf74ab3bae44f042bb6 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 10 Nov 2021 11:19:23 -0800 Subject: [PATCH 12/15] ci: update ci.yaml (#574) Let's let all the unit tests complete for now. Java 17 isn't quite ready. Source-Author: Les Vogel Source-Date: Fri Nov 5 11:31:10 2021 -1000 Source-Repo: googleapis/synthtool Source-Sha: 717a6a1fe247df095092de1321eadc9da887a06c Source-Link: https://github.com/googleapis/synthtool/commit/717a6a1fe247df095092de1321eadc9da887a06c --- .github/workflows/ci.yaml | 3 ++- synth.metadata | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d95a11a26..93b337c62 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -8,6 +8,7 @@ jobs: units: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: java: [8, 11, 17] steps: @@ -68,4 +69,4 @@ jobs: - run: java -version - run: .kokoro/build.sh env: - JOB_TYPE: clirr \ No newline at end of file + JOB_TYPE: clirr diff --git a/synth.metadata b/synth.metadata index caa62109e..c05261aef 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-datastore.git", - "sha": "2d1a6d04a7b0c167495955e2988e563d74b97fc3" + "sha": "18ab54aa1ba7e909a9a5ce6524cc89193579a3e7" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "79d7936da1cf04ce1b4ead7d2c10dccccd852caf" + "sha": "717a6a1fe247df095092de1321eadc9da887a06c" } } ], From 931e6ec846b446c369b5394c5284f6f26bb299ee Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 15 Nov 2021 17:02:15 +0100 Subject: [PATCH 13/15] deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v2.5.0 (#577) 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.4.0` -> `2.5.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.5.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.5.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.5.0/compatibility-slim/2.4.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.5.0/confidence-slim/2.4.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-dependencies ### [`v2.5.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​250-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare240v250-2021-11-12) [Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v2.4.0...v2.5.0) ##### Features - next release from main branch is 2.5.0 ([#​510](https://www.togithub.com/googleapis/java-shared-dependencies/issues/510)) ([ca9eb8a](https://www.github.com/googleapis/java-shared-dependencies/commit/ca9eb8a40ae81d69de0d82d9499ef21b0136ae49)) ##### Bug Fixes - dependencies.sh to work with Java 17 ([#​516](https://www.togithub.com/googleapis/java-shared-dependencies/issues/516)) ([8422c1d](https://www.github.com/googleapis/java-shared-dependencies/commit/8422c1d7e9ef479f348e63c530789050b5235426)) ##### Dependencies - update dependency com.google.api:api-common to v2.1.0 ([#​508](https://www.togithub.com/googleapis/java-shared-dependencies/issues/508)) ([ae32d16](https://www.github.com/googleapis/java-shared-dependencies/commit/ae32d1689c78fc1469206c8c0df0ebaca59edd2c)) - update dependency com.google.auth:google-auth-library-bom to v1.2.2 ([#​506](https://www.togithub.com/googleapis/java-shared-dependencies/issues/506)) ([b9a8209](https://www.github.com/googleapis/java-shared-dependencies/commit/b9a82098655f29e858bd0c7a9b1049a379e5062a)) - update dependency com.google.auth:google-auth-library-bom to v1.3.0 ([#​524](https://www.togithub.com/googleapis/java-shared-dependencies/issues/524)) ([fc07879](https://www.github.com/googleapis/java-shared-dependencies/commit/fc07879fa6531e39b21977fe77abc19354a1fd33)) - update dependency com.google.code.gson:gson to v2.8.9 ([#​509](https://www.togithub.com/googleapis/java-shared-dependencies/issues/509)) ([bece99b](https://www.github.com/googleapis/java-shared-dependencies/commit/bece99bb3e0365e60e7376ba18d046ab6436a235)) - update dependency com.google.errorprone:error_prone_annotations to v2.10.0 ([#​512](https://www.togithub.com/googleapis/java-shared-dependencies/issues/512)) ([c281f13](https://www.github.com/googleapis/java-shared-dependencies/commit/c281f137525e2111e97349657be578ed1fc832f2)) - update dependency com.google.protobuf:protobuf-bom to v3.19.1 ([#​505](https://www.togithub.com/googleapis/java-shared-dependencies/issues/505)) ([94cde96](https://www.github.com/googleapis/java-shared-dependencies/commit/94cde96069900f9f8c2ff9a522671d03b26828bd)) - update dependency io.grpc:grpc-bom to v1.42.1 ([#​513](https://www.togithub.com/googleapis/java-shared-dependencies/issues/513)) ([0d2b774](https://www.github.com/googleapis/java-shared-dependencies/commit/0d2b774287a132821cc6fe2789140086bc48d525)) - update dependency org.checkerframework:checker-qual to v3.19.0 ([#​501](https://www.togithub.com/googleapis/java-shared-dependencies/issues/501)) ([2b3e0b5](https://www.github.com/googleapis/java-shared-dependencies/commit/2b3e0b5ddc3a645b20a837f3123394f1ca114f08)) - update dependency org.threeten:threetenbp to v1.5.2 ([#​514](https://www.togithub.com/googleapis/java-shared-dependencies/issues/514)) ([4885f40](https://www.github.com/googleapis/java-shared-dependencies/commit/4885f402e2c70435cd10d4f1b893df9873808c56)) - update gax.version to v2.7.0 ([#​515](https://www.togithub.com/googleapis/java-shared-dependencies/issues/515)) ([567e728](https://www.github.com/googleapis/java-shared-dependencies/commit/567e728b0e59233a04e2d04183e6a0c36cca2437)) - update google.core.version to v2.3.0 ([#​530](https://www.togithub.com/googleapis/java-shared-dependencies/issues/530)) ([78e87e9](https://www.github.com/googleapis/java-shared-dependencies/commit/78e87e96befab34dc4a494e752aeb473cd14a156)) - update iam.version to v1.1.7 ([#​504](https://www.togithub.com/googleapis/java-shared-dependencies/issues/504)) ([63dd583](https://www.github.com/googleapis/java-shared-dependencies/commit/63dd583c80f35b01a66fd1908d41467468c66436))
--- ### 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 868c959ed..ecb4ca2ab 100644 --- a/pom.xml +++ b/pom.xml @@ -150,7 +150,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.4.0 + 2.5.0 pom import From 719d7c73427aaa71d71199820ff07f0fbba56f7c Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 15 Nov 2021 13:24:21 -0800 Subject: [PATCH 14/15] chore: cleanup cloud RAD generation (#576) chore: update jre to 11 for linter This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/8b3befd6-3465-421d-9830-334a4226cb78/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) Source-Link: https://github.com/googleapis/synthtool/commit/42a3786737c17ece39924d7025f3be481812da53 Source-Link: https://github.com/googleapis/synthtool/commit/99ea92a109dbcd4e2b8c179e337848ba6a25fe16 --- .github/workflows/ci.yaml | 2 +- .kokoro/release/publish_javadoc11.sh | 10 +++------- synth.metadata | 4 ++-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 93b337c62..05de1f60d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -53,7 +53,7 @@ jobs: - uses: actions/setup-java@v2 with: distribution: zulu - java-version: 8 + java-version: 11 - run: java -version - run: .kokoro/build.sh env: diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh index b3887101e..3f49b4ea0 100755 --- a/.kokoro/release/publish_javadoc11.sh +++ b/.kokoro/release/publish_javadoc11.sh @@ -36,13 +36,9 @@ mvn clean install -B -q -DskipTests=true export NAME=google-cloud-datastore export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) -# V3 generates docfx yml from javadoc -# generate yml -mvn clean site -B -q -P docFX - -# copy README to docfx-yml dir and rename index.md -cp README.md target/docfx-yml/index.md -# copy CHANGELOG to docfx-yml dir and rename history.md +# cloud RAD generation +mvn clean javadoc:aggregate -B -q -P docFX +# include CHANGELOG cp CHANGELOG.md target/docfx-yml/history.md pushd target/docfx-yml diff --git a/synth.metadata b/synth.metadata index c05261aef..f831626d7 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-datastore.git", - "sha": "18ab54aa1ba7e909a9a5ce6524cc89193579a3e7" + "sha": "6e98e3dda60298b60629dcf74ab3bae44f042bb6" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "717a6a1fe247df095092de1321eadc9da887a06c" + "sha": "42a3786737c17ece39924d7025f3be481812da53" } } ], From 55c1614c3775da6113a252adca645d7eccad08ea Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 16 Nov 2021 14:48:34 +0000 Subject: [PATCH 15/15] chore: release 2.2.0 (#568) :robot: I have created a release \*beep\* \*boop\* --- ## [2.2.0](https://www.github.com/googleapis/java-datastore/compare/v2.1.3...v2.2.0) (2021-11-15) ### Features * next release to 2.2.0 ([#567](https://www.github.com/googleapis/java-datastore/issues/567)) ([a23066f](https://www.github.com/googleapis/java-datastore/commit/a23066fcd13f4ad373ab16f13df014a23f639390)) ### Bug Fixes * **java:** java 17 dependency arguments ([#569](https://www.github.com/googleapis/java-datastore/issues/569)) ([19dd87f](https://www.github.com/googleapis/java-datastore/commit/19dd87fc0c929be278256d8fc25e0bf1fde29769)) ### Dependencies * update dependency com.google.cloud:google-cloud-shared-dependencies to v2.5.0 ([#577](https://www.github.com/googleapis/java-datastore/issues/577)) ([931e6ec](https://www.github.com/googleapis/java-datastore/commit/931e6ec846b446c369b5394c5284f6f26bb299ee)) --- 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 | 17 +++++++++++++++++ datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 6 +++--- google-cloud-datastore/pom.xml | 4 ++-- pom.xml | 6 +++--- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- versions.txt | 10 +++++----- 7 files changed, 34 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c4093024..bf246cfc1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,22 @@ # Changelog +## [2.2.0](https://www.github.com/googleapis/java-datastore/compare/v2.1.3...v2.2.0) (2021-11-15) + + +### Features + +* next release to 2.2.0 ([#567](https://www.github.com/googleapis/java-datastore/issues/567)) ([a23066f](https://www.github.com/googleapis/java-datastore/commit/a23066fcd13f4ad373ab16f13df014a23f639390)) + + +### Bug Fixes + +* **java:** java 17 dependency arguments ([#569](https://www.github.com/googleapis/java-datastore/issues/569)) ([19dd87f](https://www.github.com/googleapis/java-datastore/commit/19dd87fc0c929be278256d8fc25e0bf1fde29769)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.5.0 ([#577](https://www.github.com/googleapis/java-datastore/issues/577)) ([931e6ec](https://www.github.com/googleapis/java-datastore/commit/931e6ec846b446c369b5394c5284f6f26bb299ee)) + ### [2.1.3](https://www.github.com/googleapis/java-datastore/compare/v2.1.2...v2.1.3) (2021-10-20) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 77cc049be..aefce9156 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.1.4-SNAPSHOT + 2.2.0 com.google.cloud google-cloud-datastore-parent - 2.1.4-SNAPSHOT + 2.2.0 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 3f7188f12..f839f214f 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.1.4-SNAPSHOT + 2.2.0 pom com.google.cloud @@ -52,12 +52,12 @@ com.google.api.grpc proto-google-cloud-datastore-v1 - 0.92.4-SNAPSHOT + 0.93.0 com.google.cloud google-cloud-datastore - 2.1.4-SNAPSHOT + 2.2.0 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index e5fa2510d..75693e63d 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.1.4-SNAPSHOT + 2.2.0 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.1.4-SNAPSHOT + 2.2.0 google-cloud-datastore diff --git a/pom.xml b/pom.xml index ecb4ca2ab..3d8544d85 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.1.4-SNAPSHOT + 2.2.0 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -158,12 +158,12 @@ com.google.api.grpc proto-google-cloud-datastore-v1 - 0.92.4-SNAPSHOT + 0.93.0 com.google.cloud.datastore datastore-v1-proto-client - 2.1.4-SNAPSHOT + 2.2.0 com.google.api.grpc diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index ae898339d..8a77fa4c2 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.92.4-SNAPSHOT + 0.93.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.1.4-SNAPSHOT + 2.2.0 diff --git a/versions.txt b/versions.txt index fc91221c8..05703abfc 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.1.3:2.1.4-SNAPSHOT -google-cloud-datastore-bom:2.1.3:2.1.4-SNAPSHOT -google-cloud-datastore-parent:2.1.3:2.1.4-SNAPSHOT -proto-google-cloud-datastore-v1:0.92.3:0.92.4-SNAPSHOT -datastore-v1-proto-client:2.1.3:2.1.4-SNAPSHOT +google-cloud-datastore:2.2.0:2.2.0 +google-cloud-datastore-bom:2.2.0:2.2.0 +google-cloud-datastore-parent:2.2.0:2.2.0 +proto-google-cloud-datastore-v1:0.93.0:0.93.0 +datastore-v1-proto-client:2.2.0:2.2.0