build: update dependencies check to only check for runtime and compile scopes (#321)

yoshi-automation · web-flow · commit f2ad2285d4e3 · 2020-08-07T10:37:49.000-07:00
* 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
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
@@ -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..."
@@ -85,4 +86,4 @@ then
 else
   msg "Errors found. See log statements above."
   exit 1
-fi
+fi
diff --git a/synth.metadata b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-firestore.git",
-        "sha": "39965489cbc836af573e500d57007c88241d7eb6"
+        "sha": "299bf716d5981ffc72675edb081213c8dcac5b08"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "4530cc6ff080ef8aca258c1ec92c4db10a1bbfb4"
+        "sha": "f8823dec98277a9516f2fb6fae9f58b3a59a23e1"
       }
     }
   ],

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`"git": {`
`5`	`5`	`"name": ".",`
`6`	`6`	`"remote": "https://github.com/googleapis/java-firestore.git",`
`7`		`- "sha": "39965489cbc836af573e500d57007c88241d7eb6"`
	`7`	`+ "sha": "299bf716d5981ffc72675edb081213c8dcac5b08"`
`8`	`8`	`}`
`9`	`9`	`},`
`10`	`10`	`{`
`@@ -19,7 +19,7 @@`
`19`	`19`	`"git": {`
`20`	`20`	`"name": "synthtool",`
`21`	`21`	`"remote": "https://github.com/googleapis/synthtool.git",`
`22`		`- "sha": "4530cc6ff080ef8aca258c1ec92c4db10a1bbfb4"`
	`22`	`+ "sha": "f8823dec98277a9516f2fb6fae9f58b3a59a23e1"`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`	`],`