From 4c2141580d46edc3011251216e88452775c1c218 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Wed, 16 Jun 2021 02:20:55 -0700 Subject: [PATCH] fix: Update dependencies.sh to not break on mac Source-Author: dpcollins-google <40498610+dpcollins-google@users.noreply.github.com> Source-Date: Tue Jun 15 14:06:42 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: 8f76a885deaaf2fe234daeba4a8cc4d1b3de8086 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 3b3db5c0..918c7e21 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-websecurityscanner.git", - "sha": "64396569ac3c60298c922aca075760e2e9784a5a" + "sha": "896281f158c7498fd05f20b18e28d4d356a2bcca" } }, { @@ -35,7 +35,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "8eae0234a16b26c2ff616d305dbd9786c8b10a47" + "sha": "8f76a885deaaf2fe234daeba4a8cc4d1b3de8086" } } ], @@ -135,6 +135,7 @@ "CODE_OF_CONDUCT.md", "CONTRIBUTING.md", "LICENSE", + "SECURITY.md", "codecov.yaml", "google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1/WebSecurityScannerClient.java", "google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1/WebSecurityScannerSettings.java",