Skip to content

Commit

Permalink
build: update dependencies check to only check for runtime and compil…
Browse files Browse the repository at this point in the history
…e scopes (googleapis#213)

This PR was generated using Autosynth. 🌈

Synth log will be available here:
https://source.cloud.google.com/results/invocations/4f159194-de9c-4c80-934e-eb32cd08c411/targets

- [ ] To automatically regenerate this PR, check this box.

Source-Link: googleapis/synthtool@f8823de
  • Loading branch information
yoshi-automation authored Aug 10, 2020
1 parent 7ce8ce2 commit fdba5da
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
9 changes: 5 additions & 4 deletions java-resourcemanager/.kokoro/dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,13 @@ function completenessCheck() {
# Output dep list with compile scope generated using the original pom
# Running mvn dependency:list on Java versions that support modules will also include the module of the dependency.
# 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 -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// | grep -v ':test$' >.org-list.txt
mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// >.org-list.txt

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

# Compare two dependency lists
msg "Comparing dependency lists..."
Expand Down Expand Up @@ -85,4 +86,4 @@ then
else
msg "Errors found. See log statements above."
exit 1
fi
fi
4 changes: 2 additions & 2 deletions java-resourcemanager/synth.metadata
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
"git": {
"name": ".",
"remote": "https://github.com/googleapis/java-resourcemanager.git",
"sha": "c16b9cf92f223a1de4a7e436c6b196d7610b25f4"
"sha": "36522d355f4191c966b3b43f2b9a2be2c15e80d7"
}
},
{
"git": {
"name": "synthtool",
"remote": "https://github.com/googleapis/synthtool.git",
"sha": "4530cc6ff080ef8aca258c1ec92c4db10a1bbfb4"
"sha": "f8823dec98277a9516f2fb6fae9f58b3a59a23e1"
}
}
],
Expand Down

0 comments on commit fdba5da

Please sign in to comment.