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

yoshi-automation · web-flow · commit 89dc4740e51f · 2020-08-07T17:50:03.000Z
This PR was generated using Autosynth. 🌈 Synth log will be available here: https://source.cloud.google.com/results/invocations/b24e7806-61f7-4799-8de0-fc5993ab89fb/targets - [ ] To automatically regenerate this PR, check this box. 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-pubsub.git",
-        "sha": "cf63e49a3529897eba074346741dd3f04e64e8c2"
+        "sha": "3e726d0179d0f7ea435d1d7047a6c9147d4fe741"
       }
     },
     {
@@ -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-pubsub.git",`
`7`		`- "sha": "cf63e49a3529897eba074346741dd3f04e64e8c2"`
	`7`	`+ "sha": "3e726d0179d0f7ea435d1d7047a6c9147d4fe741"`
`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`	`],`