From c4b1e83223f7c128889cbe86db7017cf4a370392 Mon Sep 17 00:00:00 2001
From: Tyler Ohlsen <ohltyler@amazon.com>
Date: Tue, 10 Oct 2023 08:44:45 -0700
Subject: [PATCH] Fix setup-java

Signed-off-by: Tyler Ohlsen <ohltyler@amazon.com>
---
 .github/workflows/benchmark.yml                 | 3 ++-
 .github/workflows/test_build_multi_platform.yml | 2 ++
 .github/workflows/test_bwc.yml                  | 3 ++-
 .github/workflows/test_security.yml             | 3 ++-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index c5caeedd0..aa5a833d1 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -20,6 +20,7 @@ jobs:
     steps:
       - name: Setup Java ${{ matrix.java }}
         uses: actions/setup-java@v3
+        distribution: temurin
         with:
           java-version: ${{ matrix.java }}
 
@@ -30,4 +31,4 @@ jobs:
       - name: Build and Run Tests
         run: |
           ./gradlew ':test' --tests "org.opensearch.ad.ml.HCADModelPerfTests" -Dtests.seed=2AEBDBBAE75AC5E0 -Dtests.security.manager=false -Dtests.locale=es-CU -Dtests.timezone=Chile/EasterIsland -Dtest.logs=true -Dmodel-benchmark=true
-          ./gradlew integTest --tests "org.opensearch.ad.e2e.SingleStreamModelPerfIT" -Dtests.seed=60CDDB34427ACD0C -Dtests.security.manager=false -Dtests.locale=kab-DZ -Dtests.timezone=Asia/Hebron -Dtest.logs=true -Dmodel-benchmark=true
\ No newline at end of file
+          ./gradlew integTest --tests "org.opensearch.ad.e2e.SingleStreamModelPerfIT" -Dtests.seed=60CDDB34427ACD0C -Dtests.security.manager=false -Dtests.locale=kab-DZ -Dtests.timezone=Asia/Hebron -Dtest.logs=true -Dmodel-benchmark=true
diff --git a/.github/workflows/test_build_multi_platform.yml b/.github/workflows/test_build_multi_platform.yml
index dc8bf4c67..b65a9a4e2 100644
--- a/.github/workflows/test_build_multi_platform.yml
+++ b/.github/workflows/test_build_multi_platform.yml
@@ -43,6 +43,7 @@ jobs:
       - name: Setup Java ${{ matrix.java }}
         uses: actions/setup-java@v3
         with:
+          distribution: temurin
           java-version: ${{ matrix.java }}
       - name: Checkout Anomaly Detection
         uses: actions/checkout@v4
@@ -77,6 +78,7 @@ jobs:
       - name: Setup Java ${{ matrix.java }}
         uses: actions/setup-java@v3
         with:
+          distribution: temurin
           java-version: ${{ matrix.java }}
 
       - name: Checkout AD
diff --git a/.github/workflows/test_bwc.yml b/.github/workflows/test_bwc.yml
index 3c86f238a..8965c9fd3 100644
--- a/.github/workflows/test_bwc.yml
+++ b/.github/workflows/test_bwc.yml
@@ -11,7 +11,7 @@ jobs:
   Build-ad:
     strategy:
       matrix:
-        java: [11,17,20]
+        java: [11, 17, 20]
       fail-fast: false
 
     name: Test Anomaly detection BWC
@@ -21,6 +21,7 @@ jobs:
       - name: Setup Java ${{ matrix.java }}
         uses: actions/setup-java@v3
         with:
+          distribution: temurin
           java-version: ${{ matrix.java }}
 
       # anomaly-detection
diff --git a/.github/workflows/test_security.yml b/.github/workflows/test_security.yml
index 74229918d..515a56ec4 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,20]
+        java: [11, 17, 20]
       fail-fast: false
 
     name: Security test workflow for Anomaly Detection
@@ -21,6 +21,7 @@ jobs:
       - name: Setup Java ${{ matrix.java }}
         uses: actions/setup-java@v3
         with:
+          distribution: temurin
           java-version: ${{ matrix.java }}
 
       # time-series-analytics