From 020a541797c8fa1ac7d0c820695d03dc2e6e83f9 Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@google.com>
Date: Wed, 10 May 2023 11:18:13 -0700
Subject: [PATCH] Update JDK versions, and test compatibility on JDK 11

---
 .github/workflows/ci.yml | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 843a3b188e7..5234b218a91 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,21 +15,18 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest ]
-        java: [ 19, 17, 11 ]
+        java: [ 20, 17, 11 ]
         experimental: [ false ]
         # Only test on macos and windows with a single recent JDK to avoid a
         # combinatorial explosion of test configurations.
         # Most OS-specific issues are not specific to a particular JDK version.
         include:
           - os: macos-latest
-            java: 19
-            experimental: false
+            java: 20
           - os: windows-latest
-            java: 19
-            experimental: false
+            java: 20
           - os: ubuntu-latest
-            java: 20-ea
-            experimental: true
+            java: 20
           - os: ubuntu-latest
             java: 21-ea
             experimental: true
@@ -45,7 +42,7 @@ jobs:
       - name: 'Set up JDK ${{ matrix.java }}'
         uses: actions/setup-java@v2
         with:
-          java-version: ${{ matrix.java }}
+          java-version: 11 | ${{ matrix.java }}
           distribution: 'zulu'
           cache: 'maven'
       - name: 'Install'
@@ -54,6 +51,10 @@ jobs:
       - name: 'Test'
         shell: bash
         run: mvn test -B
+      - name: 'Test compatibility with JDK 11'
+        if: ${{ matrix.java == 17 }}
+        shell: bash
+        run: mvn test -B -Dsurefire.jdk-toolchain-version=11
       - name: 'Javadoc'
         # only generate javadoc on JDKs with the fix for https://bugs.openjdk.org/browse/JDK-8241780
         if: ${{ matrix.java >= 15 }}
@@ -68,10 +69,10 @@ jobs:
     steps:
       - name: 'Check out repository'
         uses: actions/checkout@v2
-      - name: 'Set up JDK 11'
+      - name: 'Set up JDK 17'
         uses: actions/setup-java@v2
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'zulu'
           cache: 'maven'
           server-id: ossrh
@@ -81,7 +82,7 @@ jobs:
         env:
           CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
           CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
-        run: mvn source:jar deploy -B -DskipTests=true -Dinvoker.skip=true -Dmaven.javadoc.skip=true
+        run: mvn source:jar deploy -B -DskipTests=true -Dinvoker.skip=true
 
   generate_docs:
     name: 'Generate latest docs'
@@ -91,10 +92,10 @@ jobs:
     steps:
       - name: 'Check out repository'
         uses: actions/checkout@v2
-      - name: 'Set up JDK 15'
+      - name: 'Set up JDK 17'
         uses: actions/setup-java@v2
         with:
-          java-version: 15
+          java-version: 17
           distribution: 'zulu'
           cache: 'maven'
       - name: 'Generate latest docs'