Browse Source

Upgrade bundled JDK to Java 17 (#78197)

* Upgrade bundled JDK to Java 17

* Update docs/changelog/78197.yaml

* Update docs/changelog/78197.yaml

* Fix darwin aarch64 distribution

* Fix for real this time

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Mark Vieira 4 years ago
parent
commit
5bb227dbad

+ 2 - 3
build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/JdkDownloadPlugin.java

@@ -133,12 +133,11 @@ public class JdkDownloadPlugin implements Plugin<Project> {
             // The following is an absolute hack until Adoptium provides Apple aarch64 builds
             String zuluPathSuffix = jdk.getPlatform().equals("linux") ? "-embedded" : "";
             switch (jdk.getMajor()) {
+                case "17": // More hack until adoptium builds are out
                 case "16":
                     artifactPattern = "zulu"
                         + zuluPathSuffix
-                        + "/bin/zulu"
-                        + jdk.getMajor()
-                        + ".32.15-ca-jdk16.0.2-"
+                        + "/bin/zulu16.32.15-ca-jdk16.0.2-"
                         + azulPlatform(jdk)
                         + "_[classifier].[ext]";
                     break;

+ 1 - 1
build-tools-internal/version.properties

@@ -2,7 +2,7 @@ elasticsearch     = 8.0.0
 lucene            = 9.0.0-snapshot-32a0a16aff0
 
 bundled_jdk_vendor = adoptium
-bundled_jdk = 16.0.2+7
+bundled_jdk = 17+35
 
 checkstyle = 8.42
 

+ 6 - 0
docs/changelog/78197.yaml

@@ -0,0 +1,6 @@
+pr: 78197
+summary: Upgrade bundled JDK to Java 17
+area: Packaging
+type: upgrade
+issues:
+ - 78168