Skip to content

Commit c485424

Browse files
breskebybreskeby
authored
Update bundled JDK to Java 24.0.2+12 (#133119) (#133174)
Bumping bundled JDK 24 to latest available GA version.
1 parent c90cb95 commit c485424

File tree

4 files changed

+18
-97
lines changed

4 files changed

+18
-97
lines changed

‎build-tools-internal/src/test/groovy/org/elasticsearch/gradle/internal/toolchain/OracleOpenJdkToolchainResolverSpec.groovy‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class OracleOpenJdkToolchainResolverSpec extends AbstractToolchainResolverSpec {
3535
"36",
3636
"bdc68b4b9cbc4ebcb30745c85038d91d"
3737
),
38-
OracleOpenJdkToolchainResolver.getBundledJdkBuild("24+36@1f9ff9062db4449d8ca828c504ffae90", "24"),
38+
OracleOpenJdkToolchainResolver.getBundledJdkBuild("24.0.2+12@fdc5d0102fe0414db21410ad5834341f", "24"),
3939
]
4040
toolChain
4141
}
@@ -52,16 +52,16 @@ class OracleOpenJdkToolchainResolverSpec extends AbstractToolchainResolverSpec {
5252
[20, anyVendor(), LINUX, AARCH64, "https://download.oracle.com/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_linux-aarch64_bin.tar.gz"],
5353
[20, anyVendor(), WINDOWS, X86_64, "https://download.oracle.com/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_windows-x64_bin.zip"],
5454
// bundled jdk
55-
[24, ORACLE, MAC_OS, X86_64, "https://download.oracle.com/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_macos-x64_bin.tar.gz"],
56-
[24, ORACLE, MAC_OS, AARCH64, "https://download.oracle.com/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_macos-aarch64_bin.tar.gz"],
57-
[24, ORACLE, LINUX, X86_64, "https://download.oracle.com/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_linux-x64_bin.tar.gz"],
58-
[24, ORACLE, LINUX, AARCH64, "https://download.oracle.com/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_linux-aarch64_bin.tar.gz"],
59-
[24, ORACLE, WINDOWS, X86_64, "https://download.oracle.com/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_windows-x64_bin.zip"],
60-
[24, anyVendor(), MAC_OS, X86_64, "https://download.oracle.com/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_macos-x64_bin.tar.gz"],
61-
[24, anyVendor(), MAC_OS, AARCH64, "https://download.oracle.com/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_macos-aarch64_bin.tar.gz"],
62-
[24, anyVendor(), LINUX, X86_64, "https://download.oracle.com/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_linux-x64_bin.tar.gz"],
63-
[24, anyVendor(), LINUX, AARCH64, "https://download.oracle.com/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_linux-aarch64_bin.tar.gz"],
64-
[24, anyVendor(), WINDOWS, X86_64, "https://download.oracle.com/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_windows-x64_bin.zip"]
55+
[24, ORACLE, MAC_OS, X86_64, "https://download.oracle.com/java/GA/jdk24.0.2/fdc5d0102fe0414db21410ad5834341f/12/GPL/openjdk-24.0.2_macos-x64_bin.tar.gz"],
56+
[24, ORACLE, MAC_OS, AARCH64, "https://download.oracle.com/java/GA/jdk24.0.2/fdc5d0102fe0414db21410ad5834341f/12/GPL/openjdk-24.0.2_macos-aarch64_bin.tar.gz"],
57+
[24, ORACLE, LINUX, X86_64, "https://download.oracle.com/java/GA/jdk24.0.2/fdc5d0102fe0414db21410ad5834341f/12/GPL/openjdk-24.0.2_linux-x64_bin.tar.gz"],
58+
[24, ORACLE, LINUX, AARCH64, "https://download.oracle.com/java/GA/jdk24.0.2/fdc5d0102fe0414db21410ad5834341f/12/GPL/openjdk-24.0.2_linux-aarch64_bin.tar.gz"],
59+
[24, ORACLE, WINDOWS, X86_64, "https://download.oracle.com/java/GA/jdk24.0.2/fdc5d0102fe0414db21410ad5834341f/12/GPL/openjdk-24.0.2_windows-x64_bin.zip"],
60+
[24, anyVendor(), MAC_OS, X86_64, "https://download.oracle.com/java/GA/jdk24.0.2/fdc5d0102fe0414db21410ad5834341f/12/GPL/openjdk-24.0.2_macos-x64_bin.tar.gz"],
61+
[24, anyVendor(), MAC_OS, AARCH64, "https://download.oracle.com/java/GA/jdk24.0.2/fdc5d0102fe0414db21410ad5834341f/12/GPL/openjdk-24.0.2_macos-aarch64_bin.tar.gz"],
62+
[24, anyVendor(), LINUX, X86_64, "https://download.oracle.com/java/GA/jdk24.0.2/fdc5d0102fe0414db21410ad5834341f/12/GPL/openjdk-24.0.2_linux-x64_bin.tar.gz"],
63+
[24, anyVendor(), LINUX, AARCH64, "https://download.oracle.com/java/GA/jdk24.0.2/fdc5d0102fe0414db21410ad5834341f/12/GPL/openjdk-24.0.2_linux-aarch64_bin.tar.gz"],
64+
[24, anyVendor(), WINDOWS, X86_64, "https://download.oracle.com/java/GA/jdk24.0.2/fdc5d0102fe0414db21410ad5834341f/12/GPL/openjdk-24.0.2_windows-x64_bin.zip"]
6565
]
6666
}
6767

