Upgrade to setup-java v2.

Signed-off-by: Nikhil Nanivadekar <nikhil.nanivadekar@bnymellon.com>
eclipse · May 14, 2021 · 1c7b99c · 1c7b99c
1 parent 0050900
commit 1c7b99c
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 11 deletions.
diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml
@@ -21,8 +21,9 @@ jobs:
       - name: Set Maven Wrapper
         run: mvn -N io.takari:maven:0.7.7:wrapper -Dmaven=3.6.3
       - name: Set JDK ${{ matrix.java-version }}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: 'zulu'
           java-version: ${{ matrix.java-version }}
       - name: Acceptance Tests
         run: ./mvnw install --projects acceptance-tests --also-make --activate-profiles all --no-transfer-progress

diff --git a/.github/workflows/checkstyle.yml b/.github/workflows/checkstyle.yml
@@ -21,8 +21,9 @@ jobs:
       - name: Set Maven Wrapper
         run: mvn -N io.takari:maven:0.7.7:wrapper -Dmaven=3.6.3
       - name: Set JDK ${{ matrix.java-version }}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: 'zulu'
           java-version: ${{ matrix.java-version }}
       - name: Checkstyle
         run: ./mvnw install checkstyle:check --activate-profiles all -DskipTests=true --no-transfer-progress

diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml
@@ -24,8 +24,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set JDK ${{ matrix.java-version }}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: 'zulu'
           java-version: ${{ matrix.java-version }}
       - name: Generate Coverage Report
         run: mvn clean verify

diff --git a/.github/workflows/earlyaccess-javadoc.yml b/.github/workflows/earlyaccess-javadoc.yml
@@ -24,10 +24,19 @@ jobs:
         id: download-jdk
         with:
           feature: ${{ matrix.java-version }}
+      - name: 'Print outputs'
+        shell: bash
+        run: |
+          echo 'Outputs'
+          echo "steps.download-jdk.outputs.file    = ${{ steps.download-jdk.outputs.file }}"
+          echo "steps.download-jdk.outputs.version = ${{ steps.download-jdk.outputs.version }}"
+          echo "env.JDK_FILE                       = ${{ env.JDK_FILE }}"
+          echo "env.JDK_VERSION                    = ${{ env.JDK_VERSION }}"
       - name: 'Set up JDK'
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
           java-version: ${{ steps.download-jdk.outputs.version }}
+          distribution: jdkfile
           jdkFile: "${{ steps.download-jdk.outputs.file }}"
       - name: Set Maven Wrapper
         run: mvn -N io.takari:maven:0.7.7:wrapper -Dmaven=3.6.3

diff --git a/.github/workflows/earlyaccess-unit.yml b/.github/workflows/earlyaccess-unit.yml
@@ -24,10 +24,19 @@ jobs:
         id: download-jdk
         with:
           feature: ${{ matrix.java-version }}
+      - name: 'Print outputs'
+        shell: bash
+        run: |
+          echo 'Outputs'
+          echo "steps.download-jdk.outputs.file    = ${{ steps.download-jdk.outputs.file }}"
+          echo "steps.download-jdk.outputs.version = ${{ steps.download-jdk.outputs.version }}"
+          echo "env.JDK_FILE                       = ${{ env.JDK_FILE }}"
+          echo "env.JDK_VERSION                    = ${{ env.JDK_VERSION }}"
       - name: 'Set up JDK'
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
           java-version: ${{ steps.download-jdk.outputs.version }}
+          distribution: jdkfile
           jdkFile: "${{ steps.download-jdk.outputs.file }}"
       - name: Set Maven Wrapper
         run: mvn -N io.takari:maven:0.7.7:wrapper -Dmaven=3.6.3

diff --git a/.github/workflows/findbugs.yml b/.github/workflows/findbugs.yml
@@ -21,8 +21,9 @@ jobs:
       - name: Set Maven Wrapper
         run: mvn -N io.takari:maven:0.7.7:wrapper -Dmaven=3.6.3
       - name: Set JDK ${{ matrix.java-version }}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: 'zulu'
           java-version: ${{ matrix.java-version }}
       - name: Findbugs
         run: ./mvnw install findbugs:check --projects '!scala-unit-tests,!jmh-scala-tests,!jmh-tests,!jcstress-tests,!p2-repository' --activate-profiles all -DskipTests=true --no-transfer-progress

diff --git a/.github/workflows/javadoc.yml b/.github/workflows/javadoc.yml
@@ -21,8 +21,9 @@ jobs:
       - name: Set Maven Wrapper
         run: mvn -N io.takari:maven:0.7.7:wrapper -Dmaven=3.6.3
       - name: Set JDK ${{ matrix.java-version }}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: 'zulu'
           java-version: ${{ matrix.java-version }}
       - name: JavaDoc
         run: ./mvnw -Dsurefire.useFile=false -DskipTests -Denforcer.skip=true clean install javadoc:aggregate -pl '!unit-tests,!serialization-tests,!jcstress-tests,!junit-trait-runner,!unit-tests-java8,!test-coverage,!p2-repository,!org.eclipse.collections:org.eclipse.collections' --no-transfer-progress

diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml
@@ -25,8 +25,9 @@ jobs:
       - name: Git Checkout
         uses: actions/checkout@v2
       - name: Set JDK ${{ matrix.java-version }}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: 'zulu'
           java-version: ${{ matrix.java-version }}
       - name: Enable Maven Cache
         uses: actions/cache@v2.1.5

diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
@@ -21,8 +21,9 @@ jobs:
       - name: Set Maven Wrapper
         run: mvn -N io.takari:maven:0.7.7:wrapper -Dmaven=3.6.3
       - name: Set JDK ${{ matrix.java-version }}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: 'zulu'
           java-version: ${{ matrix.java-version }}
       - name: Performance Tests
         run: ./mvnw install --projects performance-tests --also-make --activate-profiles all -DskipTests=true --no-transfer-progress

diff --git a/.github/workflows/unit-no-p2.yml b/.github/workflows/unit-no-p2.yml
@@ -24,8 +24,9 @@ jobs:
       - name: Set Maven Wrapper
         run: mvn -N io.takari:maven:0.7.7:wrapper -Dmaven=3.6.3
       - name: Set JDK ${{ matrix.java-version }}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: 'zulu'
           java-version: ${{ matrix.java-version }}
       - name: Unit-Test
         run: ./mvnw verify -pl '!p2-repository,!org.eclipse.collections:org.eclipse.collections' --no-transfer-progress

diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -24,8 +24,9 @@ jobs:
       - name: Set Maven Wrapper
         run: mvn -N io.takari:maven:0.7.7:wrapper -Dmaven=3.6.3
       - name: Set JDK ${{ matrix.java-version }}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: 'zulu'
           java-version: ${{ matrix.java-version }}
       - name: Unit-Test
         run: ./mvnw verify --no-transfer-progress