Skip to content

Commit 2f90bbf

Browse files
committed
Bump bundled JDK to JDK 13.0.1+9 (#48587)
This commit bumps the bundled JDK to 13.0.1+9. Since AdoptOpenJDK did not release 13.0.1+9 for Windows, this commit also enables that the bundled JDK version can vary by platform.
1 parent f34f383 commit 2f90bbf

File tree

3 files changed

+21
-6
lines changed

3 files changed

+21
-6
lines changed

buildSrc/src/minimumRuntime/java/org/elasticsearch/gradle/VersionProperties.java

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,17 @@ public static String getLucene() {
1919
return lucene;
2020
}
2121

22-
public static String getBundledJdk() {
23-
return bundledJdk;
22+
public static String getBundledJdk(final String platform) {
23+
switch (platform) {
24+
case "darwin":
25+
return bundledJdkDarwin;
26+
case "linux":
27+
return bundledJdkLinux;
28+
case "windows":
29+
return bundledJdkWindows;
30+
default:
31+
throw new IllegalArgumentException("unknown platform [" + platform + "]");
32+
}
2433
}
2534

2635
public static String getBundledJdkVendor() {
@@ -33,7 +42,9 @@ public static Map<String, String> getVersions() {
3342

3443
private static final String elasticsearch;
3544
private static final String lucene;
36-
private static final String bundledJdk;
45+
private static final String bundledJdkDarwin;
46+
private static final String bundledJdkLinux;
47+
private static final String bundledJdkWindows;
3748
private static final String bundledJdkVendor;
3849
private static final Map<String, String> versions = new HashMap<String, String>();
3950

@@ -42,7 +53,10 @@ public static Map<String, String> getVersions() {
4253
elasticsearch = props.getProperty("elasticsearch");
4354
lucene = props.getProperty("lucene");
4455
bundledJdkVendor = props.getProperty("bundled_jdk_vendor");
45-
bundledJdk = props.getProperty("bundled_jdk");
56+
final String bundledJdk = props.getProperty("bundled_jdk");
57+
bundledJdkDarwin = props.getProperty("bundled_jdk_darwin", bundledJdk);
58+
bundledJdkLinux = props.getProperty("bundled_jdk_linux", bundledJdk);
59+
bundledJdkWindows = props.getProperty("bundled_jdk_windows", bundledJdk);
4660

4761
for (String property : props.stringPropertyNames()) {
4862
versions.put(property, props.getProperty(property));

buildSrc/version.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ elasticsearch = 7.4.2
22
lucene = 8.2.0
33

44
bundled_jdk_vendor = adoptopenjdk
5-
bundled_jdk = 13+33
5+
bundled_jdk = 13.0.1+9
6+
bundled_jdk_windows = 13+33
67

78
# optional dependencies
89
spatial4j = 0.7

distribution/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
390390
project.jdks {
391391
"bundled_${platform}" {
392392
it.platform = platform
393-
it.version = VersionProperties.bundledJdk
393+
it.version = VersionProperties.getBundledJdk(platform)
394394
it.vendor = VersionProperties.bundledJdkVendor
395395
}
396396
}

0 commit comments

Comments
 (0)