From 97940b3fd96e343df3985630398811f3c417afcc Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot <yoshi-automation@google.com>
Date: Thu, 24 Jun 2021 05:55:18 -0700
Subject: [PATCH] fix: Update dependencies.sh to not break on mac (#1830)

* 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

* chore: minimize noise from build scripts

This should limit the amount of scrolling client devs have to do when debugging a test failure

Co-authored-by: Elliotte Rusty Harold <elharo@users.noreply.github.com>
Co-authored-by: Neenu Shaji <Neenu1995@users.noreply.github.com>

Source-Author: Igor Bernstein <igorbernstein@google.com>
Source-Date: Fri Jun 18 17:28:07 2021 -0400
Source-Repo: googleapis/synthtool
Source-Sha: 1c0c698705e668ccb3d68556ae7260f16ce63a6e
Source-Link: https://github.com/googleapis/synthtool/commit/1c0c698705e668ccb3d68556ae7260f16ce63a6e

* fix: Add `shopt -s nullglob` to dependencies script

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/coerce_logs.sh  | 1 -
 .kokoro/dependencies.sh | 5 +++--
 synth.metadata          | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.kokoro/coerce_logs.sh b/.kokoro/coerce_logs.sh
index 5cf7ba49e..46edbf7f2 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/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index 59d2aafc7..9030ba8f9 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]}"))
@@ -46,7 +47,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 +71,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..d4287aee8 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": "d979c5bfdeaf8bd85cd7295abf5695dc6095bad6"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "8eae0234a16b26c2ff616d305dbd9786c8b10a47"
+        "sha": "87254ac89a9559864c0a245d6b150406439ce3d8"
       }
     }
   ],
@@ -80,6 +80,7 @@
     "CODE_OF_CONDUCT.md",
     "CONTRIBUTING.md",
     "LICENSE",
+    "SECURITY.md",
     "codecov.yaml",
     "samples/install-without-bom/pom.xml",
     "samples/pom.xml",