From 0ebad0a2c92f00126d9c00aec1af3c73333c3a31 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 16 Jun 2021 14:09:02 -0700 Subject: [PATCH] fix: Update dependencies.sh to not break on mac (#718) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/852b4d4a-b2e4-4281-b35d-519aa48bf212/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 | 7 +++---- 2 files changed, 5 insertions(+), 6 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 95f140fbc..927fb80a9 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-pubsub.git", - "sha": "d6cc2d2c42aa328b20a98b43cd72b5b36faa04b3" + "sha": "cf8e83d6ab07da3e37b346c124529bc89226c277" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "8eae0234a16b26c2ff616d305dbd9786c8b10a47" + "sha": "8f76a885deaaf2fe234daeba4a8cc4d1b3de8086" } } ], @@ -45,13 +45,11 @@ ".github/readme/synth.py", ".github/release-please.yml", ".github/snippet-bot.yml", - ".github/sync-repo-settings.yaml", ".github/trusted-contribution.yml", ".github/workflows/approve-readme.yaml", ".github/workflows/auto-release.yaml", ".github/workflows/ci.yaml", ".kokoro/build.bat", - ".kokoro/build.sh", ".kokoro/coerce_logs.sh", ".kokoro/common.cfg", ".kokoro/common.sh", @@ -100,6 +98,7 @@ "CODE_OF_CONDUCT.md", "CONTRIBUTING.md", "LICENSE", + "SECURITY.md", "codecov.yaml", "google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SchemaServiceClient.java", "google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SchemaServiceSettings.java",