From aa1af58dfa7de999b804f36428e4b50c48d6d28e Mon Sep 17 00:00:00 2001
From: Andrew Ross <andrross@amazon.com>
Date: Wed, 5 Jun 2024 23:19:28 +0000
Subject: [PATCH] Set JDK21 as the baseline for the 3.0 major version

Resolves #581

Signed-off-by: Andrew Ross <andrross@amazon.com>
---
 .github/workflows/build.yml | 12 ++++--------
 build.gradle                |  4 ++--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a3fd4b16..45106f4a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,8 +19,6 @@ jobs:
     strategy:
       matrix:
         java:
-          - 11
-          - 17
           - 21
     # Job name
     name: Build Asynchronous Search
@@ -68,8 +66,6 @@ jobs:
     strategy:
       matrix:
         java:
-          - 11
-          - 17
           - 21
     # Job name
     name: Test Asynchronous Search with opensearchstaging docker
@@ -145,10 +141,10 @@ jobs:
     runs-on: windows-latest
     steps:
       # This step uses the setup-java Github action: https://github.com/actions/setup-java
-      - name: Set Up JDK 11
+      - name: Set Up JDK 21
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 21
       # This step uses the checkout Github action: https://github.com/actions/checkout
       - name: Checkout Branch
         uses: actions/checkout@v2
@@ -174,10 +170,10 @@ jobs:
     runs-on: macos-latest
     steps:
       # This step uses the setup-java Github action: https://github.com/actions/setup-java
-      - name: Set Up JDK 11
+      - name: Set Up JDK 21
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 21
       # This step uses the checkout Github action: https://github.com/actions/checkout
       - name: Checkout Branch
         uses: actions/checkout@v2
diff --git a/build.gradle b/build.gradle
index 0894088e..77a49242 100644
--- a/build.gradle
+++ b/build.gradle
@@ -82,8 +82,8 @@ ext {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
 allprojects {