From 1c853e60bdf9e56a8302069bfa96b3fdacef9929 Mon Sep 17 00:00:00 2001
From: Kazuki Shimizu <kazuki43zoo@gmail.com>
Date: Sun, 22 May 2022 01:01:28 +0900
Subject: [PATCH] Support JDK 17-GA, 18-GA and 19-EA on CI

---
 .github/workflows/ci.yaml        | 8 ++++----
 .github/workflows/coveralls.yaml | 4 ++--
 .github/workflows/sonar.yaml     | 4 ++--
 .github/workflows/sonatype.yaml  | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 9c9b423da..1ddacca1f 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,5 +1,5 @@
 #
-#    Copyright 2016-2021 the original author or authors.
+#    Copyright 2016-2022 the original author or authors.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -24,10 +24,10 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        java: [8, 11, 16, 17-ea]
-        distribution: ['adopt']
+        java: [8, 11, 17, 18, 19-ea]
+        distribution: ['zulu']
       fail-fast: false
-      max-parallel: 4
+      max-parallel: 5
     name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
 
     steps:
diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml
index aab60cd45..c0dec1c46 100644
--- a/.github/workflows/coveralls.yaml
+++ b/.github/workflows/coveralls.yaml
@@ -1,5 +1,5 @@
 #
-#    Copyright 2016-2020 the original author or authors.
+#    Copyright 2016-2022 the original author or authors.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           java-version: 8
-          distribution: adopt
+          distribution: zulu
       - name: Report Coverage to Coveralls for Pull Requests
         if: github.event_name == 'pull_request'
         run: ./mvnw test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER
diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml
index 805de4a8f..caff31785 100644
--- a/.github/workflows/sonar.yaml
+++ b/.github/workflows/sonar.yaml
@@ -1,5 +1,5 @@
 #
-#    Copyright 2016-2020 the original author or authors.
+#    Copyright 2016-2022 the original author or authors.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           java-version: 11
-          distribution: adopt
+          distribution: zulu
       - name: Analyze with SonarCloud
         run: ./mvnw verify jacoco:report sonar:sonar -B -Dsonar.projectKey=mybatis_mybatis-dynamic-sql -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN -Dlicense.skip=true
         env:
diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml
index d286c9943..24d91849c 100644
--- a/.github/workflows/sonatype.yaml
+++ b/.github/workflows/sonatype.yaml
@@ -1,5 +1,5 @@
 #
-#    Copyright 2016-2020 the original author or authors.
+#    Copyright 2016-2022 the original author or authors.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           java-version: 11
-          distribution: adopt
+          distribution: zulu
       - name: Deploy to Sonatype
         run: ./mvnw deploy -DskipTests -B --settings ./.mvn/settings.xml -Dlicense.skip=true
         env: