From 2da5d75ab8045b823fb7470da9b64e8bab9d1933 Mon Sep 17 00:00:00 2001
From: Rory Hunter <pugnascotia@users.noreply.github.com>
Date: Wed, 13 Apr 2022 17:48:04 +0100
Subject: [PATCH] Upgrade to JDK 18.0.0+36 (#85376)

Closes #85357. Upgrade to the latest Adoptium JDK for bundling with
Elasticsearch.
---
 build-tools-internal/version.properties | 2 +-
 docs/changelog/85376.yaml               | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 docs/changelog/85376.yaml

diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties
index bc39a1f16d8c..11600077bd39 100644
--- a/build-tools-internal/version.properties
+++ b/build-tools-internal/version.properties
@@ -2,7 +2,7 @@ elasticsearch     = 8.3.0
 lucene            = 9.1.0
 
 bundled_jdk_vendor = adoptium
-bundled_jdk = 17.0.2+8
+bundled_jdk = 18+36
 
 checkstyle = 9.3
 
diff --git a/docs/changelog/85376.yaml b/docs/changelog/85376.yaml
new file mode 100644
index 000000000000..cad3290fe0c6
--- /dev/null
+++ b/docs/changelog/85376.yaml
@@ -0,0 +1,6 @@
+pr: 85376
+summary: Upgrade to JDK 18.0.0+36
+area: Packaging
+type: upgrade
+issues:
+ - 85357