From 3f0fc8c184042dc39e28eddf601bd9d959d47469 Mon Sep 17 00:00:00 2001
From: Daniel Widdis <widdis@gmail.com>
Date: Thu, 13 Jun 2024 21:56:52 -0700
Subject: [PATCH] Set baseline JDK version to JDK-21 (#1228)

* Set baseline JDK version to JDK-21

Signed-off-by: Daniel Widdis <widdis@gmail.com>

* Update JDK version in maven-publish workflow

Signed-off-by: Daniel Widdis <widdis@gmail.com>

---------

Signed-off-by: Daniel Widdis <widdis@gmail.com>
---
 .github/workflows/maven-publish.yml             | 4 ++--
 .github/workflows/test_build_multi_platform.yml | 9 ++++-----
 .github/workflows/test_bwc.yml                  | 2 +-
 .github/workflows/test_security.yml             | 2 +-
 build.gradle                                    | 4 ++--
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
index 653445e0f..74fc77ddf 100644
--- a/.github/workflows/maven-publish.yml
+++ b/.github/workflows/maven-publish.yml
@@ -23,7 +23,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: temurin # Temurin is a distribution of adoptium
-          java-version: 17
+          java-version: 21
       - uses: actions/checkout@v4
       - uses: aws-actions/configure-aws-credentials@v4.0.1
         with:
@@ -35,4 +35,4 @@ jobs:
           export SONATYPE_PASSWORD=$(aws secretsmanager get-secret-value --secret-id maven-snapshots-password --query SecretString --output text)
           echo "::add-mask::$SONATYPE_USERNAME"
           echo "::add-mask::$SONATYPE_PASSWORD"
-          ./gradlew publishPluginZipPublicationToSnapshotsRepository
\ No newline at end of file
+          ./gradlew publishPluginZipPublicationToSnapshotsRepository
diff --git a/.github/workflows/test_build_multi_platform.yml b/.github/workflows/test_build_multi_platform.yml
index a45fc10c7..624afc725 100644
--- a/.github/workflows/test_build_multi_platform.yml
+++ b/.github/workflows/test_build_multi_platform.yml
@@ -18,10 +18,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      # Spotless requires JDK 17+
       - uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: temurin
       - name: Spotless Check
         run: ./gradlew spotlessCheck
@@ -30,7 +29,7 @@ jobs:
     needs: spotless
     strategy:
       matrix:
-        java: [ 11, 17, 21 ]
+        java: [ 21 ]
     name: Build and Test Anomaly Detection Plugin on Windows
     runs-on: windows-latest
     env:
@@ -63,7 +62,7 @@ jobs:
     needs: [Get-CI-Image-Tag, spotless]
     strategy:
       matrix:
-        java: [11, 17, 21]
+        java: [21]
       fail-fast: false
     name: Build and Test Anomaly detection Plugin
     runs-on: ubuntu-latest
@@ -104,7 +103,7 @@ jobs:
     needs: spotless
     strategy:
       matrix:
-        java: [11,17,21]
+        java: [21]
       fail-fast: false
 
     name: Build and Test Anomaly detection Plugin
diff --git a/.github/workflows/test_bwc.yml b/.github/workflows/test_bwc.yml
index 953f62009..a95db8e2d 100644
--- a/.github/workflows/test_bwc.yml
+++ b/.github/workflows/test_bwc.yml
@@ -17,7 +17,7 @@ jobs:
     needs: Get-CI-Image-Tag
     strategy:
       matrix:
-        java: [11,17,21]
+        java: [21]
       fail-fast: false
 
     name: Test Anomaly detection BWC
diff --git a/.github/workflows/test_security.yml b/.github/workflows/test_security.yml
index 7254a9b43..935b6d166 100644
--- a/.github/workflows/test_security.yml
+++ b/.github/workflows/test_security.yml
@@ -11,7 +11,7 @@ jobs:
   Build-ad:
     strategy:
       matrix:
-        java: [11,17,21]
+        java: [21]
       fail-fast: false
 
     name: Security test workflow for Anomaly Detection
diff --git a/build.gradle b/build.gradle
index 7df73a8dc..052e0f536 100644
--- a/build.gradle
+++ b/build.gradle
@@ -192,8 +192,8 @@ allprojects {
 }
 
 java {
-  targetCompatibility = JavaVersion.VERSION_11
-  sourceCompatibility = JavaVersion.VERSION_11
+  targetCompatibility = JavaVersion.VERSION_21
+  sourceCompatibility = JavaVersion.VERSION_21
 }
 
 ext {