Update bundled JDK to Java 22

mark-vieira · Mar 19, 2024 · c5112f6 · c5112f6
1 parent c1d0e8e
commit c5112f6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 19 deletions.
diff --git a/...main/java/org/elasticsearch/gradle/internal/toolchain/OracleOpenJdkToolchainResolver.java b/...main/java/org/elasticsearch/gradle/internal/toolchain/OracleOpenJdkToolchainResolver.java
@@ -39,11 +39,7 @@ record JdkBuild(JavaLanguageVersion languageVersion, String version, String buil
     );
 
     // package private so it can be replaced by tests
-    List<JdkBuild> builds = List.of(
-        getBundledJdkBuild(),
-        // 22 release candidate
-        new JdkBuild(JavaLanguageVersion.of(22), "22", "36", "830ec9fcccef480bb3e73fb7ecafe059")
-    );
+    List<JdkBuild> builds = List.of(getBundledJdkBuild());
 
     private JdkBuild getBundledJdkBuild() {
         String bundledJdkVersion = VersionProperties.getBundledJdkVersion();

diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties
@@ -2,7 +2,7 @@ elasticsearch     = 8.14.0
 lucene            = 9.10.0
 
 bundled_jdk_vendor = openjdk
-bundled_jdk = 21.0.2+13@f2283984656d49d69e91c558476027ac
+bundled_jdk = 22+36@830ec9fcccef480bb3e73fb7ecafe059
 # optional dependencies
 spatial4j         = 0.7
 jts               = 1.15.0

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -1694,25 +1694,25 @@
             <sha256 value="0a4aa0f2606bd6292a7ccd7d67a0db914bf5874dfb8a6184df3e6d63cdc93702" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="openjdk_21" name="linux" version="21.0.2">
-         <artifact name="linux-21.0.2-aarch64.tar.gz">
-            <sha256 value="08db1392a48d4eb5ea5315cf8f18b89dbaf36cda663ba882cf03c704c9257ec2" origin="Generated by Gradle"/>
+      <component group="openjdk_22" name="linux" version="22">
+         <artifact name="linux-22-aarch64.tar.gz">
+            <sha256 value="b272e3228d2a3e04b126d54844d33cc6d137256490526cd08679d7023d07d4b7" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="linux-21.0.2-x64.tar.gz">
-            <sha256 value="a2def047a73941e01a73739f92755f86b895811afb1f91243db214cff5bdac3f" origin="Generated by Gradle"/>
+         <artifact name="linux-22-x64.tar.gz">
+            <sha256 value="4d65cc6ed28711768fd72c2043a7925f7c83f5f51bb64970bd9d52f7791fc6ac" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="openjdk_21" name="macos" version="21.0.2">
-         <artifact name="macos-21.0.2-aarch64.tar.gz">
-            <sha256 value="b3d588e16ec1e0ef9805d8a696591bd518a5cea62567da8f53b5ce32d11d22e4" origin="Generated by Gradle"/>
+      <component group="openjdk_22" name="macos" version="22">
+         <artifact name="macos-22-aarch64.tar.gz">
+            <sha256 value="d10f82429d01047968c52c7975c326388cb5d212791e14c1de21c987463a4b53" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="macos-21.0.2-x64.tar.gz">
-            <sha256 value="8fd09e15dc406387a0aba70bf5d99692874e999bf9cd9208b452b5d76ac922d3" origin="Generated by Gradle"/>
+         <artifact name="macos-22-x64.tar.gz">
+            <sha256 value="ae31fe10916429e3fe284266095067a5ce9fecbdc03ff1a079d20459f731ca36" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="openjdk_21" name="windows" version="21.0.2">
-         <artifact name="windows-21.0.2-x64.zip">
-            <sha256 value="b6c17e747ae78cdd6de4d7532b3164b277daee97c007d3eaa2b39cca99882664" origin="Generated by Gradle"/>
+      <component group="openjdk_22" name="windows" version="22">
+         <artifact name="windows-22-x64.zip">
+            <sha256 value="8f5138fecb53c08c20abd4fa6812f9400051f3852582a2142ffda0dff73a5824" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.abego.treelayout" name="org.abego.treelayout.core" version="1.0.3">