Skip to content

Commit a0df97a

Browse files
committed
Add JDK 24 release candidate to toolchain resolver
1 parent 6315b8a commit a0df97a

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,15 @@ interface JdkBuild {
3333
String url(String os, String arch, String extension);
3434
}
3535

36-
record ReleasedJdkBuild(JavaLanguageVersion languageVersion, String version, String buildNumber, String hash) implements JdkBuild {
36+
record ReleaseJdkBuild(JavaLanguageVersion languageVersion, String host, String version, String buildNumber, String hash)
37+
implements
38+
JdkBuild {
3739

3840
@Override
3941
public String url(String os, String arch, String extension) {
40-
return "https://download.oracle.com/java/GA/jdk"
42+
return "https://"
43+
+ host
44+
+ "/java/GA/jdk"
4145
+ version
4246
+ "/"
4347
+ hash
@@ -111,7 +115,8 @@ private static String resolveBuildNumber(int version) {
111115
// package private so it can be replaced by tests
112116
List<JdkBuild> builds = List.of(
113117
getBundledJdkBuild(),
114-
new EarlyAccessJdkBuild(JavaLanguageVersion.of(24)),
118+
// release candidate of JDK 24
119+
new ReleaseJdkBuild(JavaLanguageVersion.of(24), "download.java.net", "24", "36", "1f9ff9062db4449d8ca828c504ffae90"),
115120
new EarlyAccessJdkBuild(JavaLanguageVersion.of(25))
116121
);
117122

@@ -125,7 +130,7 @@ private JdkBuild getBundledJdkBuild() {
125130
String baseVersion = jdkVersionMatcher.group(1) + (jdkVersionMatcher.group(2) != null ? (jdkVersionMatcher.group(2)) : "");
126131
String build = jdkVersionMatcher.group(3);
127132
String hash = jdkVersionMatcher.group(5);
128-
return new ReleasedJdkBuild(bundledJdkMajorVersion, baseVersion, build, hash);
133+
return new ReleaseJdkBuild(bundledJdkMajorVersion, "download.oracle.com", baseVersion, build, hash);
129134
}
130135

131136
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class OracleOpenJdkToolchainResolverSpec extends AbstractToolchainResolverSpec {
3131
}
3232
}
3333
toolChain.builds = toolChain.builds.findAll { it instanceof OracleOpenJdkToolchainResolver.EarlyAccessJdkBuild } + [
34-
new OracleOpenJdkToolchainResolver.ReleasedJdkBuild(
34+
new OracleOpenJdkToolchainResolver.ReleaseJdkBuild(
3535
JavaLanguageVersion.of(20),
3636
"20",
3737
"36",

0 commit comments

Comments
 (0)