Switch to OpenJDK and upgrade to 18.0.1 (#86554)

Adoptium releases are very slow to release across multiple platforms. Switch back to Oracle's OpenJDK releases and upgrade.
elastic · May 9, 2022 · 6bef2b5 · 6bef2b5
1 parent 06b3500
commit 6bef2b5
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 6 deletions.
diff --git a/...l/src/integTest/groovy/org/elasticsearch/gradle/internal/JdkDownloadPluginFuncTest.groovy b/...l/src/integTest/groovy/org/elasticsearch/gradle/internal/JdkDownloadPluginFuncTest.groovy
@@ -206,7 +206,7 @@ class JdkDownloadPluginFuncTest extends AbstractGradleFuncTest {
             final String module = isMac(platform) ? "mac" : platform;
             return "/jdk-" + version + "/" + module + "/${arch}/jdk/hotspot/normal/adoptium";
         } else if (vendor.equals(VENDOR_OPENJDK)) {
-            final String effectivePlatform = isMac(platform) ? "osx" : platform;
+            final String effectivePlatform = isMac(platform) ? "macos" : platform;
             final boolean isOld = version.equals(OPENJDK_VERSION_OLD);
             final String versionPath = isOld ? "jdk1/99" : "jdk12.0.1/123456789123456789123456789abcde/99";
             final String filename = "openjdk-" + (isOld ? "1" : "12.0.1") + "_" + effectivePlatform + "-x64_bin." + extension(platform);
@@ -215,14 +215,21 @@ class JdkDownloadPluginFuncTest extends AbstractGradleFuncTest {
     }
 
     private static byte[] filebytes(final String vendor, final String platform) throws IOException {
-        final String effectivePlatform = isMac(platform) ? "osx" : platform;
+        final String effectivePlatform = getPlatform(vendor, platform);
         if (vendor.equals(VENDOR_ADOPTIUM)) {
             return JdkDownloadPluginFuncTest.class.getResourceAsStream("fake_adoptium_" + effectivePlatform + "." + extension(platform)).getBytes()
         } else if (vendor.equals(VENDOR_OPENJDK)) {
             JdkDownloadPluginFuncTest.class.getResourceAsStream("fake_openjdk_" + effectivePlatform + "." + extension(platform)).getBytes()
         }
     }
 
+    private static String getPlatform(String vendor, String platform) {
+        if (isMac(platform)) {
+            return vendor.equals(VENDOR_ADOPTIUM) ? "osx" : "macos";
+        }
+        return platform;
+    }
+
     private static boolean isMac(String platform) {
         platform.equals("darwin") || platform.equals("mac")
     }

diff --git a/...ernal/src/integTest/resources/org/elasticsearch/gradle/internal/fake_openjdk_macos.tar.gz b/...ernal/src/integTest/resources/org/elasticsearch/gradle/internal/fake_openjdk_macos.tar.gz
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/Jdk.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/Jdk.java
@@ -25,7 +25,9 @@ public class Jdk implements Buildable, Iterable<File> {
     private static final List<String> ALLOWED_ARCHITECTURES = List.of("aarch64", "x64");
     private static final List<String> ALLOWED_VENDORS = List.of("adoptium", "openjdk");
     private static final List<String> ALLOWED_PLATFORMS = List.of("darwin", "linux", "windows", "mac");
-    private static final Pattern VERSION_PATTERN = Pattern.compile("(\\d+)(\\.\\d+\\.\\d+)?\\+(\\d+(?:\\.\\d+)?)(@([a-f0-9]{32}))?");
+    private static final Pattern VERSION_PATTERN = Pattern.compile(
+        "(\\d+)(\\.\\d+\\.\\d+(?:\\.\\d+)?)?\\+(\\d+(?:\\.\\d+)?)(@([a-f0-9]{32}))?"
+    );
     private static final Pattern LEGACY_VERSION_PATTERN = Pattern.compile("(\\d)(u\\d+)\\+(b\\d+?)(@([a-f0-9]{32}))?");
 
     private final String name;

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
@@ -148,7 +148,7 @@ public static NamedDomainObjectContainer<Jdk> getContainer(Project project) {
 
     private static String dependencyNotation(Jdk jdk) {
         String platformDep = jdk.getPlatform().equals("darwin") || jdk.getPlatform().equals("mac")
-            ? (jdk.getVendor().equals(VENDOR_ADOPTIUM) ? "mac" : "osx")
+            ? (jdk.getVendor().equals(VENDOR_ADOPTIUM) ? "mac" : "macos")
             : jdk.getPlatform();
         String extension = jdk.getPlatform().equals("windows") ? "zip" : "tar.gz";
 

diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties
@@ -1,8 +1,8 @@
 elasticsearch     = 8.2.1
 lucene            = 9.1.0
 
-bundled_jdk_vendor = adoptium
-bundled_jdk = 18+36
+bundled_jdk_vendor = openjdk
+bundled_jdk = 18.0.1.1+2@65ae32619e2f40f3a9af3af1851d6e19
 
 checkstyle = 9.3
 

diff --git a/docs/changelog/86554.yaml b/docs/changelog/86554.yaml
@@ -0,0 +1,5 @@
+pr: 86554
+summary: Switch to OpenJDK and upgrade to 18.0.1
+area: Packaging
+type: upgrade
+issues: []