From 1812e51a4e04caad2657391be63d71f4a94bff07 Mon Sep 17 00:00:00 2001
From: Gareth Ellis <gareth.ellis@elastic.co>
Date: Thu, 12 Sep 2024 14:22:19 +0200
Subject: [PATCH 1/3] Switch to JDK 21

---
 .github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 28d68069d..978b5977a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -74,11 +74,11 @@ jobs:
           python-version: "3.12"
           cache: pip
           cache-dependency-path: pyproject.toml
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4.3
         with:
           distribution: "temurin"
-          java-version: "17"
-      - run: echo "JAVA17_HOME=$JAVA_HOME_17_X64" >> $GITHUB_ENV
+          java-version: "21"
+      - run: echo "JAVA21_HOME=$JAVA_HOME_21_X64" >> $GITHUB_ENV
       - run: echo "JAVA11_HOME=$JAVA_HOME_11_X64" >> $GITHUB_ENV
       - name: "Install dependencies"
         run: python -m pip install --upgrade nox

From a64bbe5f059d3e400c58a96a1f13a494bdba1f0a Mon Sep 17 00:00:00 2001
From: Gareth Ellis <gareth.ellis@elastic.co>
Date: Thu, 12 Sep 2024 14:27:21 +0200
Subject: [PATCH 2/3] 4 not 4.3

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 978b5977a..d425c2c69 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -74,7 +74,7 @@ jobs:
           python-version: "3.12"
           cache: pip
           cache-dependency-path: pyproject.toml
-      - uses: actions/setup-java@v4.3
+      - uses: actions/setup-java@v4
         with:
           distribution: "temurin"
           java-version: "21"

From 62b7ba1f61e627c9655d91329c0a006baa0ec202 Mon Sep 17 00:00:00 2001
From: Gareth Ellis <gareth.ellis@elastic.co>
Date: Thu, 12 Sep 2024 18:03:06 +0200
Subject: [PATCH 3/3] Update run.sh

---
 .buildkite/it/run.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.buildkite/it/run.sh b/.buildkite/it/run.sh
index 943ac9211..2f4b2e85a 100644
--- a/.buildkite/it/run.sh
+++ b/.buildkite/it/run.sh
@@ -30,9 +30,9 @@ retry 5 sudo apt-get update
 retry 5 sudo apt-get install -y \
     "python${PYTHON_VERSION}" "python${PYTHON_VERSION}-dev" "python${PYTHON_VERSION}-venv" \
     git make jq docker \
-    openjdk-17-jdk-headless openjdk-11-jdk-headless
+    openjdk-21-jdk-headless openjdk-11-jdk-headless
 export JAVA11_HOME=/usr/lib/jvm/java-11-openjdk-amd64
-export JAVA17_HOME=/usr/lib/jvm/java-17-openjdk-amd64
+export JAVA21_HOME=/usr/lib/jvm/java-21-openjdk-amd64
 
 echo "--- Run IT test :pytest:"