Merge pull request #4020 from reinhapa/use-adoptium

[feature] use of Adoptiums 'temurin' JDK
eXist-db · Dec 13, 2021 · 6828b0e · 6828b0e
2 parents e32e3c8 + 8b0e3c7
commit 6828b0e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -17,8 +17,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK ${{ matrix.jdk }}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: temurin
           java-version: ${{ matrix.jdk }}
       - name: Cache Maven packages
         uses: actions/cache@v2

diff --git a/.github/workflows/ci-deploy.yml b/.github/workflows/ci-deploy.yml
@@ -11,8 +11,9 @@ jobs:
         with:
           fetch-depth: 1
       - name: Set up JDK 8
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: temurin
           java-version: '8'
       - name: Make buildkit default
         uses: docker/setup-buildx-action@v1

diff --git a/.github/workflows/ci-docs.yml b/.github/workflows/ci-docs.yml
@@ -11,9 +11,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
             fetch-depth: 0
-      - name: Set up JDK 
-        uses: actions/setup-java@v1
+      - name: Set up JDK
+        uses: actions/setup-java@v2
         with:
+          distribution: temurin
           java-version: ${{ matrix.jdk }}
       - name: Cache Maven packages
         uses: actions/cache@v2

diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml
@@ -17,8 +17,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK ${{ matrix.jdk }}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: temurin
           java-version: ${{ matrix.jdk }}
       - name: Cache Maven packages
         uses: actions/cache@v2

diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
@@ -15,8 +15,9 @@ jobs:
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: temurin
           java-version: 11
       - name: Cache SonarCloud packages
         uses: actions/cache@v2