Skip to content

Commit 5877a06

Browse files
fix: Update dependencies.sh to not break on mac (#559)
Source-Author: dpcollins-google <[email protected]> Source-Date: Tue Jun 15 14:06:42 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: 8f76a885deaaf2fe234daeba4a8cc4d1b3de8086 Source-Link: googleapis/synthtool@8f76a88
1 parent 8916fd6 commit 5877a06

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

.kokoro/dependencies.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ function completenessCheck() {
4646
# This is stripped from the output as it is not present in the flattened pom.
4747
# Only dependencies with 'compile' or 'runtime' scope are included from original dependency list.
4848
msg "Generating dependency list using original pom..."
49-
mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// >.org-list.txt
49+
mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e 's/ --.*//' >.org-list.txt
5050

5151
# Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes)
5252
msg "Generating dependency list using flattened pom..."
@@ -70,7 +70,7 @@ function completenessCheck() {
7070
set +e
7171

7272
error_count=0
73-
for path in $(find -name ".flattened-pom.xml")
73+
for path in **/.flattened-pom.xml
7474
do
7575
# Check flattened pom in each dir that contains it for completeness
7676
dir=$(dirname "$path")

synth.metadata

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"git": {
55
"name": ".",
66
"remote": "https://github.com/googleapis/java-logging.git",
7-
"sha": "80bcc53f99a5332966fca266864e3497de60a371"
7+
"sha": "8916fd626f102215bb865854619818cafd9ccd6e"
88
}
99
},
1010
{
@@ -19,7 +19,7 @@
1919
"git": {
2020
"name": "synthtool",
2121
"remote": "https://github.com/googleapis/synthtool.git",
22-
"sha": "8eae0234a16b26c2ff616d305dbd9786c8b10a47"
22+
"sha": "8f76a885deaaf2fe234daeba4a8cc4d1b3de8086"
2323
}
2424
}
2525
],
@@ -98,6 +98,7 @@
9898
".kokoro/trampoline.sh",
9999
"CODE_OF_CONDUCT.md",
100100
"LICENSE",
101+
"SECURITY.md",
101102
"codecov.yaml",
102103
"google-cloud-logging/src/main/java/com/google/cloud/logging/v2/ConfigClient.java",
103104
"google-cloud-logging/src/main/java/com/google/cloud/logging/v2/ConfigSettings.java",

0 commit comments

Comments
 (0)