[7.15] Upgrade bundled JDK to Java 17 (#78197) (#78207)

elastic · Sep 22, 2021 · f4b2e82 · f4b2e82
1 parent 4a67408
commit f4b2e82
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties
@@ -2,7 +2,7 @@ elasticsearch     = 7.15.1
 lucene            = 8.9.0
 
 bundled_jdk_vendor = adoptium
-bundled_jdk = 16.0.2+7
+bundled_jdk = 17+35
 
 checkstyle = 8.39
 

diff --git a/build-tools/src/main/java/org/elasticsearch/gradle/JdkDownloadPlugin.java b/build-tools/src/main/java/org/elasticsearch/gradle/JdkDownloadPlugin.java
@@ -132,12 +132,11 @@ private void setupRepository(Project project, Jdk jdk) {
             // The following is an absolute hack until Adoptium provides Apple aarch64 builds
             String zuluPathSuffix = jdk.getPlatform().equals("linux") ? "-embedded" : "";
             switch (jdk.getMajor()) {
+                case "17":
                 case "16":
                     artifactPattern = "zulu"
                         + zuluPathSuffix
-                        + "/bin/zulu"
-                        + jdk.getMajor()
-                        + ".28.11-ca-jdk16.0.0-"
+                        + "/bin/zulu16.28.11-ca-jdk16.0.0-"
                         + azulPlatform(jdk)
                         + "_[classifier].[ext]";
                     break;