Merge branch 'biojava:master' into master

biojava · Dec 4, 2023 · 06871b8 · 06871b8
2 parents 7a4be76 + d276c1a
commit 06871b8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -16,7 +16,7 @@ jobs:
         # We do one OS only to reduce resource utilization. To do macOS to this would be needed:
         #os: [ubuntu-20.04, macOS-latest]
         os: [ubuntu-latest]
-        java: [11]
+        java: [17]
       fail-fast: false
       max-parallel: 4
     name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
@@ -26,6 +26,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
+          distribution: 'oracle'
           java-version: ${{ matrix.java }}
       - name: Build, test (no integration) and Sonarqube analyse
         env:

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -19,7 +19,7 @@ jobs:
         # We do one OS only to reduce resource utilization. To do macOS to this would be needed:
         #os: [ubuntu-20.04, macOS-latest]
         os: [ubuntu-latest]
-        java: [11]
+        java: [17]
       fail-fast: false
       max-parallel: 4
     name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
@@ -29,6 +29,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
+          distribution: 'oracle'
           java-version: ${{ matrix.java }}
       - name: Build, test and integration test
         run: mvn verify --no-transfer-progress