Skip to content

Commit f2ad228

Browse files
build: update dependencies check to only check for runtime and compile scopes (#321)
* change:Updated dependencies check to only use runtime & compile scope * Update dependencies.sh * feat: update dependencies check to only check for runtime and compile scopes Co-authored-by: Saleh Mostafa <salehmostafa@google.com> Co-authored-by: Jeffrey Rennie <rennie@google.com> Source-Author: salehsquared <salehmostafamain@gmail.com> Source-Date: Thu Aug 6 13:01:02 2020 -0400 Source-Repo: googleapis/synthtool Source-Sha: f8823dec98277a9516f2fb6fae9f58b3a59a23e1 Source-Link: googleapis/synthtool@f8823de
1 parent 299bf71 commit f2ad228

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

.kokoro/dependencies.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,13 @@ function completenessCheck() {
4343
# Output dep list with compile scope generated using the original pom
4444
# Running mvn dependency:list on Java versions that support modules will also include the module of the dependency.
4545
# This is stripped from the output as it is not present in the flattened pom.
46+
# Only dependencies with 'compile' or 'runtime' scope are included from original dependency list.
4647
msg "Generating dependency list using original pom..."
47-
mvn dependency:list -f pom.xml -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// | grep -v ':test$' >.org-list.txt
48+
mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// >.org-list.txt
4849

49-
# Output dep list generated using the flattened pom (test scope deps are ommitted)
50+
# Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes)
5051
msg "Generating dependency list using flattened pom..."
51-
mvn dependency:list -f .flattened-pom.xml -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' >.new-list.txt
52+
mvn dependency:list -f .flattened-pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' >.new-list.txt
5253

5354
# Compare two dependency lists
5455
msg "Comparing dependency lists..."
@@ -85,4 +86,4 @@ then
8586
else
8687
msg "Errors found. See log statements above."
8788
exit 1
88-
fi
89+
fi

synth.metadata

Lines changed: 2 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": "39965489cbc836af573e500d57007c88241d7eb6"
7+
"sha": "299bf716d5981ffc72675edb081213c8dcac5b08"
88
}
99
},
1010
{
@@ -19,7 +19,7 @@
1919
"git": {
2020
"name": "synthtool",
2121
"remote": "https://github.com/googleapis/synthtool.git",
22-
"sha": "4530cc6ff080ef8aca258c1ec92c4db10a1bbfb4"
22+
"sha": "f8823dec98277a9516f2fb6fae9f58b3a59a23e1"
2323
}
2424
}
2525
],

0 commit comments

Comments
 (0)