fix: Update dependencies.sh to not break on mac

yoshi-automation · yoshi-automation · commit 217dd6e29f99 · 2021-06-15T14:51:06.000-07:00
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: googleapis/synthtool@8f76a88
diff --git 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
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/google-http-java-client.git",
-        "sha": "e69275ecaa4d85372ebc253dd415a02ba63075be"
+        "sha": "4e3b3c3cebeb8439e729a9f99b58e5fc5e13e2cf"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "8eae0234a16b26c2ff616d305dbd9786c8b10a47"
+        "sha": "8f76a885deaaf2fe234daeba4a8cc4d1b3de8086"
       }
     }
   ],
@@ -81,6 +81,7 @@
     "CODE_OF_CONDUCT.md",
     "CONTRIBUTING.md",
     "LICENSE",
+    "SECURITY.md",
     "codecov.yaml",
     "renovate.json",
     "samples/install-without-bom/pom.xml",

Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,14 @@`
`4`	`4`	`"git": {`
`5`	`5`	`"name": ".",`
`6`	`6`	`"remote": "https://github.com/googleapis/google-http-java-client.git",`
`7`		`- "sha": "e69275ecaa4d85372ebc253dd415a02ba63075be"`
	`7`	`+ "sha": "4e3b3c3cebeb8439e729a9f99b58e5fc5e13e2cf"`
`8`	`8`	`}`
`9`	`9`	`},`
`10`	`10`	`{`
`11`	`11`	`"git": {`
`12`	`12`	`"name": "synthtool",`
`13`	`13`	`"remote": "https://github.com/googleapis/synthtool.git",`
`14`		`- "sha": "8eae0234a16b26c2ff616d305dbd9786c8b10a47"`
	`14`	`+ "sha": "8f76a885deaaf2fe234daeba4a8cc4d1b3de8086"`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`	`],`
`@@ -81,6 +81,7 @@`
`81`	`81`	`"CODE_OF_CONDUCT.md",`
`82`	`82`	`"CONTRIBUTING.md",`
`83`	`83`	`"LICENSE",`
	`84`	`+ "SECURITY.md",`
`84`	`85`	`"codecov.yaml",`
`85`	`86`	`"renovate.json",`
`86`	`87`	`"samples/install-without-bom/pom.xml",`