Merge pull request ESQL-1365 from elastic/main

🤖 ESQL: Merge upstream

Author: elasticsearchmachine

benchmarks/build.gradle

@@ -10,10 +10,15 @@ import org.elasticsearch.gradle.internal.info.BuildParams
 
 apply plugin: 'elasticsearch.java'
 apply plugin: 'application'
-mainClassName = 'org.openjdk.jmh.Main'
+
+application {
+  mainClass = 'org.openjdk.jmh.Main'
+}
 
 tasks.named("assemble").configure { enabled = false }
-archivesBaseName = 'elasticsearch-benchmarks'
+base {
+  archivesName = 'elasticsearch-benchmarks'
+}
 
 tasks.named("test").configure { enabled = false }
 

build-conventions/build.gradle

@@ -17,8 +17,10 @@ plugins {
 group = "org.elasticsearch"
 
 // This project contains Checkstyle rule implementations used by IDEs which use a Java 11 runtime
-targetCompatibility = 11
-sourceCompatibility = 11
+java {
+  targetCompatibility = 11
+  sourceCompatibility = 11
+}
 
 gradlePlugin {
     // We already configure publication and we don't need or want the one that comes

build-tools-internal/build.gradle

@@ -203,8 +203,10 @@ gradlePlugin {
  *****************************************************************************/
 
 def minCompilerJava = versions.get("minimumCompilerJava")
-targetCompatibility = minCompilerJava
-sourceCompatibility = minCompilerJava
+java {
+  targetCompatibility = minCompilerJava
+  sourceCompatibility = minCompilerJava
+}
 
 if (JavaVersion.current() < JavaVersion.toVersion(minCompilerJava)) {
   throw new GradleException("Java ${minCompilerJava} is required to build Elasticsearch but current Java is version ${JavaVersion.current()}.")

build-tools-internal/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=5625a0ae20fe000d9225d000b36909c7a0e0e8dda61c19b12da769add847c975
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
+distributionSha256Sum=5022b0b25fe182b0e50867e77f484501dba44feeea88f5c1f13b6b4660463640
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -26,6 +26,7 @@
 import org.gradle.api.provider.Provider;
 import org.gradle.api.provider.ProviderFactory;
 import org.gradle.internal.jvm.Jvm;
+import org.gradle.internal.jvm.inspection.JavaInstallationRegistry;
 import org.gradle.internal.jvm.inspection.JvmInstallationMetadata;
 import org.gradle.internal.jvm.inspection.JvmMetadataDetector;
 import org.gradle.internal.jvm.inspection.JvmVendor;
@@ -35,7 +36,6 @@
 import org.gradle.jvm.toolchain.JavaToolchainSpec;
 import org.gradle.jvm.toolchain.JvmVendorSpec;
 import org.gradle.jvm.toolchain.internal.InstallationLocation;
-import org.gradle.jvm.toolchain.internal.JavaInstallationRegistry;
 import org.gradle.util.GradleVersion;
 import org.jetbrains.annotations.NotNull;
 
@@ -257,7 +257,7 @@ private List<JavaHome> getAvailableJavaVersions() {
 
     private Stream<InstallationLocation> getAvailableJavaInstallationLocationSteam() {
         return Stream.concat(
-            javaInstallationRegistry.listInstallations().stream(),
+            javaInstallationRegistry.toolchains().stream().map(metadata -> metadata.location),
             Stream.of(new InstallationLocation(Jvm.current().getJavaHome(), "Current JVM"))
         );
     }

build-tools-internal/src/main/resources/minimumGradleVersion

@@ -1 +1 @@
-8.1.1
+8.2

build-tools/build.gradle

@@ -21,8 +21,11 @@ description = "The elasticsearch build tools"
 
 group = "org.elasticsearch.gradle"
 version = versions.getProperty("elasticsearch")
-targetCompatibility = versions.get("minimumRuntimeJava")
-sourceCompatibility = versions.get("minimumRuntimeJava")
+
+java {
+  targetCompatibility = versions.get("minimumRuntimeJava")
+  sourceCompatibility = versions.get("minimumRuntimeJava")
+}
 
 gradlePlugin {
     // We already configure publication and we don't need or want the one that comes

build-tools/reaper/build.gradle

@@ -7,8 +7,11 @@ plugins {
 
 group = "org.elasticsearch.gradle"
 version = versions.getProperty("elasticsearch")
-targetCompatibility = versions.get("minimumRuntimeJava")
-sourceCompatibility = versions.get("minimumRuntimeJava")
+
+java {
+  targetCompatibility = versions.get("minimumRuntimeJava")
+  sourceCompatibility = versions.get("minimumRuntimeJava")
+}
 
 tasks.named("jar").configure {
   archiveFileName = "${project.name}.jar"

build-tools/src/main/java/org/elasticsearch/gradle/plugin/PluginPropertiesExtension.java

@@ -11,6 +11,7 @@
 import org.gradle.api.Project;
 import org.gradle.api.file.CopySpec;
 import org.gradle.api.file.RegularFileProperty;
+import org.gradle.api.plugins.BasePluginExtension;
 import org.gradle.api.plugins.ExtraPropertiesExtension;
 
 import java.io.File;
@@ -62,7 +63,7 @@ public String getName() {
     }
 
     public void setName(String name) {
-        this.project.setProperty("archivesBaseName", name);
+        this.project.getExtensions().getByType(BasePluginExtension.class).getArchivesName().set(name);
         this.name = name;
     }
 

client/benchmark/build.gradle

@@ -14,8 +14,13 @@ group = 'org.elasticsearch.client'
 // Not published so no need to assemble
 tasks.named("assemble").configure {  enabled = true }
 
-archivesBaseName = 'client-benchmarks'
-mainClassName = 'org.elasticsearch.client.benchmark.BenchmarkMain'
+base {
+  archivesName = 'client-benchmarks'
+}
+
+application {
+  mainClass = 'org.elasticsearch.client.benchmark.BenchmarkMain'
+}
 
 dependencies {
   api 'org.apache.commons:commons-math3:3.2'
@@ -24,4 +29,4 @@ dependencies {
   api project(':client:rest')
   // bottleneck should be the client, not Elasticsearch
   api project(path: ':client:client-benchmark-noop-api-plugin')
-}
+}