From 11ef68b9bb79648fae17f96486be01065bebc342 Mon Sep 17 00:00:00 2001
From: Cheng Fang <cfang@redhat.com>
Date: Mon, 12 Dec 2022 15:39:27 -0500
Subject: [PATCH] JBERET-587 Upgrade github actions to avoid github action
 warnings (#279) (#281)

---
 .github/workflows/jberet-1.x.yml | 20 ++++++++++----------
 .github/workflows/jberet-2.x.yml | 20 ++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/jberet-1.x.yml b/.github/workflows/jberet-1.x.yml
index 24f709a4f..2e9be6f2e 100644
--- a/.github/workflows/jberet-1.x.yml
+++ b/.github/workflows/jberet-1.x.yml
@@ -11,15 +11,15 @@ on:
 
 jobs:
   build-test-matrix:
-    name: ${{ matrix.impl}}-${{ matrix.jdk }}-${{ matrix.os }}
+    name: ${{ matrix.jdk-distribution }}-${{ matrix.jdk-version }}-${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 25
     strategy:
       fail-fast: false
       matrix:
         os: [ macos-latest, windows-latest ]
-        jdk: [ 8 ]
-        impl: [ hotspot ]
+        jdk-distribution: [ temurin ]
+        jdk-version: [ 8 ]
     steps:
       - name: Configure runner - Linux
         if: contains(matrix.os, 'macos')
@@ -32,16 +32,16 @@ jobs:
           echo '127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4' > %SystemRoot%\System32\drivers\etc\hosts
           echo '::1         localhost localhost.localdomain localhost6 localhost6.localdomain6' >> %SystemRoot%\System32\drivers\etc\hosts
         shell: cmd
-      - uses: actions/checkout@v2
-      - name: Set up JDK ${{ matrix.jdk }}
-        uses: AdoptOpenJDK/install-jdk@v1
+      - uses: actions/checkout@v3
+      - name: Set up JDK ${{ matrix.jdk-distribution }} ${{ matrix.jdk-version }}
+        uses: actions/setup-java@v3
         with:
-          version: ${{ matrix.jdk }}
-          impl: ${{ matrix.impl }}
+          distribution: ${{ matrix.jdk-distribution }}
+          java-version: ${{ matrix.jdk-version }}
       - name: Run Tests
         run: mvn -ntp -U -B -fae clean install
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         if: failure()
         with:
-          name: surefire-reports-${{ matrix.openjdk}}-${{ matrix.jdk }}-${{ matrix.os }}
+          name: surefire-${{ matrix.jdk-distribution }}-${{ matrix.jdk-version }}-${{ matrix.os }}
           path: '**/surefire-reports/*.txt'
diff --git a/.github/workflows/jberet-2.x.yml b/.github/workflows/jberet-2.x.yml
index 7604b476d..3dcf5c11f 100644
--- a/.github/workflows/jberet-2.x.yml
+++ b/.github/workflows/jberet-2.x.yml
@@ -12,15 +12,15 @@ on:
 
 jobs:
   build-test-matrix:
-    name: ${{ matrix.impl}}-${{ matrix.jdk }}-${{ matrix.os }}
+    name: ${{ matrix.jdk-distribution }}-${{ matrix.jdk-version }}-${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 25
     strategy:
       fail-fast: false
       matrix:
         os: [ macos-latest, windows-latest ]
-        jdk: [ 11 ]
-        impl: [ hotspot ]
+        jdk-distribution: [ temurin ]
+        jdk-version: [ 11 ]
     steps:
       - name: Configure runner - Linux
         if: contains(matrix.os, 'macos')
@@ -33,16 +33,16 @@ jobs:
           echo '127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4' > %SystemRoot%\System32\drivers\etc\hosts
           echo '::1         localhost localhost.localdomain localhost6 localhost6.localdomain6' >> %SystemRoot%\System32\drivers\etc\hosts
         shell: cmd
-      - uses: actions/checkout@v2
-      - name: Set up JDK ${{ matrix.jdk }}
-        uses: AdoptOpenJDK/install-jdk@v1
+      - uses: actions/checkout@v3
+      - name: Set up JDK ${{ matrix.jdk-distribution }} ${{ matrix.jdk-version }}
+        uses: actions/setup-java@v3
         with:
-          version: ${{ matrix.jdk }}
-          impl: ${{ matrix.impl }}
+          distribution: ${{ matrix.jdk-distribution }}
+          java-version: ${{ matrix.jdk-version }}
       - name: Run Tests
         run: mvn -ntp -U -B -fae clean install
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         if: failure()
         with:
-          name: surefire-reports-${{ matrix.openjdk}}-${{ matrix.jdk }}-${{ matrix.os }}
+          name: surefire-${{ matrix.jdk-distribution }}-${{ matrix.jdk-version }}-${{ matrix.os }}
           path: '**/surefire-reports/*.txt'