Skip to content

Commit 1543e04

Browse files
Bump bundled JDK to 24 RC (elastic#123452) (elastic#124138)
Co-authored-by: Elastic Machine <[email protected]>
1 parent aced4fc commit 1543e04

File tree

4 files changed

+26
-2
lines changed

4 files changed

+26
-2
lines changed

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/toolchain/OracleOpenJdkToolchainResolver.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@ private static String resolveBuildNumber(int version) {
114114

115115
// package private so it can be replaced by tests
116116
List<JdkBuild> builds = List.of(
117-
getBundledJdkBuild(),
117+
// TODO: re-enable once jdk 24 is GA
118+
// getBundledJdkBuild(),
118119
// release candidate of JDK 24
119120
new ReleaseJdkBuild(JavaLanguageVersion.of(24), "download.java.net", "24", "36", "1f9ff9062db4449d8ca828c504ffae90"),
120121
new EarlyAccessJdkBuild(JavaLanguageVersion.of(25))

build-tools-internal/version.properties

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

44
bundled_jdk_vendor = openjdk
5-
bundled_jdk = 23+37@3c5b90190c68498b986a97f276efd28a
5+
bundled_jdk = 24+36@1f9ff9062db4449d8ca828c504ffae90
66
# optional dependencies
77
spatial4j = 0.7
88
jts = 1.15.0

distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/SystemJvmOptions.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ static List<String> systemJvmOptions(Settings nodeSettings, final Map<String, St
6767
"-Dlog4j2.disable.jmx=true",
6868
"-Dlog4j2.formatMsgNoLookups=true",
6969
"-Djava.locale.providers=" + getLocaleProviders(),
70+
// Enable vectorization for whatever version we are running. This ensures we use vectorization even when running EA builds.
71+
"-Dorg.apache.lucene.vectorization.upperJavaFeatureVersion=" + Runtime.version().feature(),
7072
// Pass through distribution type
7173
"-Des.distribution.type=" + distroType
7274
),

gradle/verification-metadata.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1850,6 +1850,27 @@
18501850
<sha256 value="cba5013874ba50cae543c86fe6423453816c77281e2751a8a9a633d966f1dc04" origin="Generated by Gradle"/>
18511851
</artifact>
18521852
</component>
1853+
<component group="openjdk_24" name="linux" version="24">
1854+
<artifact name="linux-24-aarch64.tar.gz">
1855+
<sha256 value="a03867ed061c7bb661231e62b0967ff5a5a0b1bbaa37bdead3a924bd2ba3215f" origin="Generated by Gradle"/>
1856+
</artifact>
1857+
<artifact name="linux-24-x64.tar.gz">
1858+
<sha256 value="88b090fa80c6c1d084ec9a755233967458788e2c0777ae2e172230c5c692d7ef" origin="Generated by Gradle"/>
1859+
</artifact>
1860+
</component>
1861+
<component group="openjdk_24" name="macos" version="24">
1862+
<artifact name="macos-24-aarch64.tar.gz">
1863+
<sha256 value="f7133238a12714a62c5ad2bd4da6741130be1a82512065da9ca23dee26b2d3d3" origin="Generated by Gradle"/>
1864+
</artifact>
1865+
<artifact name="macos-24-x64.tar.gz">
1866+
<sha256 value="6bbfb1d01741cbe55ab90299cb91464b695de9a3ace85c15131aa2f50292f321" origin="Generated by Gradle"/>
1867+
</artifact>
1868+
</component>
1869+
<component group="openjdk_24" name="windows" version="24">
1870+
<artifact name="windows-24-x64.zip">
1871+
<sha256 value="11d1d9f6ac272d5361c8a0bef01894364081c7fb1a6914c2ad2fc312ae83d63b" origin="Generated by Gradle"/>
1872+
</artifact>
1873+
</component>
18531874
<component group="org.abego.treelayout" name="org.abego.treelayout.core" version="1.0.3">
18541875
<artifact name="org.abego.treelayout.core-1.0.3.jar">
18551876
<sha256 value="fa5e31395c39c2e7d46aca0f81f72060931607b2fa41bd36038eb2cb6fb93326" origin="Generated by Gradle"/>

0 commit comments

Comments
 (0)