From eaac32de499fa88ea0a7575ed528deba85b05ab1 Mon Sep 17 00:00:00 2001
From: Andrew Ross <andrross@amazon.com>
Date: Mon, 10 Jun 2024 17:01:14 -0700
Subject: [PATCH] Set JDK21 as the baseline for the 3.0 major version (#582)

Resolves #581

Signed-off-by: Andrew Ross <andrross@amazon.com>
---
 .github/workflows/build.yml                    | 12 ++++--------
 .github/workflows/multi-node-test-workflow.yml |  4 ++--
 build.gradle                                   |  4 ++--
 3 files changed, 8 insertions(+), 12 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/.github/workflows/multi-node-test-workflow.yml b/.github/workflows/multi-node-test-workflow.yml
index 6d07db88..c42f3688 100644
--- a/.github/workflows/multi-node-test-workflow.yml
+++ b/.github/workflows/multi-node-test-workflow.yml
@@ -1,7 +1,7 @@
 name: Multi node test workflow
 
 env:
-  java_version: 11
+  java_version: 21
 # This workflow is triggered on pull requests to master
 on:
   pull_request:
@@ -32,7 +32,7 @@ jobs:
 
     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: ${{ env.java_version }}
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 {