From 5c00587edf70f30ffb4a22c19d9212643d351ea9 Mon Sep 17 00:00:00 2001 From: Rory Hunter Date: Wed, 25 Aug 2021 17:07:04 +0100 Subject: [PATCH] Update Azul JVM on Apple M1 (#76923) Closes #76901. Bump the Azul JVM version for aarch64 M1 i.e. Apple silicon. --- .../gradle/internal/JdkDownloadPluginFuncTest.groovy | 4 ++-- .../org/elasticsearch/gradle/internal/JdkDownloadPlugin.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/JdkDownloadPluginFuncTest.groovy b/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/JdkDownloadPluginFuncTest.groovy index 62bb3f917df8..f92931f86292 100644 --- a/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/JdkDownloadPluginFuncTest.groovy +++ b/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/JdkDownloadPluginFuncTest.groovy @@ -214,8 +214,8 @@ class JdkDownloadPluginFuncTest extends AbstractGradleFuncTest { return "/java/GA/" + versionPath + "/GPL/" + filename; } else if (vendor.equals(VENDOR_AZUL)) { final String module = isMac(platform) ? "macosx" : platform; - // we only test zulu 15 darwin aarch64 for now - return "/zulu${module.equals('linux') ? '-embedded' : ''}/bin/zulu16.28.11-ca-jdk16.0.0-${module}_${arch}.tar.gz"; + // we only test zulu 16 darwin aarch64 for now + return "/zulu${module.equals('linux') ? '-embedded' : ''}/bin/zulu16.32.15-ca-jdk16.0.2-${module}_${arch}.tar.gz"; } } diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/JdkDownloadPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/JdkDownloadPlugin.java index 310703082edd..c2043f15a577 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/JdkDownloadPlugin.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/JdkDownloadPlugin.java @@ -138,7 +138,7 @@ public class JdkDownloadPlugin implements Plugin { + zuluPathSuffix + "/bin/zulu" + jdk.getMajor() - + ".28.11-ca-jdk16.0.0-" + + ".32.15-ca-jdk16.0.2-" + azulPlatform(jdk) + "_[classifier].[ext]"; break;