This repository was archived by the owner on Oct 2, 2023. It is now read-only.
File tree Expand file tree Collapse file tree 4 files changed +13
-5
lines changed Expand file tree Collapse file tree 4 files changed +13
-5
lines changed Original file line number Diff line number Diff line change @@ -36,11 +36,14 @@ jobs:
3636 JOB_TYPE : test
3737 dependencies :
3838 runs-on : ubuntu-latest
39+ strategy :
40+ matrix :
41+ java : [8, 11]
3942 steps :
4043 - uses : actions/checkout@v2
4144 - uses : actions/setup-java@v1
4245 with :
43- java-version : 8
46+ java-version : ${{matrix.java}}
4447 - run : java -version
4548 - run : .kokoro/dependencies.sh
4649 linkage-monitor :
Original file line number Diff line number Diff line change @@ -41,8 +41,10 @@ echo "****************** DEPENDENCY LIST COMPLETENESS CHECK *******************"
4141# # Run dependency list completeness check
4242function completenessCheck() {
4343 # Output dep list with compile scope generated using the original pom
44+ # Running mvn dependency:list on Java versions that support modules will also include the module of the dependency.
45+ # This is stripped from the output as it is not present in the flattened pom.
4446 msg " Generating dependency list using original pom..."
45- mvn dependency:list -f pom.xml -Dsort=true | grep ' \[INFO] .*:.*:.*:.*:.*' | grep -v ' :test$' > .org-list.txt
47+ mvn dependency:list -f pom.xml -Dsort=true | grep ' \[INFO] .*:.*:.*:.*:.*' | sed -e s/ \\ s-- \\ smodule. * // | grep -v ' :test$' > .org-list.txt
4648
4749 # Output dep list generated using the flattened pom (test scope deps are ommitted)
4850 msg " Generating dependency list using flattened pom..."
Original file line number Diff line number Diff line change 107107 <groupId >org.apache.maven.plugins</groupId >
108108 <artifactId >maven-dependency-plugin</artifactId >
109109 <configuration >
110- <ignoredUnusedDeclaredDependencies >org.objenesis:objenesis</ignoredUnusedDeclaredDependencies >
110+ <ignoredUnusedDeclaredDependencies >
111+ <ignoredUnusedDeclaredDependency >org.objenesis:objenesis</ignoredUnusedDeclaredDependency >
112+ <ignoredUnusedDeclaredDependency >javax.annotation:javax.annotation-api</ignoredUnusedDeclaredDependency >
113+ </ignoredUnusedDeclaredDependencies >
111114 </configuration >
112115 </plugin >
113116 </plugins >
Original file line number Diff line number Diff line change 44 "git": {
55 "name": ".",
66 "remote": "https://github.com/googleapis/java-monitoring.git",
7- "sha": "7eb7f204268788738032ef5590036b04dd8eb212 "
7+ "sha": "fb6d3f8459fecbeb7d25b5889366350c2d65f983 "
88 }
99 },
1010 {
1919 "git": {
2020 "name": "synthtool",
2121 "remote": "https://github.com/googleapis/synthtool.git",
22- "sha": "c4f3059c27591eb24d6942a0e357ec94c80459f2 "
22+ "sha": "4f2c9f752a94042472fc03c5bd9e06e89817d2bd "
2323 }
2424 }
2525 ],
You can’t perform that action at this time.
0 commit comments