Skip to content

Commit 8f4b199

Browse files
fix: Update dependencies.sh to not break on mac (#694)
This PR was generated using Autosynth. 🌈 Synth log will be available here: https://source.cloud.google.com/results/invocations/220dab45-8b1a-4e3a-8a9a-c65fb6051a05/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) Source-Link: googleapis/synthtool@09c59c2 Source-Link: googleapis/synthtool@87254ac Source-Link: googleapis/synthtool@1c0c698 Source-Link: googleapis/synthtool@8f76a88 fix: Add shopt -s nullglob to dependencies script chore: minimize noise from build scripts chore: remove All rights reserved clause from java.header
1 parent 0946a17 commit 8f4b199

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

.kokoro/coerce_logs.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ job=$(basename ${KOKORO_JOB_NAME})
2828
echo "coercing sponge logs..."
2929
for xml in `find . -name *-sponge_log.xml`
3030
do
31-
echo "processing ${xml}"
3231
class=$(basename ${xml} | cut -d- -f2)
3332
dir=$(dirname ${xml})/${job}/${class}
3433
text=$(dirname ${xml})/${class}-sponge_log.txt

.kokoro/dependencies.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
# limitations under the License.
1515

1616
set -eo pipefail
17+
shopt -s nullglob
1718

1819
## Get the directory of the build script
1920
scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
@@ -46,7 +47,7 @@ function completenessCheck() {
4647
# This is stripped from the output as it is not present in the flattened pom.
4748
# Only dependencies with 'compile' or 'runtime' scope are included from original dependency list.
4849
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
50+
mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e 's/ --.*//' >.org-list.txt
5051

5152
# Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes)
5253
msg "Generating dependency list using flattened pom..."
@@ -70,7 +71,7 @@ function completenessCheck() {
7071
set +e
7172

7273
error_count=0
73-
for path in $(find -name ".flattened-pom.xml")
74+
for path in **/.flattened-pom.xml
7475
do
7576
# Check flattened pom in each dir that contains it for completeness
7677
dir=$(dirname "$path")

java.header

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
^/\*$
2-
^ \* Copyright \d\d\d\d,? Google (Inc\.|LLC)( All [rR]ights [rR]eserved\.)?$
2+
^ \* Copyright \d\d\d\d,? Google (Inc\.|LLC)$
33
^ \*$
44
^ \* Licensed under the Apache License, Version 2\.0 \(the "License"\);$
55
^ \* you may not use this file except in compliance with the License\.$

synth.metadata

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"git": {
55
"name": ".",
66
"remote": "https://github.com/googleapis/java-firestore.git",
7-
"sha": "41a00782d1ca14e8ce80c3083b1ef01057dbac5b"
7+
"sha": "402ce4732b319f82c25c783fafbffc30d37dd3c7"
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": "09c59c20a4bf0daed1665af59035ff240fe356df"
2323
}
2424
}
2525
],
@@ -115,6 +115,7 @@
115115
"CODE_OF_CONDUCT.md",
116116
"CONTRIBUTING.md",
117117
"LICENSE",
118+
"SECURITY.md",
118119
"codecov.yaml",
119120
"google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/FirestoreAdminClient.java",
120121
"google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/FirestoreAdminSettings.java",

0 commit comments

Comments
 (0)