From 87afeedc20a72a404d30d11bc412562ae8a2c70a Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 13 Sep 2021 13:45:20 +0200
Subject: [PATCH] Switch from Adopt to Temurin JDK distribution

---
 .github/workflows/codeql-analysis.yml    |  2 +-
 .github/workflows/cross-version.yml      |  4 ++--
 .github/workflows/main.yml               | 26 ++++++++++++------------
 .github/workflows/reproducible-build.yml |  4 ++--
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 434217b40eda..90ee694cea43 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -26,7 +26,7 @@ jobs:
     - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '11'
         cache: 'gradle'
     - name: Initialize CodeQL
diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index 533e98048ee1..ad346535edbe 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Set up JDK 8
         uses: actions/setup-java@v2
         with:
-          distribution: 'adopt'
+          distribution: 'temurin'
           java-version: '8'
       - name: Prepare JDK8 env var
         shell: bash
@@ -50,7 +50,7 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v2
         with:
-          distribution: 'adopt'
+          distribution: 'temurin'
           java-version: '11'
           cache: 'gradle'
       - name: Test
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1c96bcbb57fa..02de5906570d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -26,7 +26,7 @@ jobs:
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '8'
     - name: Prepare JDK8 env var
       shell: bash
@@ -34,7 +34,7 @@ jobs:
     - name: Set up JDK 16
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '16'
     - name: Prepare JDK16 env var
       shell: bash
@@ -42,7 +42,7 @@ jobs:
     - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '11'
         cache: 'gradle'
     - name: Test and coverage
@@ -70,7 +70,7 @@ jobs:
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '8'
     - name: Prepare JDK8 env var
       shell: bash
@@ -78,7 +78,7 @@ jobs:
     - name: Set up JDK 16
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '16'
     - name: Prepare JDK16 env var
       shell: bash
@@ -86,7 +86,7 @@ jobs:
     - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '11'
         cache: 'gradle'
     - name: Test
@@ -107,7 +107,7 @@ jobs:
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '8'
     - name: Prepare JDK8 env var
       shell: bash
@@ -115,7 +115,7 @@ jobs:
     - name: Set up JDK 16
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '16'
     - name: Prepare JDK16 env var
       shell: bash
@@ -123,7 +123,7 @@ jobs:
     - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '11'
         cache: 'gradle'
     - name: 'Test'
@@ -144,7 +144,7 @@ jobs:
     - name: Set up JDK 16
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '16'
     - name: Prepare JDK16 env var
       shell: bash
@@ -152,7 +152,7 @@ jobs:
     - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '11'
         cache: 'gradle'
     - name: Publish
@@ -175,7 +175,7 @@ jobs:
     - name: Set up JDK 16
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '16'
     - name: Prepare JDK16 env var
       shell: bash
@@ -183,7 +183,7 @@ jobs:
     - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '11'
         cache: 'gradle'
     - name: Install Graphviz
diff --git a/.github/workflows/reproducible-build.yml b/.github/workflows/reproducible-build.yml
index 8242d859e985..ead579aa6094 100644
--- a/.github/workflows/reproducible-build.yml
+++ b/.github/workflows/reproducible-build.yml
@@ -23,7 +23,7 @@ jobs:
     - name: Set up JDK 16
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '16'
     - name: Prepare JDK16 env var
       shell: bash
@@ -31,7 +31,7 @@ jobs:
     - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '11'
         cache: 'gradle'
     - name: Build and compare checksums