From 4905b91bddccc0225a0d95fd02b430129d6f8839 Mon Sep 17 00:00:00 2001
From: Steve Riesenberg <sriesenberg@vmware.com>
Date: Fri, 15 Sep 2023 09:53:19 -0500
Subject: [PATCH] Run tests on JDK 21

Closes gh-13811

(cherry picked from commit 1dcc73ad1ff6600867b780f2a9a0cd548f82dbcb)
---
 .github/workflows/continuous-integration-workflow.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml
index 6c73e32b9b..a55a430a41 100644
--- a/.github/workflows/continuous-integration-workflow.yml
+++ b/.github/workflows/continuous-integration-workflow.yml
@@ -69,6 +69,13 @@ jobs:
   snapshot_tests:
     name: Test against snapshots
     needs: [prerequisites]
+    strategy:
+      matrix:
+        include:
+          - java-version: '21-ea'
+            toolchain: '21'
+          - java-version: '17'
+            toolchain: '17'
     runs-on: ubuntu-latest
     if: needs.prerequisites.outputs.runjobs
     steps:
@@ -76,14 +83,14 @@ jobs:
       - name: Set up gradle
         uses: spring-io/spring-gradle-build-action@v1
         with:
-          java-version: '17'
+          java-version: ${{ matrix.java-version }}
           distribution: 'temurin'
       - name: Snapshot Tests
         run: |
           export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
           export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
           export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
-          ./gradlew test --refresh-dependencies -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" -PforceMavenRepositories=snapshot -PspringFrameworkVersion='6.+' -PreactorVersion='2023+' -PspringDataVersion='2023+' -PrsocketVersion=1.1.5-SNAPSHOT -PspringBootVersion='3.+' -PlocksDisabled --stacktrace
+          ./gradlew test --refresh-dependencies -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" -PforceMavenRepositories=snapshot -PtestToolchain=${{ matrix.toolchain }} -PspringFrameworkVersion='6.+' -PreactorVersion='2023+' -PspringDataVersion='2023+' -PrsocketVersion=1.1.5-SNAPSHOT -PspringBootVersion='3.+' -PlocksDisabled --stacktrace
   check_samples:
     name: Check Samples project
     needs: [prerequisites]