From 930bc83640137025ce53eda046ca3e691d4a77d5 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Tue, 15 Jun 2021 14:48:52 -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 59d2aafc7..a7e999d33 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 f7f4fdae8..fc8cf38db 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/google-api-java-client.git", - "sha": "56f5b8be0a60cb1cf0b279743d85ef57d9aa46b6" + "sha": "4731adfab40468b899afc4cafe236631285c4846" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "8eae0234a16b26c2ff616d305dbd9786c8b10a47" + "sha": "8f76a885deaaf2fe234daeba4a8cc4d1b3de8086" } } ], @@ -80,6 +80,7 @@ "CODE_OF_CONDUCT.md", "CONTRIBUTING.md", "LICENSE", + "SECURITY.md", "codecov.yaml", "samples/install-without-bom/pom.xml", "samples/pom.xml",