From a990d001efab58ff38072f3ddf390fba6e4eb9e3 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 11 Jun 2021 05:00:03 +0000 Subject: [PATCH 01/13] chore: release 1.3.5-SNAPSHOT (#603) :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 0978dfc0..ee9089b3 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 - 1.3.4 + 1.3.5-SNAPSHOT pom com.google.cloud @@ -64,27 +64,27 @@ com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 1.3.4 + 1.3.5-SNAPSHOT com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.89.4 + 0.89.5-SNAPSHOT com.google.cloud google-cloud-containeranalysis - 1.3.4 + 1.3.5-SNAPSHOT com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 1.3.4 + 1.3.5-SNAPSHOT com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.89.4 + 0.89.5-SNAPSHOT diff --git a/google-cloud-containeranalysis/pom.xml b/google-cloud-containeranalysis/pom.xml index f97fe082..321090f2 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 - 1.3.4 + 1.3.5-SNAPSHOT jar Google Cloud Container Analysis https://github.com/googleapis/java-containeranalysis @@ -11,7 +11,7 @@ com.google.cloud google-cloud-containeranalysis-parent - 1.3.4 + 1.3.5-SNAPSHOT google-cloud-containeranalysis diff --git a/grpc-google-cloud-containeranalysis-v1/pom.xml b/grpc-google-cloud-containeranalysis-v1/pom.xml index e577d538..f3d3af55 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 - 1.3.4 + 1.3.5-SNAPSHOT grpc-google-cloud-containeranalysis-v1 GRPC library for grpc-google-cloud-containeranalysis-v1 com.google.cloud google-cloud-containeranalysis-parent - 1.3.4 + 1.3.5-SNAPSHOT diff --git a/grpc-google-cloud-containeranalysis-v1beta1/pom.xml b/grpc-google-cloud-containeranalysis-v1beta1/pom.xml index f8f37c98..9a2ba583 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.89.4 + 0.89.5-SNAPSHOT grpc-google-cloud-containeranalysis-v1beta1 GRPC library for grpc-google-cloud-containeranalysis-v1beta1 com.google.cloud google-cloud-containeranalysis-parent - 1.3.4 + 1.3.5-SNAPSHOT diff --git a/pom.xml b/pom.xml index c0459980..8d1746ec 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-containeranalysis-parent pom - 1.3.4 + 1.3.5-SNAPSHOT Google Cloud Container Analysis Parent https://github.com/googleapis/java-containeranalysis @@ -70,27 +70,27 @@ com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 1.3.4 + 1.3.5-SNAPSHOT com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.89.4 + 0.89.5-SNAPSHOT com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.89.4 + 0.89.5-SNAPSHOT com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 1.3.4 + 1.3.5-SNAPSHOT com.google.cloud google-cloud-containeranalysis - 1.3.4 + 1.3.5-SNAPSHOT diff --git a/proto-google-cloud-containeranalysis-v1/pom.xml b/proto-google-cloud-containeranalysis-v1/pom.xml index f5c4476a..5b8a72e8 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 - 1.3.4 + 1.3.5-SNAPSHOT proto-google-cloud-containeranalysis-v1 PROTO library for proto-google-cloud-containeranalysis-v1 com.google.cloud google-cloud-containeranalysis-parent - 1.3.4 + 1.3.5-SNAPSHOT diff --git a/proto-google-cloud-containeranalysis-v1beta1/pom.xml b/proto-google-cloud-containeranalysis-v1beta1/pom.xml index 8564a9d7..fed2a6e2 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.89.4 + 0.89.5-SNAPSHOT proto-google-cloud-containeranalysis-v1beta1 PROTO library for proto-google-cloud-containeranalysis-v1beta1 com.google.cloud google-cloud-containeranalysis-parent - 1.3.4 + 1.3.5-SNAPSHOT diff --git a/versions.txt b/versions.txt index b84ff6fc..d570b29e 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -proto-google-cloud-containeranalysis-v1:1.3.4:1.3.4 -proto-google-cloud-containeranalysis-v1beta1:0.89.4:0.89.4 -grpc-google-cloud-containeranalysis-v1beta1:0.89.4:0.89.4 -grpc-google-cloud-containeranalysis-v1:1.3.4:1.3.4 -google-cloud-containeranalysis:1.3.4:1.3.4 +proto-google-cloud-containeranalysis-v1:1.3.4:1.3.5-SNAPSHOT +proto-google-cloud-containeranalysis-v1beta1:0.89.4:0.89.5-SNAPSHOT +grpc-google-cloud-containeranalysis-v1beta1:0.89.4:0.89.5-SNAPSHOT +grpc-google-cloud-containeranalysis-v1:1.3.4:1.3.5-SNAPSHOT +google-cloud-containeranalysis:1.3.4:1.3.5-SNAPSHOT From 79a4f4a2559542a042b98ee26f64ea9ceeb52312 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 14 Jun 2021 19:09:15 +0200 Subject: [PATCH 02/13] chore(deps): update dependency com.google.cloud:google-cloud-containeranalysis to v1.3.4 (#604) --- 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 b0608242..2b919dd6 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 - 1.3.3 + 1.3.4 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index bbf4d431..2eff15e2 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-containeranalysis - 1.3.3 + 1.3.4 From 5c14c2949f9a7c37ae6352801fd5ff23e0e96e11 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 14 Jun 2021 10:18:04 -0700 Subject: [PATCH 03/13] chore: regenerate README (#606) This PR was generated using Autosynth. :rainbow:
Log from Synthtool ``` 2021-06-14 17:11:27,339 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-containeranalysis/.github/readme/synth.py. On branch autosynth-readme nothing to commit, working tree clean 2021-06-14 17:11:28,629 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata. ```
Full log will be available here: https://source.cloud.google.com/results/invocations/8106efe8-7153-4c13-807b-462bbc0c7084/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) --- .github/readme/synth.metadata/synth.metadata | 4 ++-- README.md | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 65be6e24..d334a1b7 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-containeranalysis.git", - "sha": "dd6e51f82fb6aec48d62da54670f98a80d0512db" + "sha": "79a4f4a2559542a042b98ee26f64ea9ceeb52312" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "740366bbb9a7e0f4b77fc75dc26be1d3a376c3e0" + "sha": "41ccd8cd13ec31f4fb839cf8182aea3c7156e19d" } } ] diff --git a/README.md b/README.md index 33ec0c54..6bed0a2a 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-containeranalysis - 1.3.3 + 1.3.4 ``` @@ -51,12 +51,12 @@ compile 'com.google.cloud:google-cloud-containeranalysis' ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-containeranalysis:1.3.3' +compile 'com.google.cloud:google-cloud-containeranalysis:1.3.4' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-containeranalysis" % "1.3.3" +libraryDependencies += "com.google.cloud" % "google-cloud-containeranalysis" % "1.3.4" ``` ## Authentication From 151fa851b46bcbcd0468c50d124ed54822989894 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 14 Jun 2021 10:20:19 -0700 Subject: [PATCH 04/13] chore: release gapic-generator-java v1.0.12 (#605) * chore: release gapic-generator-java v1.0.11 Committer: @miraleung PiperOrigin-RevId: 378266372 Source-Author: Google APIs Source-Date: Tue Jun 8 15:56:51 2021 -0700 Source-Repo: googleapis/googleapis Source-Sha: 9e3105549a35520f215359065c11e8dce15e18af Source-Link: https://github.com/googleapis/googleapis/commit/9e3105549a35520f215359065c11e8dce15e18af * chore: release gapic-generator-java v1.0.12 Committer: @miraleung PiperOrigin-RevId: 378718217 Source-Author: Google APIs Source-Date: Thu Jun 10 13:08:49 2021 -0700 Source-Repo: googleapis/googleapis Source-Sha: 08c4eeb531c01ad031134dca94b18e3f7dd35902 Source-Link: https://github.com/googleapis/googleapis/commit/08c4eeb531c01ad031134dca94b18e3f7dd35902 --- .../v1/stub/ContainerAnalysisStubSettings.java | 7 +++++++ .../containeranalysis/v1/ContainerAnalysisClientTest.java | 2 +- synth.metadata | 6 +++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/stub/ContainerAnalysisStubSettings.java b/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/stub/ContainerAnalysisStubSettings.java index 08a206bf..bbc5b128 100644 --- a/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/stub/ContainerAnalysisStubSettings.java +++ b/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/stub/ContainerAnalysisStubSettings.java @@ -140,6 +140,11 @@ public static String getDefaultEndpoint() { return "containeranalysis.googleapis.com:443"; } + /** Returns the default mTLS service endpoint. */ + public static String getDefaultMtlsEndpoint() { + return "containeranalysis.mtls.googleapis.com:443"; + } + /** Returns the default service scopes. */ public static List getDefaultServiceScopes() { return DEFAULT_SERVICE_SCOPES; @@ -279,6 +284,8 @@ private static Builder createDefault() { builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build()); builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build()); builder.setEndpoint(getDefaultEndpoint()); + builder.setMtlsEndpoint(getDefaultMtlsEndpoint()); + builder.setSwitchToMtlsEndpointAllowed(true); return initDefaults(builder); } diff --git a/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1/ContainerAnalysisClientTest.java b/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1/ContainerAnalysisClientTest.java index 6612d369..d6e8012f 100644 --- a/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1/ContainerAnalysisClientTest.java +++ b/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1/ContainerAnalysisClientTest.java @@ -53,8 +53,8 @@ public class ContainerAnalysisClientTest { private static MockContainerAnalysis mockContainerAnalysis; private static MockServiceHelper mockServiceHelper; - private ContainerAnalysisClient client; private LocalChannelProvider channelProvider; + private ContainerAnalysisClient client; @BeforeClass public static void startStaticServer() { diff --git a/synth.metadata b/synth.metadata index 7b64a76b..6b6acf54 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,15 +4,15 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-containeranalysis.git", - "sha": "6deede3f7dec75fc5ccf0a43dd98bf91c55dd205" + "sha": "a990d001efab58ff38072f3ddf390fba6e4eb9e3" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "a5f96d06ef57e325761bad010f460d0c5dbeccda", - "internalRef": "377081269" + "sha": "08c4eeb531c01ad031134dca94b18e3f7dd35902", + "internalRef": "378718217" } }, { From 217f1dbfa5a89ce54521f0320c4941730206552d Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 16 Jun 2021 10:58:15 -0700 Subject: [PATCH 05/13] fix: Update dependencies.sh to not break on mac (#607) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/2e87f458-ad4a-4fab-b800-f102a178fb14/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) Source-Link: https://github.com/googleapis/synthtool/commit/8f76a885deaaf2fe234daeba4a8cc4d1b3de8086 --- .kokoro/dependencies.sh | 4 ++-- synth.metadata | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 59d2aafc..a7e999d3 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -46,7 +46,7 @@ function completenessCheck() { # This is stripped from the output as it is not present in the flattened pom. # Only dependencies with 'compile' or 'runtime' scope are included from original dependency list. msg "Generating dependency list using original pom..." - mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// >.org-list.txt + mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e 's/ --.*//' >.org-list.txt # Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes) msg "Generating dependency list using flattened pom..." @@ -70,7 +70,7 @@ function completenessCheck() { set +e error_count=0 -for path in $(find -name ".flattened-pom.xml") +for path in **/.flattened-pom.xml do # Check flattened pom in each dir that contains it for completeness dir=$(dirname "$path") diff --git a/synth.metadata b/synth.metadata index 6b6acf54..4021f6dd 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-containeranalysis.git", - "sha": "a990d001efab58ff38072f3ddf390fba6e4eb9e3" + "sha": "151fa851b46bcbcd0468c50d124ed54822989894" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "8eae0234a16b26c2ff616d305dbd9786c8b10a47" + "sha": "8f76a885deaaf2fe234daeba4a8cc4d1b3de8086" } } ], @@ -101,6 +101,7 @@ "CODE_OF_CONDUCT.md", "CONTRIBUTING.md", "LICENSE", + "SECURITY.md", "codecov.yaml", "google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/ContainerAnalysisClient.java", "google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/ContainerAnalysisSettings.java", From 688200dd50ab5c4f3eba615aa4286e0af53631c0 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 18 Jun 2021 15:04:22 -0700 Subject: [PATCH 06/13] chore: minimize noise from build scripts (#610) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/0bf5b74f-4b50-422c-80c8-b7567b17ae67/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) Source-Link: https://github.com/googleapis/synthtool/commit/1c0c698705e668ccb3d68556ae7260f16ce63a6e --- .kokoro/coerce_logs.sh | 1 - synth.metadata | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.kokoro/coerce_logs.sh b/.kokoro/coerce_logs.sh index 5cf7ba49..46edbf7f 100755 --- a/.kokoro/coerce_logs.sh +++ b/.kokoro/coerce_logs.sh @@ -28,7 +28,6 @@ job=$(basename ${KOKORO_JOB_NAME}) echo "coercing sponge logs..." for xml in `find . -name *-sponge_log.xml` do - echo "processing ${xml}" class=$(basename ${xml} | cut -d- -f2) dir=$(dirname ${xml})/${job}/${class} text=$(dirname ${xml})/${class}-sponge_log.txt diff --git a/synth.metadata b/synth.metadata index 4021f6dd..8007dbc2 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-containeranalysis.git", - "sha": "151fa851b46bcbcd0468c50d124ed54822989894" + "sha": "217f1dbfa5a89ce54521f0320c4941730206552d" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "8f76a885deaaf2fe234daeba4a8cc4d1b3de8086" + "sha": "1c0c698705e668ccb3d68556ae7260f16ce63a6e" } } ], From 3563c75964e55a658c3e376f8a917ce5a4064c2f Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 23 Jun 2021 21:12:42 +0200 Subject: [PATCH 07/13] chore(deps): update dependency com.google.cloud:libraries-bom to v20.7.0 (#612) 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) | `20.6.0` -> `20.7.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.7.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.7.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.7.0/compatibility-slim/20.6.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.7.0/confidence-slim/20.6.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-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 48c048b1..0b801832 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 20.6.0 + 20.7.0 pom import From 8b99477dd5e094eb5d1afccd2f56f600764f18eb Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 1 Jul 2021 22:34:37 +0200 Subject: [PATCH 08/13] deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v1.4.0 (#614) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8d1746ec..37e72cb7 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ com.google.cloud google-cloud-shared-dependencies - 1.3.0 + 1.4.0 pom import From 64911e921a65a43e0b1ba8889cebd338d79b05ca Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 2 Jul 2021 20:45:26 +0200 Subject: [PATCH 09/13] deps: update dependency io.grafeas:grafeas to v1.2.3 (#615) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 37e72cb7..6cf33ee9 100644 --- a/pom.xml +++ b/pom.xml @@ -105,7 +105,7 @@ io.grafeas grafeas - 1.2.2 + 1.2.3 From f966165a3c0e729aa81b2d4750f1b23d5a5e395c Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 2 Jul 2021 11:46:57 -0700 Subject: [PATCH 10/13] chore: release gapic-generator-java v1.0.13 (#609) Committer: @miraleung PiperOrigin-RevId: 379784268 Source-Author: Google APIs Source-Date: Wed Jun 16 12:29:58 2021 -0700 Source-Repo: googleapis/googleapis Source-Sha: 551681f25e36b11829e87e580281350461f4f3f5 Source-Link: https://github.com/googleapis/googleapis/commit/551681f25e36b11829e87e580281350461f4f3f5 --- .../java/com/google/containeranalysis/v1/ProjectName.java | 2 +- synth.metadata | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/proto-google-cloud-containeranalysis-v1/src/main/java/com/google/containeranalysis/v1/ProjectName.java b/proto-google-cloud-containeranalysis-v1/src/main/java/com/google/containeranalysis/v1/ProjectName.java index fc8bfff3..69315b69 100644 --- a/proto-google-cloud-containeranalysis-v1/src/main/java/com/google/containeranalysis/v1/ProjectName.java +++ b/proto-google-cloud-containeranalysis-v1/src/main/java/com/google/containeranalysis/v1/ProjectName.java @@ -158,7 +158,7 @@ public Builder setProject(String project) { } private Builder(ProjectName projectName) { - project = projectName.project; + this.project = projectName.project; } public ProjectName build() { diff --git a/synth.metadata b/synth.metadata index 8007dbc2..0de52193 100644 --- a/synth.metadata +++ b/synth.metadata @@ -11,8 +11,8 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "08c4eeb531c01ad031134dca94b18e3f7dd35902", - "internalRef": "378718217" + "sha": "551681f25e36b11829e87e580281350461f4f3f5", + "internalRef": "379784268" } }, { From 1a5263200291b36183df3565cff0d5dfec6ad0e2 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 2 Jul 2021 11:51:15 -0700 Subject: [PATCH 11/13] chore: regenerate README (#613) --- .github/readme/synth.metadata/synth.metadata | 4 ++-- README.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index d334a1b7..9acc70fe 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-containeranalysis.git", - "sha": "79a4f4a2559542a042b98ee26f64ea9ceeb52312" + "sha": "3563c75964e55a658c3e376f8a917ce5a4064c2f" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "41ccd8cd13ec31f4fb839cf8182aea3c7156e19d" + "sha": "9763f20e4b7bb1091082462b2f7970e965d0d414" } } ] diff --git a/README.md b/README.md index 6bed0a2a..164a691f 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud libraries-bom - 20.6.0 + 20.7.0 pom import @@ -45,7 +45,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:20.6.0') +implementation platform('com.google.cloud:libraries-bom:20.7.0') compile 'com.google.cloud:google-cloud-containeranalysis' ``` From a256e5714d05ba992c96b3b83023c1fa5187379b Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 2 Jul 2021 11:51:36 -0700 Subject: [PATCH 12/13] fix: Add `shopt -s nullglob` to dependencies script (#611) This prevents processing the unexpanded glob "**/.flattened-pom.xml" in repos which do not flatten any POMs. Source-Author: dpcollins-google <40498610+dpcollins-google@users.noreply.github.com> Source-Date: Sat Jun 19 18:35:58 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: 87254ac89a9559864c0a245d6b150406439ce3d8 Source-Link: https://github.com/googleapis/synthtool/commit/87254ac89a9559864c0a245d6b150406439ce3d8 --- .kokoro/dependencies.sh | 1 + synth.metadata | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index a7e999d3..9030ba8f 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -14,6 +14,7 @@ # limitations under the License. set -eo pipefail +shopt -s nullglob ## Get the directory of the build script scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) diff --git a/synth.metadata b/synth.metadata index 0de52193..51676da8 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-containeranalysis.git", - "sha": "217f1dbfa5a89ce54521f0320c4941730206552d" + "sha": "688200dd50ab5c4f3eba615aa4286e0af53631c0" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "1c0c698705e668ccb3d68556ae7260f16ce63a6e" + "sha": "87254ac89a9559864c0a245d6b150406439ce3d8" } } ], From c8f014a2db9101a7d1fa8204e4d21bf7e8f39eba Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 2 Jul 2021 11:57:29 -0700 Subject: [PATCH 13/13] chore: release 1.3.5 (#608) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 14 ++++++++++++++ google-cloud-containeranalysis-bom/pom.xml | 12 ++++++------ google-cloud-containeranalysis/pom.xml | 4 ++-- grpc-google-cloud-containeranalysis-v1/pom.xml | 4 ++-- .../pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-containeranalysis-v1/pom.xml | 4 ++-- .../pom.xml | 4 ++-- versions.txt | 10 +++++----- 9 files changed, 41 insertions(+), 27 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4aafdfe0..5f4651f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +### [1.3.5](https://www.github.com/googleapis/java-containeranalysis/compare/v1.3.4...v1.3.5) (2021-07-02) + + +### Bug Fixes + +* Add `shopt -s nullglob` to dependencies script ([#611](https://www.github.com/googleapis/java-containeranalysis/issues/611)) ([a256e57](https://www.github.com/googleapis/java-containeranalysis/commit/a256e5714d05ba992c96b3b83023c1fa5187379b)) +* Update dependencies.sh to not break on mac ([#607](https://www.github.com/googleapis/java-containeranalysis/issues/607)) ([217f1db](https://www.github.com/googleapis/java-containeranalysis/commit/217f1dbfa5a89ce54521f0320c4941730206552d)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v1.4.0 ([#614](https://www.github.com/googleapis/java-containeranalysis/issues/614)) ([8b99477](https://www.github.com/googleapis/java-containeranalysis/commit/8b99477dd5e094eb5d1afccd2f56f600764f18eb)) +* update dependency io.grafeas:grafeas to v1.2.3 ([#615](https://www.github.com/googleapis/java-containeranalysis/issues/615)) ([64911e9](https://www.github.com/googleapis/java-containeranalysis/commit/64911e921a65a43e0b1ba8889cebd338d79b05ca)) + ### [1.3.4](https://www.github.com/googleapis/java-containeranalysis/compare/v1.3.3...v1.3.4) (2021-06-11) diff --git a/google-cloud-containeranalysis-bom/pom.xml b/google-cloud-containeranalysis-bom/pom.xml index ee9089b3..f57df060 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 - 1.3.5-SNAPSHOT + 1.3.5 pom com.google.cloud @@ -64,27 +64,27 @@ com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 1.3.5-SNAPSHOT + 1.3.5 com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.89.5-SNAPSHOT + 0.89.5 com.google.cloud google-cloud-containeranalysis - 1.3.5-SNAPSHOT + 1.3.5 com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 1.3.5-SNAPSHOT + 1.3.5 com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.89.5-SNAPSHOT + 0.89.5 diff --git a/google-cloud-containeranalysis/pom.xml b/google-cloud-containeranalysis/pom.xml index 321090f2..d5e760db 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 - 1.3.5-SNAPSHOT + 1.3.5 jar Google Cloud Container Analysis https://github.com/googleapis/java-containeranalysis @@ -11,7 +11,7 @@ com.google.cloud google-cloud-containeranalysis-parent - 1.3.5-SNAPSHOT + 1.3.5 google-cloud-containeranalysis diff --git a/grpc-google-cloud-containeranalysis-v1/pom.xml b/grpc-google-cloud-containeranalysis-v1/pom.xml index f3d3af55..a43864a3 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 - 1.3.5-SNAPSHOT + 1.3.5 grpc-google-cloud-containeranalysis-v1 GRPC library for grpc-google-cloud-containeranalysis-v1 com.google.cloud google-cloud-containeranalysis-parent - 1.3.5-SNAPSHOT + 1.3.5 diff --git a/grpc-google-cloud-containeranalysis-v1beta1/pom.xml b/grpc-google-cloud-containeranalysis-v1beta1/pom.xml index 9a2ba583..4867c478 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.89.5-SNAPSHOT + 0.89.5 grpc-google-cloud-containeranalysis-v1beta1 GRPC library for grpc-google-cloud-containeranalysis-v1beta1 com.google.cloud google-cloud-containeranalysis-parent - 1.3.5-SNAPSHOT + 1.3.5 diff --git a/pom.xml b/pom.xml index 6cf33ee9..235637ad 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-containeranalysis-parent pom - 1.3.5-SNAPSHOT + 1.3.5 Google Cloud Container Analysis Parent https://github.com/googleapis/java-containeranalysis @@ -70,27 +70,27 @@ com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 1.3.5-SNAPSHOT + 1.3.5 com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.89.5-SNAPSHOT + 0.89.5 com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.89.5-SNAPSHOT + 0.89.5 com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 1.3.5-SNAPSHOT + 1.3.5 com.google.cloud google-cloud-containeranalysis - 1.3.5-SNAPSHOT + 1.3.5 diff --git a/proto-google-cloud-containeranalysis-v1/pom.xml b/proto-google-cloud-containeranalysis-v1/pom.xml index 5b8a72e8..2f6e28cd 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 - 1.3.5-SNAPSHOT + 1.3.5 proto-google-cloud-containeranalysis-v1 PROTO library for proto-google-cloud-containeranalysis-v1 com.google.cloud google-cloud-containeranalysis-parent - 1.3.5-SNAPSHOT + 1.3.5 diff --git a/proto-google-cloud-containeranalysis-v1beta1/pom.xml b/proto-google-cloud-containeranalysis-v1beta1/pom.xml index fed2a6e2..d98dc98a 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.89.5-SNAPSHOT + 0.89.5 proto-google-cloud-containeranalysis-v1beta1 PROTO library for proto-google-cloud-containeranalysis-v1beta1 com.google.cloud google-cloud-containeranalysis-parent - 1.3.5-SNAPSHOT + 1.3.5 diff --git a/versions.txt b/versions.txt index d570b29e..39edd3aa 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -proto-google-cloud-containeranalysis-v1:1.3.4:1.3.5-SNAPSHOT -proto-google-cloud-containeranalysis-v1beta1:0.89.4:0.89.5-SNAPSHOT -grpc-google-cloud-containeranalysis-v1beta1:0.89.4:0.89.5-SNAPSHOT -grpc-google-cloud-containeranalysis-v1:1.3.4:1.3.5-SNAPSHOT -google-cloud-containeranalysis:1.3.4:1.3.5-SNAPSHOT +proto-google-cloud-containeranalysis-v1:1.3.5:1.3.5 +proto-google-cloud-containeranalysis-v1beta1:0.89.5:0.89.5 +grpc-google-cloud-containeranalysis-v1beta1:0.89.5:0.89.5 +grpc-google-cloud-containeranalysis-v1:1.3.5:1.3.5 +google-cloud-containeranalysis:1.3.5:1.3.5