From 9e03ddaa8b2e8d00adf69cf7a6160aa398adffb5 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 31 Aug 2021 22:14:48 +0000 Subject: [PATCH 01/12] chore: release 2.1.4-SNAPSHOT (#686) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- google-cloud-containeranalysis-bom/pom.xml | 12 ++++++------ google-cloud-containeranalysis/pom.xml | 4 ++-- grpc-google-cloud-containeranalysis-v1/pom.xml | 4 ++-- grpc-google-cloud-containeranalysis-v1beta1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-containeranalysis-v1/pom.xml | 4 ++-- proto-google-cloud-containeranalysis-v1beta1/pom.xml | 4 ++-- versions.txt | 10 +++++----- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/google-cloud-containeranalysis-bom/pom.xml b/google-cloud-containeranalysis-bom/pom.xml index c7fb0507..c5e33e96 100644 --- a/google-cloud-containeranalysis-bom/pom.xml +++ b/google-cloud-containeranalysis-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-containeranalysis-bom - 2.1.3 + 2.1.4-SNAPSHOT pom com.google.cloud @@ -53,27 +53,27 @@ com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 2.1.3 + 2.1.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.91.3 + 0.91.4-SNAPSHOT com.google.cloud google-cloud-containeranalysis - 2.1.3 + 2.1.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 2.1.3 + 2.1.4-SNAPSHOT com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.91.3 + 0.91.4-SNAPSHOT diff --git a/google-cloud-containeranalysis/pom.xml b/google-cloud-containeranalysis/pom.xml index 05455879..117ac4ae 100644 --- a/google-cloud-containeranalysis/pom.xml +++ b/google-cloud-containeranalysis/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-containeranalysis - 2.1.3 + 2.1.4-SNAPSHOT jar Google Cloud Container Analysis https://github.com/googleapis/java-containeranalysis @@ -11,7 +11,7 @@ com.google.cloud google-cloud-containeranalysis-parent - 2.1.3 + 2.1.4-SNAPSHOT google-cloud-containeranalysis diff --git a/grpc-google-cloud-containeranalysis-v1/pom.xml b/grpc-google-cloud-containeranalysis-v1/pom.xml index 01c716a9..61a79fba 100644 --- a/grpc-google-cloud-containeranalysis-v1/pom.xml +++ b/grpc-google-cloud-containeranalysis-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 2.1.3 + 2.1.4-SNAPSHOT grpc-google-cloud-containeranalysis-v1 GRPC library for grpc-google-cloud-containeranalysis-v1 com.google.cloud google-cloud-containeranalysis-parent - 2.1.3 + 2.1.4-SNAPSHOT diff --git a/grpc-google-cloud-containeranalysis-v1beta1/pom.xml b/grpc-google-cloud-containeranalysis-v1beta1/pom.xml index 12dfdbbb..4b1e8934 100644 --- a/grpc-google-cloud-containeranalysis-v1beta1/pom.xml +++ b/grpc-google-cloud-containeranalysis-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.91.3 + 0.91.4-SNAPSHOT grpc-google-cloud-containeranalysis-v1beta1 GRPC library for grpc-google-cloud-containeranalysis-v1beta1 com.google.cloud google-cloud-containeranalysis-parent - 2.1.3 + 2.1.4-SNAPSHOT diff --git a/pom.xml b/pom.xml index 9481a51f..7f5ab997 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-containeranalysis-parent pom - 2.1.3 + 2.1.4-SNAPSHOT Google Cloud Container Analysis Parent https://github.com/googleapis/java-containeranalysis @@ -61,27 +61,27 @@ com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 2.1.3 + 2.1.4-SNAPSHOT com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.91.3 + 0.91.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.91.3 + 0.91.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 2.1.3 + 2.1.4-SNAPSHOT com.google.cloud google-cloud-containeranalysis - 2.1.3 + 2.1.4-SNAPSHOT diff --git a/proto-google-cloud-containeranalysis-v1/pom.xml b/proto-google-cloud-containeranalysis-v1/pom.xml index 1374f81c..15310a75 100644 --- a/proto-google-cloud-containeranalysis-v1/pom.xml +++ b/proto-google-cloud-containeranalysis-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 2.1.3 + 2.1.4-SNAPSHOT proto-google-cloud-containeranalysis-v1 PROTO library for proto-google-cloud-containeranalysis-v1 com.google.cloud google-cloud-containeranalysis-parent - 2.1.3 + 2.1.4-SNAPSHOT diff --git a/proto-google-cloud-containeranalysis-v1beta1/pom.xml b/proto-google-cloud-containeranalysis-v1beta1/pom.xml index 6b1ab153..b941bae5 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/pom.xml +++ b/proto-google-cloud-containeranalysis-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.91.3 + 0.91.4-SNAPSHOT proto-google-cloud-containeranalysis-v1beta1 PROTO library for proto-google-cloud-containeranalysis-v1beta1 com.google.cloud google-cloud-containeranalysis-parent - 2.1.3 + 2.1.4-SNAPSHOT diff --git a/versions.txt b/versions.txt index ab89ed74..8519c2a5 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -proto-google-cloud-containeranalysis-v1:2.1.3:2.1.3 -proto-google-cloud-containeranalysis-v1beta1:0.91.3:0.91.3 -grpc-google-cloud-containeranalysis-v1beta1:0.91.3:0.91.3 -grpc-google-cloud-containeranalysis-v1:2.1.3:2.1.3 -google-cloud-containeranalysis:2.1.3:2.1.3 +proto-google-cloud-containeranalysis-v1:2.1.3:2.1.4-SNAPSHOT +proto-google-cloud-containeranalysis-v1beta1:0.91.3:0.91.4-SNAPSHOT +grpc-google-cloud-containeranalysis-v1beta1:0.91.3:0.91.4-SNAPSHOT +grpc-google-cloud-containeranalysis-v1:2.1.3:2.1.4-SNAPSHOT +google-cloud-containeranalysis:2.1.3:2.1.4-SNAPSHOT From 597c7e6ca295e466df6a0c47d5ed7eb80173a3c7 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 2 Sep 2021 18:00:50 +0200 Subject: [PATCH 02/12] chore(deps): update dependency com.google.cloud:google-cloud-containeranalysis to v2.1.3 (#687) 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-containeranalysis](https://togithub.com/googleapis/java-containeranalysis) | `2.1.2` -> `2.1.3` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-containeranalysis/2.1.3/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-containeranalysis/2.1.3/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-containeranalysis/2.1.3/compatibility-slim/2.1.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-containeranalysis/2.1.3/confidence-slim/2.1.2)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-containeranalysis ### [`v2.1.3`](https://togithub.com/googleapis/java-containeranalysis/blob/master/CHANGELOG.md#​213-httpswwwgithubcomgoogleapisjava-containeranalysiscomparev212v213-2021-08-31) [Compare Source](https://togithub.com/googleapis/java-containeranalysis/compare/v2.1.2...v2.1.3)
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-containeranalysis). --- 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 15980f8a..f3f91a3f 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-containeranalysis - 2.1.2 + 2.1.3 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 127df918..5831488f 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-containeranalysis - 2.1.2 + 2.1.3 From a85b89c583d35ba54bb373c8cec42b3710ac6113 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 3 Sep 2021 08:46:28 -0700 Subject: [PATCH 03/12] chore(java): install maven 3.8.1 at runtime (#689) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/8bb89f31-112c-44eb-9c1d-ba17ecc2459e/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) Source-Link: https://github.com/googleapis/synthtool/commit/ad7fd76e17bf9494a3e47ff9cf445f61564432e0 --- .github/workflows/ci.yaml | 14 +++++++++++++- synth.metadata | 4 ++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d510359d..e23d923e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,6 +12,9 @@ jobs: java: [8, 11] steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: ${{matrix.java}} @@ -37,6 +40,9 @@ jobs: java: [8, 11] steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: ${{matrix.java}} @@ -46,6 +52,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: 8 @@ -57,10 +66,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: 8 - run: java -version - run: .kokoro/build.sh env: - JOB_TYPE: clirr + JOB_TYPE: clirr \ No newline at end of file diff --git a/synth.metadata b/synth.metadata index fb8c5cab..b1bdbdcd 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-containeranalysis.git", - "sha": "c15a998d1e1f7082f894648b3d3cd2f9c3743efd" + "sha": "597c7e6ca295e466df6a0c47d5ed7eb80173a3c7" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "9a238a0623879c3de129a376c6085d4a862f6eb9" + "sha": "ad7fd76e17bf9494a3e47ff9cf445f61564432e0" } } ], From 7a2fab0bdc59c0dc799f0c2cd119c04a1fa17750 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Wed, 8 Sep 2021 15:11:25 -0700 Subject: [PATCH 04/12] chore: remove readme autosynth config (#694) --- .github/readme/synth.metadata/synth.metadata | 18 ------- .github/readme/synth.py | 19 ------- .kokoro/continuous/readme.cfg | 55 -------------------- 3 files changed, 92 deletions(-) delete mode 100644 .github/readme/synth.metadata/synth.metadata delete mode 100644 .github/readme/synth.py delete mode 100644 .kokoro/continuous/readme.cfg diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata deleted file mode 100644 index 7e6b2637..00000000 --- a/.github/readme/synth.metadata/synth.metadata +++ /dev/null @@ -1,18 +0,0 @@ -{ - "sources": [ - { - "git": { - "name": ".", - "remote": "https://github.com/googleapis/java-containeranalysis.git", - "sha": "b0a2a5055181848842eed8b2475a036ae16461f4" - } - }, - { - "git": { - "name": "synthtool", - "remote": "https://github.com/googleapis/synthtool.git", - "sha": "e770c12f2a9a5f84566fe04b16a4ceec1c8c109b" - } - } - ] -} \ No newline at end of file diff --git a/.github/readme/synth.py b/.github/readme/synth.py deleted file mode 100644 index 7b48cc28..00000000 --- a/.github/readme/synth.py +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2020 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -"""This script is used to synthesize generated the README for this library.""" - -from synthtool.languages import java - -java.custom_templates(["java_library/README.md"]) diff --git a/.kokoro/continuous/readme.cfg b/.kokoro/continuous/readme.cfg deleted file mode 100644 index 37318d6d..00000000 --- a/.kokoro/continuous/readme.cfg +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 2020 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Format: //devtools/kokoro/config/proto/build.proto - -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/python-multi" -} - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/java-containeranalysis/.kokoro/readme.sh" -} - -# Build logs will be here -action { - define_artifacts { - regex: "**/*sponge_log.xml" - regex: "**/*sponge_log.log" - } -} - -# The github token is stored here. -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "yoshi-automation-github-key" - # TODO(theacodes): remove this after secrets have globally propagated - backend_type: FASTCONFIGPUSH - } - } -} - -# Common env vars for all repositories and builds. -env_vars: { - key: "GITHUB_USER" - value: "yoshi-automation" -} -env_vars: { - key: "GITHUB_EMAIL" - value: "yoshi-automation@google.com" -} From 6b12efae0f08a395b01d6f5bfff5731edaaa6023 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 10 Sep 2021 11:01:29 -0700 Subject: [PATCH 05/12] chore(java): update windows build (#692) to install maven 3.8.1 at runtime too (related to #1202) Tested in [java-bigquerystorage](https://github.com/googleapis/java-bigquerystorage/pull/1291/commits/7834f4ff86858f6ed0b8068ea66dadf6365e399a) Source-Author: Stephanie Wang Source-Date: Tue Sep 7 13:04:27 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: 17ee6e5c08f2eb47029beee4776ce990e56b3925 Source-Link: https://github.com/googleapis/synthtool/commit/17ee6e5c08f2eb47029beee4776ce990e56b3925 --- .github/workflows/ci.yaml | 5 ++++- synth.metadata | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e23d923e..3becb5c0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -26,6 +26,9 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: 8 @@ -75,4 +78,4 @@ jobs: - run: java -version - run: .kokoro/build.sh env: - JOB_TYPE: clirr \ No newline at end of file + JOB_TYPE: clirr diff --git a/synth.metadata b/synth.metadata index b1bdbdcd..4a1f5a8d 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-containeranalysis.git", - "sha": "597c7e6ca295e466df6a0c47d5ed7eb80173a3c7" + "sha": "a85b89c583d35ba54bb373c8cec42b3710ac6113" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "ad7fd76e17bf9494a3e47ff9cf445f61564432e0" + "sha": "17ee6e5c08f2eb47029beee4776ce990e56b3925" } } ], From 035def93057c04d34c2102dbe95d1d053fa46d7c Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 10 Sep 2021 11:38:13 -0700 Subject: [PATCH 06/12] chore: regenerate README (#688) This PR was generated using Autosynth. :rainbow:
Log from Synthtool ``` 2021-09-02 16:06:47,046 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-containeranalysis/.github/readme/synth.py. On branch autosynth-readme nothing to commit, working tree clean 2021-09-02 16:06:48,259 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata. ```
Full log will be available here: https://source.cloud.google.com/results/invocations/6ede1f9f-2753-4007-aa7c-abc0e7071ac2/targets - [x] To automatically regenerate this PR, check this box. (May take up to 24 hours.) --- .github/readme/synth.metadata/synth.metadata | 18 ++++++++++++++++++ README.md | 6 +++--- 2 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 .github/readme/synth.metadata/synth.metadata diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata new file mode 100644 index 00000000..7e36388b --- /dev/null +++ b/.github/readme/synth.metadata/synth.metadata @@ -0,0 +1,18 @@ +{ + "sources": [ + { + "git": { + "name": ".", + "remote": "https://github.com/googleapis/java-containeranalysis.git", + "sha": "597c7e6ca295e466df6a0c47d5ed7eb80173a3c7" + } + }, + { + "git": { + "name": "synthtool", + "remote": "https://github.com/googleapis/synthtool.git", + "sha": "5c0fa62eea9c33ebe61e582424b659eb264e1ba4" + } + } + ] +} \ No newline at end of file diff --git a/README.md b/README.md index 154469aa..b52a6bb7 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-containeranalysis - 2.1.2 + 2.1.3 ``` @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-containeranalysis' If you are using Gradle without BOM, add this to your dependencies ```Groovy -implementation 'com.google.cloud:google-cloud-containeranalysis:2.1.2' +implementation 'com.google.cloud:google-cloud-containeranalysis:2.1.3' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-containeranalysis" % "2.1.2" +libraryDependencies += "com.google.cloud" % "google-cloud-containeranalysis" % "2.1.3" ``` ## Authentication From 50a11f4f1f04c08d2f024b1c27ac1474a12335a5 Mon Sep 17 00:00:00 2001 From: Dina Graves Portman Date: Fri, 10 Sep 2021 12:09:52 -0700 Subject: [PATCH 07/12] chore: Update sync-repo-settings.yaml (#697) --- .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 efe88147..98c3cb0f 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -38,3 +38,5 @@ permissionRules: permission: admin - team: yoshi-java permission: push + - team: cicd + permission: push From 558e219fb4832b2c8b4c4dacf8a30127f5c6529a Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 13 Sep 2021 18:40:57 +0200 Subject: [PATCH 08/12] chore(deps): update dependency com.google.cloud:libraries-bom to v23 (#691) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `22.0.0` -> `23.0.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/23.0.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/23.0.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/23.0.0/compatibility-slim/22.0.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/23.0.0/confidence-slim/22.0.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [x] If you want to rebase/retry this PR, check this box. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-containeranalysis). --- 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 cd8cf5fd..00135953 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 22.0.0 + 23.0.0 pom import From 02d0e4af5fc781a9c847a8b65d8aee0d11cd40ca Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 13 Sep 2021 10:40:06 -0700 Subject: [PATCH 09/12] chore: re-generated to pick up changes from synthtool (#699) * changes without context autosynth cannot find the source of changes triggered by earlier changes in this repository, or by version upgrades to tools such as linters. * chore(java): remove readme autosynth job config README generation is now handled by owlbot Source-Author: Jeff Ching Source-Date: Wed Sep 8 12:11:28 2021 -0700 Source-Repo: googleapis/synthtool Source-Sha: df5093b950d4aafd49a4c7758d74c44485263ada Source-Link: https://github.com/googleapis/synthtool/commit/df5093b950d4aafd49a4c7758d74c44485263ada * chore: remove readme synth.py config Source-Author: Jeff Ching Source-Date: Wed Sep 8 13:23:41 2021 -0700 Source-Repo: googleapis/synthtool Source-Sha: 2d31a9243781b282202b4f76dc7bbc8b45803196 Source-Link: https://github.com/googleapis/synthtool/commit/2d31a9243781b282202b4f76dc7bbc8b45803196 * chore: add gcf-owl-bot to list of trusted contributors Source-Author: Jeff Ching Source-Date: Wed Sep 8 13:42:12 2021 -0700 Source-Repo: googleapis/synthtool Source-Sha: a6b97202771f89a4b76873d43ea9a07d7fc95f91 Source-Link: https://github.com/googleapis/synthtool/commit/a6b97202771f89a4b76873d43ea9a07d7fc95f91 * chore(java): update shared-config and shared-dependencies version in pom template Source-Author: Neenu Shaji Source-Date: Wed Sep 8 17:28:48 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: 396d9b84a1e93880f5bf88b59ecd38a0a6dffc5e Source-Link: https://github.com/googleapis/synthtool/commit/396d9b84a1e93880f5bf88b59ecd38a0a6dffc5e --- .github/trusted-contribution.yml | 3 ++- .kokoro/release/common.sh | 2 +- .kokoro/release/drop.sh | 2 +- .kokoro/release/promote.sh | 2 +- .kokoro/release/publish_javadoc.sh | 2 +- .kokoro/release/publish_javadoc11.sh | 2 +- .kokoro/release/stage.sh | 2 +- .kokoro/trampoline.sh | 2 +- synth.metadata | 6 ++---- 9 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/trusted-contribution.yml b/.github/trusted-contribution.yml index f247d5c7..a0ba1f7d 100644 --- a/.github/trusted-contribution.yml +++ b/.github/trusted-contribution.yml @@ -1,2 +1,3 @@ trustedContributors: -- renovate-bot \ No newline at end of file +- renovate-bot +- gcf-owl-bot[bot] diff --git a/.kokoro/release/common.sh b/.kokoro/release/common.sh index 6e3f6599..7f78ee41 100755 --- a/.kokoro/release/common.sh +++ b/.kokoro/release/common.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/release/drop.sh b/.kokoro/release/drop.sh index 5c4551ef..742ec1a8 100755 --- a/.kokoro/release/drop.sh +++ b/.kokoro/release/drop.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/release/promote.sh b/.kokoro/release/promote.sh index 1fa95fa5..3cac3d8a 100755 --- a/.kokoro/release/promote.sh +++ b/.kokoro/release/promote.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh index 5dab9d59..be36a129 100755 --- a/.kokoro/release/publish_javadoc.sh +++ b/.kokoro/release/publish_javadoc.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2019 Google Inc. +# Copyright 2019 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh index 3b6d37c2..bb52a13f 100755 --- a/.kokoro/release/publish_javadoc11.sh +++ b/.kokoro/release/publish_javadoc11.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2021 Google Inc. +# Copyright 2021 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh index 8a103384..77dc4e8f 100755 --- a/.kokoro/release/stage.sh +++ b/.kokoro/release/stage.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/trampoline.sh b/.kokoro/trampoline.sh index 9da0f839..8b69b793 100644 --- a/.kokoro/trampoline.sh +++ b/.kokoro/trampoline.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/synth.metadata b/synth.metadata index 4a1f5a8d..5b3d7e8b 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-containeranalysis.git", - "sha": "a85b89c583d35ba54bb373c8cec42b3710ac6113" + "sha": "50a11f4f1f04c08d2f024b1c27ac1474a12335a5" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "17ee6e5c08f2eb47029beee4776ce990e56b3925" + "sha": "396d9b84a1e93880f5bf88b59ecd38a0a6dffc5e" } } ], @@ -42,7 +42,6 @@ ".github/PULL_REQUEST_TEMPLATE.md", ".github/blunderbuss.yml", ".github/generated-files-bot.yml", - ".github/readme/synth.py", ".github/release-please.yml", ".github/release-trigger.yml", ".github/snippet-bot.yml", @@ -59,7 +58,6 @@ ".kokoro/common.sh", ".kokoro/continuous/common.cfg", ".kokoro/continuous/java8.cfg", - ".kokoro/continuous/readme.cfg", ".kokoro/dependencies.sh", ".kokoro/nightly/common.cfg", ".kokoro/nightly/integration.cfg", From 5c11aef82d2d9c1a01bcfee245113cd8873ce414 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 13 Sep 2021 10:56:05 -0700 Subject: [PATCH 10/12] changes without context (#695) autosynth cannot find the source of changes triggered by earlier changes in this repository, or by version upgrades to tools such as linters. Co-authored-by: Emily Ball --- .github/readme/synth.py | 19 ++++++++++++ .kokoro/continuous/readme.cfg | 55 +++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 .github/readme/synth.py create mode 100644 .kokoro/continuous/readme.cfg diff --git a/.github/readme/synth.py b/.github/readme/synth.py new file mode 100644 index 00000000..7b48cc28 --- /dev/null +++ b/.github/readme/synth.py @@ -0,0 +1,19 @@ +# Copyright 2020 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +"""This script is used to synthesize generated the README for this library.""" + +from synthtool.languages import java + +java.custom_templates(["java_library/README.md"]) diff --git a/.kokoro/continuous/readme.cfg b/.kokoro/continuous/readme.cfg new file mode 100644 index 00000000..37318d6d --- /dev/null +++ b/.kokoro/continuous/readme.cfg @@ -0,0 +1,55 @@ +# Copyright 2020 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Format: //devtools/kokoro/config/proto/build.proto + +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/python-multi" +} + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-containeranalysis/.kokoro/readme.sh" +} + +# Build logs will be here +action { + define_artifacts { + regex: "**/*sponge_log.xml" + regex: "**/*sponge_log.log" + } +} + +# The github token is stored here. +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "yoshi-automation-github-key" + # TODO(theacodes): remove this after secrets have globally propagated + backend_type: FASTCONFIGPUSH + } + } +} + +# Common env vars for all repositories and builds. +env_vars: { + key: "GITHUB_USER" + value: "yoshi-automation" +} +env_vars: { + key: "GITHUB_EMAIL" + value: "yoshi-automation@google.com" +} From c35d0d60caf209d2a10f46406e2038dd4c08c48d Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 13 Sep 2021 21:35:44 +0200 Subject: [PATCH 11/12] deps: update dependency io.grafeas:grafeas to v2.0.3 (#698) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7f5ab997..3b51f2c8 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ io.grafeas grafeas - 2.0.1 + 2.0.3 From 250c92dd8b82ace42d7f0dad397fbc2ff61a5ea1 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 13 Sep 2021 19:43:06 +0000 Subject: [PATCH 12/12] chore: release 2.1.4 (#700) :robot: I have created a release \*beep\* \*boop\* --- ### [2.1.4](https://www.github.com/googleapis/java-containeranalysis/compare/v2.1.3...v2.1.4) (2021-09-13) ### Dependencies * update dependency io.grafeas:grafeas to v2.0.3 ([#698](https://www.github.com/googleapis/java-containeranalysis/issues/698)) ([c35d0d6](https://www.github.com/googleapis/java-containeranalysis/commit/c35d0d60caf209d2a10f46406e2038dd4c08c48d)) --- 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 | 7 +++++++ google-cloud-containeranalysis-bom/pom.xml | 12 ++++++------ google-cloud-containeranalysis/pom.xml | 4 ++-- grpc-google-cloud-containeranalysis-v1/pom.xml | 4 ++-- grpc-google-cloud-containeranalysis-v1beta1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-containeranalysis-v1/pom.xml | 4 ++-- proto-google-cloud-containeranalysis-v1beta1/pom.xml | 4 ++-- versions.txt | 10 +++++----- 9 files changed, 34 insertions(+), 27 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 47beb86f..2936dfc6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [2.1.4](https://www.github.com/googleapis/java-containeranalysis/compare/v2.1.3...v2.1.4) (2021-09-13) + + +### Dependencies + +* update dependency io.grafeas:grafeas to v2.0.3 ([#698](https://www.github.com/googleapis/java-containeranalysis/issues/698)) ([c35d0d6](https://www.github.com/googleapis/java-containeranalysis/commit/c35d0d60caf209d2a10f46406e2038dd4c08c48d)) + ### [2.1.3](https://www.github.com/googleapis/java-containeranalysis/compare/v2.1.2...v2.1.3) (2021-08-31) diff --git a/google-cloud-containeranalysis-bom/pom.xml b/google-cloud-containeranalysis-bom/pom.xml index c5e33e96..87fd0617 100644 --- a/google-cloud-containeranalysis-bom/pom.xml +++ b/google-cloud-containeranalysis-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-containeranalysis-bom - 2.1.4-SNAPSHOT + 2.1.4 pom com.google.cloud @@ -53,27 +53,27 @@ com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 2.1.4-SNAPSHOT + 2.1.4 com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.91.4-SNAPSHOT + 0.91.4 com.google.cloud google-cloud-containeranalysis - 2.1.4-SNAPSHOT + 2.1.4 com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 2.1.4-SNAPSHOT + 2.1.4 com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.91.4-SNAPSHOT + 0.91.4 diff --git a/google-cloud-containeranalysis/pom.xml b/google-cloud-containeranalysis/pom.xml index 117ac4ae..4d37fb3d 100644 --- a/google-cloud-containeranalysis/pom.xml +++ b/google-cloud-containeranalysis/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-containeranalysis - 2.1.4-SNAPSHOT + 2.1.4 jar Google Cloud Container Analysis https://github.com/googleapis/java-containeranalysis @@ -11,7 +11,7 @@ com.google.cloud google-cloud-containeranalysis-parent - 2.1.4-SNAPSHOT + 2.1.4 google-cloud-containeranalysis diff --git a/grpc-google-cloud-containeranalysis-v1/pom.xml b/grpc-google-cloud-containeranalysis-v1/pom.xml index 61a79fba..c7dd5487 100644 --- a/grpc-google-cloud-containeranalysis-v1/pom.xml +++ b/grpc-google-cloud-containeranalysis-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 2.1.4-SNAPSHOT + 2.1.4 grpc-google-cloud-containeranalysis-v1 GRPC library for grpc-google-cloud-containeranalysis-v1 com.google.cloud google-cloud-containeranalysis-parent - 2.1.4-SNAPSHOT + 2.1.4 diff --git a/grpc-google-cloud-containeranalysis-v1beta1/pom.xml b/grpc-google-cloud-containeranalysis-v1beta1/pom.xml index 4b1e8934..c3ffcccd 100644 --- a/grpc-google-cloud-containeranalysis-v1beta1/pom.xml +++ b/grpc-google-cloud-containeranalysis-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.91.4-SNAPSHOT + 0.91.4 grpc-google-cloud-containeranalysis-v1beta1 GRPC library for grpc-google-cloud-containeranalysis-v1beta1 com.google.cloud google-cloud-containeranalysis-parent - 2.1.4-SNAPSHOT + 2.1.4 diff --git a/pom.xml b/pom.xml index 3b51f2c8..3684e2c9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-containeranalysis-parent pom - 2.1.4-SNAPSHOT + 2.1.4 Google Cloud Container Analysis Parent https://github.com/googleapis/java-containeranalysis @@ -61,27 +61,27 @@ com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 2.1.4-SNAPSHOT + 2.1.4 com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.91.4-SNAPSHOT + 0.91.4 com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.91.4-SNAPSHOT + 0.91.4 com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 2.1.4-SNAPSHOT + 2.1.4 com.google.cloud google-cloud-containeranalysis - 2.1.4-SNAPSHOT + 2.1.4 diff --git a/proto-google-cloud-containeranalysis-v1/pom.xml b/proto-google-cloud-containeranalysis-v1/pom.xml index 15310a75..0ecff13a 100644 --- a/proto-google-cloud-containeranalysis-v1/pom.xml +++ b/proto-google-cloud-containeranalysis-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 2.1.4-SNAPSHOT + 2.1.4 proto-google-cloud-containeranalysis-v1 PROTO library for proto-google-cloud-containeranalysis-v1 com.google.cloud google-cloud-containeranalysis-parent - 2.1.4-SNAPSHOT + 2.1.4 diff --git a/proto-google-cloud-containeranalysis-v1beta1/pom.xml b/proto-google-cloud-containeranalysis-v1beta1/pom.xml index b941bae5..24ce1c70 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/pom.xml +++ b/proto-google-cloud-containeranalysis-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.91.4-SNAPSHOT + 0.91.4 proto-google-cloud-containeranalysis-v1beta1 PROTO library for proto-google-cloud-containeranalysis-v1beta1 com.google.cloud google-cloud-containeranalysis-parent - 2.1.4-SNAPSHOT + 2.1.4 diff --git a/versions.txt b/versions.txt index 8519c2a5..26f6b6d0 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -proto-google-cloud-containeranalysis-v1:2.1.3:2.1.4-SNAPSHOT -proto-google-cloud-containeranalysis-v1beta1:0.91.3:0.91.4-SNAPSHOT -grpc-google-cloud-containeranalysis-v1beta1:0.91.3:0.91.4-SNAPSHOT -grpc-google-cloud-containeranalysis-v1:2.1.3:2.1.4-SNAPSHOT -google-cloud-containeranalysis:2.1.3:2.1.4-SNAPSHOT +proto-google-cloud-containeranalysis-v1:2.1.4:2.1.4 +proto-google-cloud-containeranalysis-v1beta1:0.91.4:0.91.4 +grpc-google-cloud-containeranalysis-v1beta1:0.91.4:0.91.4 +grpc-google-cloud-containeranalysis-v1:2.1.4:2.1.4 +google-cloud-containeranalysis:2.1.4:2.1.4