[7.17] Update bundled JDK to Java 22 (#106482) (#106509)

* Update bundled JDK to Java 22 (#106482) # Conflicts: # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/toolchain/AdoptiumJdkToolchainResolver.java # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/toolchain/OracleOpenJdkToolchainResolver.java # build-tools-internal/src/test/groovy/org/elasticsearch/gradle/internal/toolchain/AdoptiumJdkToolchainResolverSpec.groovy # gradle/verification-metadata.xml * Revert toolchain resolver changes
elastic · Mar 19, 2024 · b0cd02b · b0cd02b
1 parent 1175fc6
commit b0cd02b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 23 deletions.
diff --git a/...roovy/org/elasticsearch/gradle/internal/toolchain/AdoptiumJdkToolchainResolverSpec.groovy b/...roovy/org/elasticsearch/gradle/internal/toolchain/AdoptiumJdkToolchainResolverSpec.groovy
@@ -11,7 +11,6 @@ package org.elasticsearch.gradle.internal.toolchain
 import org.gradle.api.services.BuildServiceParameters
 import org.gradle.jvm.toolchain.JavaLanguageVersion
 import org.gradle.jvm.toolchain.JavaToolchainResolver
-import org.gradle.platform.OperatingSystem
 
 import static org.elasticsearch.gradle.internal.toolchain.AbstractCustomJavaToolchainResolver.toArchString
 import static org.elasticsearch.gradle.internal.toolchain.AbstractCustomJavaToolchainResolver.toOsString

diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties
@@ -2,7 +2,7 @@ elasticsearch     = 7.17.19
 lucene            = 8.11.3
 
 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
@@ -1947,33 +1947,25 @@
             <sha256 value="cf39490fe042dba1b61d6e9a395095279a69e70086c8c8d5466d9926d80976d8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="openjdk_21" name="linux" version="21.0.1">
-         <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="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="macos" version="22">
+         <artifact name="macos-22-aarch64.tar.gz">
+            <sha256 value="d10f82429d01047968c52c7975c326388cb5d212791e14c1de21c987463a4b53" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="linux-21.0.2-x64.tar.gz">
-            <sha256 value="a2def047a73941e01a73739f92755f86b895811afb1f91243db214cff5bdac3f" 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="macos" version="21.0.2">
-         <artifact name="macos-21.0.2-aarch64.tar.gz">
-            <sha256 value="b3d588e16ec1e0ef9805d8a696591bd518a5cea62567da8f53b5ce32d11d22e4" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="macos-21.0.2-x64.tar.gz">
-            <sha256 value="8fd09e15dc406387a0aba70bf5d99692874e999bf9cd9208b452b5d76ac922d3" 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">