From 0ae2841d7ce2885d041795c58a38d2d3973c2e5a Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 16 Jun 2021 16:02:36 -0700 Subject: [PATCH] fix: Update dependencies.sh to not break on mac (#384) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/f853e0b6-9a6b-4346-9a07-ff7c7ec6f858/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 adb93e57..3f49dab7 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-dependencies.git", - "sha": "4b4dc836196e6c4d08725f201aa0f14fe145e3b3" + "sha": "44961532f621b0ab19e9e7feebb7d588aef5d423" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "8eae0234a16b26c2ff616d305dbd9786c8b10a47" + "sha": "8f76a885deaaf2fe234daeba4a8cc4d1b3de8086" } } ], @@ -79,6 +79,7 @@ "CODE_OF_CONDUCT.md", "CONTRIBUTING.md", "LICENSE", + "SECURITY.md", "codecov.yaml", "java.header", "license-checks.xml"