Revert "Revert "Upgrade bundled JDK to Java 20 (#94600) (#94604)" (#94692)" (#95172)

This reverts commit d62fbba.

Author: breskeby

build-tools-internal/version.properties

@@ -2,7 +2,7 @@ elasticsearch = 8.7.1
 lucene = 9.5.0
 
 bundled_jdk_vendor = openjdk
-bundled_jdk = 19.0.2+7@fdb695a9d9064ad6b064dc6df578380c
+bundled_jdk = 20+36@bdc68b4b9cbc4ebcb30745c85038d91d
 
 # optional dependencies
 spatial4j = 0.7

docs/changelog/94600.yaml

@@ -0,0 +1,5 @@
+pr: 94600
+summary: Upgrade bundled JDK to Java 20
+area: Packaging
+type: upgrade
+issues: []

gradle/verification-metadata.xml

@@ -1492,25 +1492,25 @@
  <sha256 value="0a4aa0f2606bd6292a7ccd7d67a0db914bf5874dfb8a6184df3e6d63cdc93702" origin="Generated by Gradle"/>
  </artifact>
  </component>
- <component group="openjdk_19" name="linux" version="19.0.2">
- <artifact name="linux-19.0.2-aarch64.tar.gz">
- <sha256 value="95728187b4b5607c49de751a209ecda6e04d9ed7cee603cf36f454239106527b" origin="Generated by Gradle"/>
+ <component group="openjdk_20" name="linux" version="20">
+ <artifact name="linux-20-aarch64.tar.gz">
+ <sha256 value="b671dd1513e7bd4f3de6b1424a90a4998997a67593bf259936d55f5e83e31959" origin="Generated by Gradle"/>
  </artifact>
- <artifact name="linux-19.0.2-x64.tar.gz">
- <sha256 value="34cf8d095cc071e9e10165f5c45023f96ec68397fdaabf6c64bfec1ffeee6198" origin="Generated by Gradle"/>
+ <artifact name="linux-20-x64.tar.gz">
+ <sha256 value="bb863b2d542976d1ae4b7b81af3e78b1e4247a64644350b552d298d8dc5980dc" origin="Generated by Gradle"/>
  </artifact>
  </component>
- <component group="openjdk_19" name="macos" version="19.0.2">
- <artifact name="macos-19.0.2-aarch64.tar.gz">
- <sha256 value="4317442e14c5c2f4f698db0e41347df99d050a32137b2a02dfec28ed856577cc" origin="Generated by Gradle"/>
+ <component group="openjdk_20" name="macos" version="20">
+ <artifact name="macos-20-aarch64.tar.gz">
+ <sha256 value="d020f5c512c043cfb7119a591bc7e599a5bfd76d866d939f5562891d9db7c9b3" origin="Generated by Gradle"/>
  </artifact>
- <artifact name="macos-19.0.2-x64.tar.gz">
- <sha256 value="c57c7c511706738fff6540945e0159e97b8b328777e6460977dd64e00f4c2c0b" origin="Generated by Gradle"/>
+ <artifact name="macos-20-x64.tar.gz">
+ <sha256 value="47cf960d9bb89dbe987535a389f7e26c42de7c984ef5108612d77c81aa8cc6a4" origin="Generated by Gradle"/>
  </artifact>
  </component>
- <component group="openjdk_19" name="windows" version="19.0.2">
- <artifact name="windows-19.0.2-x64.zip">
- <sha256 value="9f70eba3f2631674a2d7d3aa01150d697f68be16ad76662ff948d7fe1b4985d8" origin="Generated by Gradle"/>
+ <component group="openjdk_20" name="windows" version="20">
+ <artifact name="windows-20-x64.zip">
+ <sha256 value="c92fae5e42b9aecf444a66c8ec563c652f60b1e231dfdd33a4f5a3e3603058fb" origin="Generated by Gradle"/>
  </artifact>
  </component>
  <component group="org.abego.treelayout" name="org.abego.treelayout.core" version="1.0.3">

libs/plugin-analysis-api/build.gradle

@@ -31,7 +31,7 @@ tasks.named("dependencyLicenses").configure {
 }
 
 tasks.named("thirdPartyAudit").configure {
- if (BuildParams.runtimeJavaVersion == JavaVersion.VERSION_20) {
+ if (BuildParams.runtimeJavaVersion == JavaVersion.VERSION_20 || BuildParams.isRuntimeJavaHomeSet == false) {
  ignoreMissingClasses(
  // This class was removed in Java 20 but is only referenced by a class that requires preview features anyhow
  // See: https://github.com/apache/lucene/pull/12042

server/build.gradle

@@ -236,7 +236,7 @@ tasks.named("thirdPartyAudit").configure {
  )
  ignoreMissingClasses 'javax.xml.bind.DatatypeConverter'
 
- if (BuildParams.runtimeJavaVersion == JavaVersion.VERSION_20) {
+ if (BuildParams.runtimeJavaVersion == JavaVersion.VERSION_20 || BuildParams.isRuntimeJavaHomeSet == false) {
  ignoreMissingClasses(
  // This class was removed in Java 20 but is only referenced by a class that requires preview features anyhow
  // See: https://github.com/apache/lucene/pull/12042