[shiro] 01/01: (build) Update github CI to java@v2 and two JDK dists.

[bm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bmarwell pushed a commit to branch update-github-ci
in repository https://gitbox.apache.org/repos/asf/shiro.git

commit 019361eb20c0ec4d3f97a4b80ecb5cbc932356be
Author: Benjamin Marwell <bm...@apache.org>
AuthorDate: Wed May 12 09:18:20 2021 +0200

    (build) Update github CI to java@v2 and two JDK dists.
---
 .github/workflows/maven.yml | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index a5be92a..6147f66 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -25,7 +25,20 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, windows-latest, macOS-latest ]
-        java: [ 8, 11, 15, 16-ea ]
+        java:
+          - version: 8
+            dist: adopt
+          - version: 8
+            dist: zulu
+          - version: 11
+            dist: adopt
+          - version: 11
+            dist: zulu
+          - version: 16
+            dist: adopt
+          - version: 16
+            dist: zulu
+
       fail-fast: false
 
     runs-on: ${{ matrix.os }}
@@ -44,9 +57,10 @@ jobs:
             maven-${{ matrix.os }}-
 
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
-          java-version: ${{ matrix.java }}
+          distribution: ${{ matrix.java.dist }}
+          java-version: ${{ matrix.java.version }}
 
       - name: License Check
         run: mvn apache-rat:check "-Drat.consoleOutput"