ci(java): run dependency test on Java 8 and 11 (#185)

yoshi-automation · web-flow · commit 4c40b17989a6 · 2020-07-09T14:56:21.000-04:00
Redo fix in #633 with proper jinja templating format Source-Author: Jeff Ching <chingor@google.com> Source-Date: Fri Jun 19 16:52:15 2020 -0700 Source-Repo: googleapis/synthtool Source-Sha: 4f2c9f752a94042472fc03c5bd9e06e89817d2bd Source-Link: googleapis/synthtool@4f2c9f7
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -36,11 +36,14 @@ jobs:
         JOB_TYPE: test
   dependencies:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [8, 11]
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-java@v1
       with:
-        java-version: 8
+        java-version: ${{matrix.java}}
     - run: java -version
     - run: .kokoro/dependencies.sh
   linkage-monitor:
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
@@ -41,8 +41,10 @@ echo "****************** DEPENDENCY LIST COMPLETENESS CHECK *******************"
 ## Run dependency list completeness check
 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.
   msg "Generating dependency list using original pom..."
-  mvn dependency:list -f pom.xml -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' | grep -v ':test$' >.org-list.txt
+  mvn dependency:list -f pom.xml -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// | grep -v ':test$' >.org-list.txt
 
   # Output dep list generated using the flattened pom (test scope deps are ommitted)
   msg "Generating dependency list using flattened pom..."
diff --git a/synth.metadata b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "f1874f1b2745724ccc2345f35b65fb577f53683e"
+        "sha": "4de5241268ee97a88bd6a066db97177b8b7f5b07"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "c4f3059c27591eb24d6942a0e357ec94c80459f2"
+        "sha": "4f2c9f752a94042472fc03c5bd9e06e89817d2bd"
       }
     }
   ],

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-datastore.git",`
`7`		`- "sha": "f1874f1b2745724ccc2345f35b65fb577f53683e"`
	`7`	`+ "sha": "4de5241268ee97a88bd6a066db97177b8b7f5b07"`
`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": "c4f3059c27591eb24d6942a0e357ec94c80459f2"`
	`22`	`+ "sha": "4f2c9f752a94042472fc03c5bd9e06e89817d2bd"`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`	`],`