github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-04-24 23:27:25 -04:00
Code Issues Projects Releases Packages Wiki Activity

Update Azul JVM on Apple M1 (#76923)

Browse source 
Closes #76901. Bump the Azul JVM version for aarch64 M1 i.e. Apple silicon.
This commit is contained in:
Rory Hunter 2021-08-25 17:07:04 +01:00 • committed by GitHub
parent 9389396183
commit 5c00587edf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/JdkDownloadPluginFuncTest.groovy
View file

@ -214,8 +214,8 @@ class JdkDownloadPluginFuncTest extends AbstractGradleFuncTest {
return "/java/GA/" + versionPath + "/GPL/" + filename; return "/java/GA/" + versionPath + "/GPL/" + filename;
} else if (vendor.equals(VENDOR_AZUL)) { } else if (vendor.equals(VENDOR_AZUL)) {
final String module = isMac(platform) ? "macosx" : platform; final String module = isMac(platform) ? "macosx" : platform;
// we only test zulu 15 darwin aarch64 for now // we only test zulu 16 darwin aarch64 for now
return "/zulu${module.equals('linux') ? '-embedded' : ''}/bin/zulu16.28.11-ca-jdk16.0.0-${module}_${arch}.tar.gz"; return "/zulu${module.equals('linux') ? '-embedded' : ''}/bin/zulu16.32.15-ca-jdk16.0.2-${module}_${arch}.tar.gz";
} }
} }

2
build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/JdkDownloadPlugin.java
View file

@ -138,7 +138,7 @@ public class JdkDownloadPlugin implements Plugin<Project> {
+ zuluPathSuffix + zuluPathSuffix
+ "/bin/zulu" + "/bin/zulu"
+ jdk.getMajor() + jdk.getMajor()
+ ".28.11-ca-jdk16.0.0-" + ".32.15-ca-jdk16.0.2-"
+ azulPlatform(jdk) + azulPlatform(jdk)
+ "_[classifier].[ext]"; + "_[classifier].[ext]";
break; break;