Fix ea based distribution building

Author: breskeby

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

@@ -98,7 +98,6 @@ public GlobalBuildInfoPlugin(
 
     @Override
     public void apply(Project project) {
-
         if (project != project.getRootProject()) {
             throw new IllegalStateException(this.getClass().getName() + " can only be applied to the root project.");
         }
@@ -350,10 +349,10 @@ private RuntimeJava findRuntimeJavaHome() {
     }
 
     private RuntimeJava runtimeJavaHome(Provider<File> fileProvider, boolean explicitlySet) {
-        return runtimeJavaHome(fileProvider, explicitlySet, null);
+        return runtimeJavaHome(fileProvider, explicitlySet, null, null);
     }
 
-    private RuntimeJava runtimeJavaHome(Provider<File> fileProvider, boolean explicitlySet, String preReleasePostfix) {
+    private RuntimeJava runtimeJavaHome(Provider<File> fileProvider, boolean explicitlySet, String preReleasePostfix, Integer buildNumber) {
         Provider<JavaVersion> javaVersion = fileProvider.map(
             javaHome -> determineJavaVersion(
                 "runtime java.home",
@@ -367,19 +366,15 @@ private RuntimeJava runtimeJavaHome(Provider<File> fileProvider, boolean explici
         Provider<String> vendorDetails = fileProvider.map(j -> metadataDetector.getMetadata(getJavaInstallation(j)))
             .map(m -> formatJavaVendorDetails(m));
 
-        return new RuntimeJava(fileProvider, javaVersion, vendorDetails, explicitlySet, preReleasePostfix);
+        return new RuntimeJava(fileProvider, javaVersion, vendorDetails, explicitlySet, preReleasePostfix, buildNumber);
     }
 
     private RuntimeJava resolvePreReleaseRuntimeJavaHome(String runtimeJavaProperty) {
         var major = JavaLanguageVersion.of(Integer.parseInt(runtimeJavaProperty.substring(0, runtimeJavaProperty.length() - 4)));
         Integer buildNumber = Integer.getInteger("runtime.java.build");
         var jdkbuild = buildNumber == null ? findLatestPreReleaseBuild(major) : findPreReleaseBuild(major, buildNumber);
-        String prVersionString = String.format("%d-%s+%d", major.asInt(), jdkbuild.type(), jdkbuild.buildNumber());
-        return resolveJavaHomeFromJdkDownloadPlugin(jdkbuild.type(), major, prVersionString);
-
-    }
-
-    private RuntimeJava resolveJavaHomeFromJdkDownloadPlugin(String preReleaseType, JavaLanguageVersion major, String prVersionString) {
+        String preReleaseType = jdkbuild.type();
+        String prVersionString = String.format("%d-%s+%d", major.asInt(), preReleaseType, jdkbuild.buildNumber());
         NamedDomainObjectContainer<Jdk> container = (NamedDomainObjectContainer<Jdk>) project.getExtensions().getByName("jdks");
         Jdk jdk = container.create(preReleaseType + "_" + major.asInt(), j -> {
             j.setVersion(prVersionString);
@@ -391,7 +386,7 @@ private RuntimeJava resolveJavaHomeFromJdkDownloadPlugin(String preReleaseType,
         // We on purpose resolve this here eagerly to ensure we resolve the jdk configuration in the context of the root project.
         // If we keep this lazy we can not guarantee in which project context this is resolved which will fail the build.
         File file = new File(jdk.getJavaHomePath().toString());
-        return runtimeJavaHome(providers.provider(() -> file), true, preReleaseType);
+        return runtimeJavaHome(providers.provider(() -> file), true, preReleaseType, jdkbuild.buildNumber());
     }
 
     private Provider<File> resolveJavaHomeFromToolChainService(String version) {

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

@@ -21,23 +21,26 @@ public class RuntimeJava {
     private final boolean explicitlySet;
     private final String preReleaseType;
     private final Provider<String> vendorDetails;
+    private final Integer buildNumber;
 
     RuntimeJava(Provider<File> javahome, Provider<JavaVersion> javaVersion, Provider<String> vendorDetails, boolean explicitlySet) {
-        this(javahome, javaVersion, vendorDetails, explicitlySet, null);
+        this(javahome, javaVersion, vendorDetails, explicitlySet, null, null);
     }
 
     RuntimeJava(
         Provider<File> javahome,
         Provider<JavaVersion> javaVersion,
         Provider<String> vendorDetails,
         boolean explicitlySet,
-        String preReleaseType
+        String preReleaseType,
+        Integer buildNumber
     ) {
         this.javahome = javahome;
         this.javaVersion = javaVersion;
         this.vendorDetails = vendorDetails;
         this.explicitlySet = explicitlySet;
         this.preReleaseType = preReleaseType;
+        this.buildNumber = buildNumber;
     }
 
     public Provider<File> getJavahome() {
@@ -63,4 +66,8 @@ public boolean isExplicitlySet() {
     public String getPreReleaseType() {
         return preReleaseType;
     }
+
+    public Integer getBuildNumber() {
+        return buildNumber;
+    }
 }

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

@@ -142,7 +142,6 @@ static List<PreReleaseJdkBuild> findRecentPreReleaseBuild(JavaLanguageVersion la
                 ObjectMapper mapper = new ObjectMapper();
                 JsonNode node = mapper.readTree(is);
                 ObjectNode majors = (ObjectNode) node.get("majors");
-                System.out.println(majors.getClass());
                 ObjectNode perVersion = (ObjectNode) majors.get("" + languageVersion.asInt());
                 ArrayNode buildsNode = (ArrayNode) perVersion.get("builds");
                 List<JsonNode> buildsList = new ArrayList<>();

distribution/build.gradle

@@ -20,7 +20,7 @@ import org.elasticsearch.gradle.transform.FilteringJarTransform
 import java.nio.file.Files
 import java.nio.file.Path
 
-import static org.elasticsearch.gradle.internal.toolchain.EarlyAccessCatalogJdkToolchainResolver.findLatestPreReleaseBuildNumber
+import static org.elasticsearch.gradle.internal.toolchain.EarlyAccessCatalogJdkToolchainResolver.findLatestPreReleaseBuild
 
 plugins {
   id 'base'
@@ -250,13 +250,9 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
   apply plugin: 'elasticsearch.repositories'
 
   if (buildParams.runtimeJava.preRelease) {
-    Integer buildNumber = Integer.getInteger("runtime.java.build")
     String preReleaseType = buildParams.runtimeJava.preReleaseType
     def runtimeJavaMajorVersion = Integer.parseInt(buildParams.runtimeJavaVersion.get().getMajorVersion())
-    if (buildNumber == null) {
-      buildNumber = findLatestPreReleaseBuildNumber(runtimeJavaMajorVersion, preReleaseType);
-    }
-    String preReleaseVersionString = String.format("%d-%s+%d", runtimeJavaMajorVersion, preReleaseType, buildNumber);
+    String preReleaseVersionString = String.format("%d-%s+%d", runtimeJavaMajorVersion, preReleaseType, buildParams.runtimeJava.buildNumber)
 
     project.jdks {
       ['darwin', 'windows', 'linux'].each { platform ->