Use Adoptium builds for bundled JDK (#76631)

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

@@ -21,7 +21,7 @@ import java.nio.file.Paths
 import java.util.regex.Matcher
 import java.util.regex.Pattern
 
-import static org.elasticsearch.gradle.internal.JdkDownloadPlugin.VENDOR_ADOPTOPENJDK
+import static org.elasticsearch.gradle.internal.JdkDownloadPlugin.VENDOR_ADOPTIUM
 import static org.elasticsearch.gradle.internal.JdkDownloadPlugin.VENDOR_OPENJDK
 import static org.elasticsearch.gradle.internal.JdkDownloadPlugin.VENDOR_AZUL
 
@@ -73,21 +73,21 @@ class JdkDownloadPluginFuncTest extends AbstractGradleFuncTest {
 
         where:
         platform  | arch      | jdkVendor           | jdkVersion           | expectedJavaBin          | suffix
-        "linux"   | "x64"     | VENDOR_ADOPTOPENJDK | ADOPT_JDK_VERSION    | "bin/java"               | ""
+        "linux"   | "x64"     | VENDOR_ADOPTIUM     | ADOPT_JDK_VERSION    | "bin/java"               | ""
         "linux"   | "x64"     | VENDOR_OPENJDK      | OPEN_JDK_VERSION     | "bin/java"               | ""
         "linux"   | "x64"     | VENDOR_OPENJDK      | OPENJDK_VERSION_OLD  | "bin/java"               | "(old version)"
-        "windows" | "x64"     | VENDOR_ADOPTOPENJDK | ADOPT_JDK_VERSION    | "bin/java"               | ""
+        "windows" | "x64"     | VENDOR_ADOPTIUM     | ADOPT_JDK_VERSION    | "bin/java"               | ""
         "windows" | "x64"     | VENDOR_OPENJDK      | OPEN_JDK_VERSION     | "bin/java"               | ""
         "windows" | "x64"     | VENDOR_OPENJDK      | OPENJDK_VERSION_OLD  | "bin/java"               | "(old version)"
-        "darwin"  | "x64"     | VENDOR_ADOPTOPENJDK | ADOPT_JDK_VERSION    | "Contents/Home/bin/java" | ""
+        "darwin"  | "x64"     | VENDOR_ADOPTIUM     | ADOPT_JDK_VERSION    | "Contents/Home/bin/java" | ""
         "darwin"  | "x64"     | VENDOR_OPENJDK      | OPEN_JDK_VERSION     | "Contents/Home/bin/java" | ""
         "darwin"  | "x64"     | VENDOR_OPENJDK      | OPENJDK_VERSION_OLD  | "Contents/Home/bin/java" | "(old version)"
         "mac"     | "x64"     | VENDOR_OPENJDK      | OPEN_JDK_VERSION     | "Contents/Home/bin/java" | ""
         "mac"     | "x64"     | VENDOR_OPENJDK      | OPENJDK_VERSION_OLD  | "Contents/Home/bin/java" | "(old version)"
         "darwin"  | "aarch64" | VENDOR_AZUL         | AZUL_AARCH_VERSION   | "Contents/Home/bin/java" | ""
         "linux"   | "aarch64" | VENDOR_AZUL         | AZUL_AARCH_VERSION   | "bin/java"               | ""
-        "linux"   | "aarch64" | VENDOR_ADOPTOPENJDK | ADOPT_JDK_VERSION_11 | "bin/java"               | "(jdk 11)"
-        "linux"   | "aarch64" | VENDOR_ADOPTOPENJDK | ADOPT_JDK_VERSION_15 | "bin/java"               | "(jdk 15)"
+        "linux"   | "aarch64" | VENDOR_ADOPTIUM     | ADOPT_JDK_VERSION_11 | "bin/java"               | "(jdk 11)"
+        "linux"   | "aarch64" | VENDOR_ADOPTIUM     | ADOPT_JDK_VERSION_15 | "bin/java"               | "(jdk 15)"
     }
 
     def "transforms are reused across projects"() {
@@ -136,14 +136,14 @@ class JdkDownloadPluginFuncTest extends AbstractGradleFuncTest {
 
         where:
         platform | jdkVendor           | jdkVersion        | expectedJavaBin
-        "linux"  | VENDOR_ADOPTOPENJDK | ADOPT_JDK_VERSION | "bin/java"
+        "linux"  | VENDOR_ADOPTIUM | ADOPT_JDK_VERSION | "bin/java"
     }
 
     @Unroll
     def "transforms of type #transformType are kept across builds"() {
         given:
-        def mockRepoUrl = urlPath(VENDOR_ADOPTOPENJDK, ADOPT_JDK_VERSION, platform)
-        def mockedContent = filebytes(VENDOR_ADOPTOPENJDK, platform)
+        def mockRepoUrl = urlPath(VENDOR_ADOPTIUM, ADOPT_JDK_VERSION, platform)
+        def mockedContent = filebytes(VENDOR_ADOPTIUM, platform)
         buildFile.text = """
             plugins {
              id 'elasticsearch.jdk-download'
@@ -153,7 +153,7 @@ class JdkDownloadPluginFuncTest extends AbstractGradleFuncTest {
 
             jdks {
               myJdk {
-                vendor = '$VENDOR_ADOPTOPENJDK'
+                vendor = '$VENDOR_ADOPTIUM'
                 version = '$ADOPT_JDK_VERSION'
                 platform = "$platform"
                 architecture = "x64"
@@ -170,7 +170,7 @@ class JdkDownloadPluginFuncTest extends AbstractGradleFuncTest {
 
         when:
         def result = WiremockFixture.withWireMock(mockRepoUrl, mockedContent) { server ->
-            buildFile << repositoryMockSetup(server, VENDOR_ADOPTOPENJDK, ADOPT_JDK_VERSION)
+            buildFile << repositoryMockSetup(server, VENDOR_ADOPTIUM, ADOPT_JDK_VERSION)
 
             def commonGradleUserHome = testProjectDir.newFolder().toString()
             // initial run
@@ -203,9 +203,9 @@ class JdkDownloadPluginFuncTest extends AbstractGradleFuncTest {
                                   final String version,
                                   final String platform,
                                   final String arch = 'x64') {
-        if (vendor.equals(VENDOR_ADOPTOPENJDK)) {
+        if (vendor.equals(VENDOR_ADOPTIUM)) {
             final String module = isMac(platform) ? "mac" : platform;
-            return "/jdk-" + version + "/" + module + "/${arch}/jdk/hotspot/normal/adoptopenjdk";
+            return "/jdk-" + version + "/" + module + "/${arch}/jdk/hotspot/normal/adoptium";
         } else if (vendor.equals(VENDOR_OPENJDK)) {
             final String effectivePlatform = isMac(platform) ? "osx" : platform;
             final boolean isOld = version.equals(OPENJDK_VERSION_OLD);
@@ -221,8 +221,8 @@ class JdkDownloadPluginFuncTest extends AbstractGradleFuncTest {
 
     private static byte[] filebytes(final String vendor, final String platform) throws IOException {
         final String effectivePlatform = isMac(platform) ? "osx" : platform;
-        if (vendor.equals(VENDOR_ADOPTOPENJDK)) {
-            return JdkDownloadPluginFuncTest.class.getResourceAsStream("fake_adoptopenjdk_" + effectivePlatform + "." + extension(platform)).getBytes()
+        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()
         } else if (vendor.equals(VENDOR_AZUL)) {

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/Jdk.java

@@ -23,7 +23,7 @@ import java.util.regex.Pattern;
 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("adoptopenjdk", "openjdk", "azul");
+    private static final List<String> ALLOWED_VENDORS = List.of("adoptium", "openjdk", "azul");
     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 LEGACY_VERSION_PATTERN = Pattern.compile("(\\d)(u\\d+)\\+(b\\d+?)(@([a-f0-9]{32}))?");

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

@@ -26,7 +26,7 @@ import java.util.Arrays;
 
 public class JdkDownloadPlugin implements Plugin<Project> {
 
-    public static final String VENDOR_ADOPTOPENJDK = "adoptopenjdk";
+    public static final String VENDOR_ADOPTIUM = "adoptium";
     public static final String VENDOR_OPENJDK = "openjdk";
     public static final String VENDOR_AZUL = "azul";
 
@@ -86,28 +86,28 @@ public class JdkDownloadPlugin implements Plugin<Project> {
         /*
          * Define the appropriate repository for the given JDK vendor and version
          *
-         * For Oracle/OpenJDK/AdoptOpenJDK we define a repository per-version.
+         * For Oracle/OpenJDK/Adoptium we define a repository per-version.
          */
         String repoName = REPO_NAME_PREFIX + jdk.getVendor() + "_" + jdk.getVersion();
         String repoUrl;
         String artifactPattern;
 
-        if (jdk.getVendor().equals(VENDOR_ADOPTOPENJDK)) {
-            repoUrl = "https://api.adoptopenjdk.net/v3/binary/version/";
+        if (jdk.getVendor().equals(VENDOR_ADOPTIUM)) {
+            repoUrl = "https://api.adoptium.net/v3/binary/version/";
             if (jdk.getMajor().equals("8")) {
                 // legacy pattern for JDK 8
                 artifactPattern = "jdk"
                     + jdk.getBaseVersion()
                     + "-"
                     + jdk.getBuild()
-                    + "/[module]/[classifier]/jdk/hotspot/normal/adoptopenjdk";
+                    + "/[module]/[classifier]/jdk/hotspot/normal/adoptium";
             } else {
                 // current pattern since JDK 9
                 artifactPattern = "jdk-"
                     + jdk.getBaseVersion()
                     + "+"
                     + jdk.getBuild()
-                    + "/[module]/[classifier]/jdk/hotspot/normal/adoptopenjdk";
+                    + "/[module]/[classifier]/jdk/hotspot/normal/adoptium";
             }
         } else if (jdk.getVendor().equals(VENDOR_OPENJDK)) {
             repoUrl = "https://download.oracle.com";
@@ -130,7 +130,7 @@ public class JdkDownloadPlugin implements Plugin<Project> {
             }
         } else if (jdk.getVendor().equals(VENDOR_AZUL)) {
             repoUrl = "https://cdn.azul.com";
-            // The following is an absolute hack until AdoptOpenJdk provides Apple aarch64 builds
+            // The following is an absolute hack until Adoptium provides Apple aarch64 builds
             String zuluPathSuffix = jdk.getPlatform().equals("linux") ? "-embedded" : "";
             switch (jdk.getMajor()) {
                 case "16":
@@ -189,7 +189,7 @@ public class JdkDownloadPlugin implements Plugin<Project> {
 
     private static String dependencyNotation(Jdk jdk) {
         String platformDep = jdk.getPlatform().equals("darwin") || jdk.getPlatform().equals("mac")
-            ? (jdk.getVendor().equals(VENDOR_ADOPTOPENJDK) ? "mac" : "osx")
+            ? (jdk.getVendor().equals(VENDOR_ADOPTIUM) ? "mac" : "osx")
             : jdk.getPlatform();
         String extension = jdk.getPlatform().equals("windows") ? "zip" : "tar.gz";
 

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/DistroTestPlugin.java

@@ -67,8 +67,8 @@ import static org.elasticsearch.gradle.internal.vagrant.VagrantMachine.convertWi
 public class DistroTestPlugin implements Plugin<Project> {
     private static final String SYSTEM_JDK_VERSION = "11.0.2+9";
     private static final String SYSTEM_JDK_VENDOR = "openjdk";
-    private static final String GRADLE_JDK_VERSION = "16.0.1+9";
-    private static final String GRADLE_JDK_VENDOR = "adoptopenjdk";
+    private static final String GRADLE_JDK_VERSION = "16.0.2+7";
+    private static final String GRADLE_JDK_VENDOR = "adoptium";
 
     // all distributions used by distro tests. this is temporary until tests are per distribution
     private static final String EXAMPLE_PLUGIN_CONFIGURATION = "examplePlugin";

build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/JdkDownloadPluginTests.java

@@ -36,7 +36,7 @@ public class JdkDownloadPluginTests extends GradleUnitTestCase {
             "11.0.2+33",
             "linux",
             "x64",
-            "unknown vendor [unknown] for jdk [testjdk], must be one of [adoptopenjdk, openjdk, azul]"
+            "unknown vendor [unknown] for jdk [testjdk], must be one of [adoptium, openjdk, azul]"
         );
     }
 

build-tools-internal/version.properties

@@ -1,8 +1,8 @@
 elasticsearch     = 8.0.0
 lucene            = 8.9.0
 
-bundled_jdk_vendor = openjdk
-bundled_jdk = 16.0.2+7@d4a915d82b4c4fbb9bde534da945d746
+bundled_jdk_vendor = adoptium
+bundled_jdk = 16.0.2+7
 
 checkstyle = 8.42
 

modules/reindex/build.gradle

@@ -84,8 +84,8 @@ dependencies {
 
 jdks {
   legacy {
-    vendor = 'adoptopenjdk'
-    version = '8u242+b08'
+    vendor = 'adoptium'
+    version = '8u302+b08'
     platform = OS.current().name().toLowerCase()
     architecture = Architecture.current().name().toLowerCase()
   }