Browse Source

Upgrade bundled JDK to Java 16 (#70502)

Mark Vieira 4 năm trước cách đây
mục cha
commit
00b19d6319

+ 2 - 2
buildSrc/src/integTest/groovy/org/elasticsearch/gradle/JdkDownloadPluginFuncTest.groovy

@@ -32,7 +32,7 @@ class JdkDownloadPluginFuncTest extends AbstractGradleFuncTest {
     private static final String ADOPT_JDK_VERSION_11 = "11.0.10+9"
     private static final String ADOPT_JDK_VERSION_15 = "15.0.2+7"
     private static final String OPEN_JDK_VERSION = "12.0.1+99@123456789123456789123456789abcde"
-    private static final String AZUL_AARCH_VERSION = "15.0.1+99@123456789123456789123456789abcde"
+    private static final String AZUL_AARCH_VERSION = "16.0.1+99@123456789123456789123456789abcde"
     private static final Pattern JDK_HOME_LOGLINE = Pattern.compile("JDK HOME: (.*)");
 
     @Unroll
@@ -215,7 +215,7 @@ class JdkDownloadPluginFuncTest extends AbstractGradleFuncTest {
         } 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/zulu15.29.15-ca-jdk15.0.2-${module}_${arch}.tar.gz";
+            return "/zulu${module.equals('linux') ? '-embedded' : ''}/bin/zulu16.28.11-ca-jdk16.0.0-${module}_${arch}.tar.gz";
         }
     }
 

+ 2 - 2
buildSrc/src/main/java/org/elasticsearch/gradle/JdkDownloadPlugin.java

@@ -133,12 +133,12 @@ public class JdkDownloadPlugin implements Plugin<Project> {
             // The following is an absolute hack until AdoptOpenJdk provides Apple aarch64 builds
             String zuluPathSuffix = jdk.getPlatform().equals("linux") ? "-embedded" : "";
             switch (jdk.getMajor()) {
-                case "15":
+                case "16":
                     artifactPattern = "zulu"
                         + zuluPathSuffix
                         + "/bin/zulu"
                         + jdk.getMajor()
-                        + ".29.15-ca-jdk15.0.2-"
+                        + ".28.11-ca-jdk16.0.0-"
                         + azulPlatform(jdk)
                         + "_[classifier].[ext]";
                     break;

+ 1 - 1
buildSrc/version.properties

@@ -2,7 +2,7 @@ elasticsearch     = 8.0.0
 lucene            = 8.8.0
 
 bundled_jdk_vendor = adoptopenjdk
-bundled_jdk = 15.0.1+9
+bundled_jdk = 16+36
 
 checkstyle = 8.39
 

+ 3 - 0
qa/os/src/test/java/org/elasticsearch/packaging/test/QuotaAwareFsTests.java

@@ -24,12 +24,14 @@ import java.util.List;
 import java.util.Locale;
 import java.util.stream.Collectors;
 
+import static org.elasticsearch.packaging.util.Distribution.Platform.WINDOWS;
 import static org.hamcrest.Matchers.arrayContaining;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.not;
+import static org.junit.Assume.assumeFalse;
 import static org.junit.Assume.assumeTrue;
 
 /**
@@ -48,6 +50,7 @@ public class QuotaAwareFsTests extends PackagingTestCase {
     @BeforeClass
     public static void filterDistros() {
         assumeTrue("only archives", distribution.isArchive());
+        assumeFalse("not on windows", distribution.platform == WINDOWS);
     }
 
     @After