diff --git a/java-resourcemanager/.github/workflows/ci.yaml b/java-resourcemanager/.github/workflows/ci.yaml index 445b4bf82ffd..683022075665 100644 --- a/java-resourcemanager/.github/workflows/ci.yaml +++ b/java-resourcemanager/.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/java-resourcemanager/.kokoro/dependencies.sh b/java-resourcemanager/.kokoro/dependencies.sh index cf3bb4347e01..cee4f11e7547 100755 --- a/java-resourcemanager/.kokoro/dependencies.sh +++ b/java-resourcemanager/.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/java-resourcemanager/synth.metadata b/java-resourcemanager/synth.metadata index 6f0fdb1e5c0c..65580c5bbf26 100644 --- a/java-resourcemanager/synth.metadata +++ b/java-resourcemanager/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-resourcemanager.git", - "sha": "bf27303c10e43f98054c0c95dc2a774e4254c7fb" + "sha": "65b4883b9311dc91fd7afcc8443ecc9dc23128fe" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "c4f3059c27591eb24d6942a0e357ec94c80459f2" + "sha": "4f2c9f752a94042472fc03c5bd9e06e89817d2bd" } } ]