Skip to content

Commit

Permalink
fix: Update dependencies.sh to not break on mac (#456)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
yoshi-automation authored Jun 16, 2021
1 parent b7c48c3 commit 1e514c0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .kokoro/dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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..."
Expand All @@ -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")
Expand Down
5 changes: 3 additions & 2 deletions synth.metadata
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"git": {
"name": ".",
"remote": "https://github.com/googleapis/java-datastore.git",
"sha": "7aecb01f6df96df0e98fb4d0bd1a1201a5df1171"
"sha": "b7c48c3af445119f6e0bc839bf75943a1716719e"
}
},
{
Expand All @@ -19,7 +19,7 @@
"git": {
"name": "synthtool",
"remote": "https://github.com/googleapis/synthtool.git",
"sha": "8eae0234a16b26c2ff616d305dbd9786c8b10a47"
"sha": "8f76a885deaaf2fe234daeba4a8cc4d1b3de8086"
}
}
],
Expand Down Expand Up @@ -101,6 +101,7 @@
"CODE_OF_CONDUCT.md",
"CONTRIBUTING.md",
"LICENSE",
"SECURITY.md",
"codecov.yaml",
"java.header",
"license-checks.xml",
Expand Down

0 comments on commit 1e514c0

Please sign in to comment.