‎build-tools-internal/version.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ elasticsearch = 9.1.3
22
lucene = 10.2.2
33

44
bundled_jdk_vendor = openjdk
5-
bundled_jdk = 24+36@1f9ff9062db4449d8ca828c504ffae90
5+
bundled_jdk = 24.0.2+12@fdc5d0102fe0414db21410ad5834341f
66
# optional dependencies
77
spatial4j = 0.7
88
jts = 1.15.0

‎docs/changelog/133119.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 133119
2+
summary: Update bundled JDK to Java 24.0.2+12
3+
area: Packaging
4+
type: upgrade
5+
issues: []

‎gradle/verification-metadata.xml‎

Lines changed: 1 addition & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
<trust group="beats" name="metricbeat"/>
1010
<trust group="beats" name="metricbeat-fips"/>
1111
<trust group="elasticsearch-distribution" name="elasticsearch"/>
12-
<trust group="openjdk_.*" regex="true"/>
1312
<trust group="org.elasticsearch"/>
1413
<trust group="org.elasticsearch.distribution.zip" name="elasticsearch"/>
1514
<trust group="org.elasticsearch.ml"/>
1615
<trust group="org.elasticsearch.plugin"/>
1716
<trust file=".*-javadoc[.]jar" regex="true"/>
1817
<trust file=".*-sources[.]jar" regex="true"/>
18+
<trust group="openjdk_.*" regex="true"/>
1919
</trusted-artifacts>
2020
</configuration>
2121
<components>
@@ -2002,90 +2002,6 @@
20022002
<sha256 value="0a4aa0f2606bd6292a7ccd7d67a0db914bf5874dfb8a6184df3e6d63cdc93702" origin="Generated by Gradle"/>
20032003
</artifact>
20042004
</component>
2005-
<component group="openjdk_21" name="linux" version="21.0.2">
2006-
<artifact name="linux-21.0.2-aarch64.tar.gz">
2007-
<sha256 value="08db1392a48d4eb5ea5315cf8f18b89dbaf36cda663ba882cf03c704c9257ec2" origin="Generated by Gradle"/>
2008-
</artifact>
2009-
<artifact name="linux-21.0.2-x64.tar.gz">
2010-
<sha256 value="a2def047a73941e01a73739f92755f86b895811afb1f91243db214cff5bdac3f" origin="Generated by Gradle"/>
2011-
</artifact>
2012-
</component>
2013-
<component group="openjdk_21" name="macos" version="21.0.2">
2014-
<artifact name="macos-21.0.2-aarch64.tar.gz">
2015-
<sha256 value="b3d588e16ec1e0ef9805d8a696591bd518a5cea62567da8f53b5ce32d11d22e4" origin="Generated by Gradle"/>
2016-
</artifact>
2017-
<artifact name="macos-21.0.2-x64.tar.gz">
2018-
<sha256 value="8fd09e15dc406387a0aba70bf5d99692874e999bf9cd9208b452b5d76ac922d3" origin="Generated by Gradle"/>
2019-
</artifact>
2020-
</component>
2021-
<component group="openjdk_21" name="windows" version="21.0.2">
2022-
<artifact name="windows-21.0.2-x64.zip">
2023-
<sha256 value="b6c17e747ae78cdd6de4d7532b3164b277daee97c007d3eaa2b39cca99882664" origin="Generated by Gradle"/>
2024-
</artifact>
2025-
</component>
2026-
<component group="openjdk_22" name="linux" version="22.0.1">
2027-
<artifact name="linux-22.0.1-aarch64.tar.gz">
2028-
<sha256 value="0887c42b9897f889415a6f7b88549d38af99f6ef2d1117199de012beab0631eb" origin="Generated by Gradle"/>
2029-
</artifact>
2030-
<artifact name="linux-22.0.1-x64.tar.gz">
2031-
<sha256 value="133c8b65113304904cdef7c9103274d141cfb64b191ff48ceb6528aca25c67b1" origin="Generated by Gradle"/>
2032-
</artifact>
2033-
</component>
2034-
<component group="openjdk_22" name="macos" version="22.0.1">
2035-
<artifact name="macos-22.0.1-aarch64.tar.gz">
2036-
<sha256 value="b949a3bc13e3c5152ab55d12e699dfa6c8b00bedeb8302b13be4aec3ee734351" origin="Generated by Gradle"/>
2037-
</artifact>
2038-
<artifact name="macos-22.0.1-x64.tar.gz">
2039-
<sha256 value="5daa4f9894cc3a617a5f9fe2c48e5391d3a2e672c91e1597041672f57696846f" origin="Generated by Gradle"/>
2040-
</artifact>
2041-
</component>
2042-
<component group="openjdk_22" name="windows" version="22.0.1">
2043-
<artifact name="windows-22.0.1-x64.zip">
2044-
<sha256 value="de7f00fd1bd0d3a4c678fff2681dfad19284d74d357218a4be6f623488d040da" origin="Generated by Gradle"/>
2045-
</artifact>
2046-
</component>
2047-
<component group="openjdk_23" name="linux" version="23">
2048-
<artifact name="linux-23-aarch64.tar.gz">
2049-
<sha256 value="076dcf7078cdf941951587bf92733abacf489a6570f1df97ee35945ffebec5b7" origin="Generated by Gradle"/>
2050-
</artifact>
2051-
<artifact name="linux-23-x64.tar.gz">
2052-
<sha256 value="08fea92724127c6fa0f2e5ea0b07ff4951ccb1e2f22db3c21eebbd7347152a67" origin="Generated by Gradle"/>
2053-
</artifact>
2054-
</component>
2055-
<component group="openjdk_23" name="macos" version="23">
2056-
<artifact name="macos-23-aarch64.tar.gz">
2057-
<sha256 value="9527bf080a74ae6dca51df413aa826f0c011c6048885e4c8ad112172be8815f3" origin="Generated by Gradle"/>
2058-
</artifact>
2059-
<artifact name="macos-23-x64.tar.gz">
2060-
<sha256 value="5c3a909fd2079d0e376dd43c85c4f7d02d08914866f196480bd47784b2a0121e" origin="Generated by Gradle"/>
2061-
</artifact>
2062-
</component>
2063-
<component group="openjdk_23" name="windows" version="23">
2064-
<artifact name="windows-23-x64.zip">
2065-
<sha256 value="cba5013874ba50cae543c86fe6423453816c77281e2751a8a9a633d966f1dc04" origin="Generated by Gradle"/>
2066-
</artifact>
2067-
</component>
2068-
<component group="openjdk_24" name="linux" version="24">
2069-
<artifact name="linux-24-aarch64.tar.gz">
2070-
<sha256 value="a03867ed061c7bb661231e62b0967ff5a5a0b1bbaa37bdead3a924bd2ba3215f" origin="Generated by Gradle"/>
2071-
</artifact>
2072-
<artifact name="linux-24-x64.tar.gz">
2073-
<sha256 value="88b090fa80c6c1d084ec9a755233967458788e2c0777ae2e172230c5c692d7ef" origin="Generated by Gradle"/>
2074-
</artifact>
2075-
</component>
2076-
<component group="openjdk_24" name="macos" version="24">
2077-
<artifact name="macos-24-aarch64.tar.gz">
2078-
<sha256 value="f7133238a12714a62c5ad2bd4da6741130be1a82512065da9ca23dee26b2d3d3" origin="Generated by Gradle"/>
2079-
</artifact>
2080-
<artifact name="macos-24-x64.tar.gz">
2081-
<sha256 value="6bbfb1d01741cbe55ab90299cb91464b695de9a3ace85c15131aa2f50292f321" origin="Generated by Gradle"/>
2082-
</artifact>
2083-
</component>
2084-
<component group="openjdk_24" name="windows" version="24">
2085-
<artifact name="windows-24-x64.zip">
2086-
<sha256 value="11d1d9f6ac272d5361c8a0bef01894364081c7fb1a6914c2ad2fc312ae83d63b" origin="Generated by Gradle"/>
2087-
</artifact>
2088-
</component>
20892005
<component group="org.abego.treelayout" name="org.abego.treelayout.core" version="1.0.3">
20902006
<artifact name="org.abego.treelayout.core-1.0.3.jar">
20912007
<sha256 value="fa5e31395c39c2e7d46aca0f81f72060931607b2fa41bd36038eb2cb6fb93326" origin="Generated by Gradle"/>

0 commit comments

Comments
 (0)