Merge branch 'main' into ml-eis-integration-jbc

Author: jaybcee

benchmarks/src/main/java/org/elasticsearch/benchmark/index/mapper/LogsDbDocumentParsingBenchmark.java

@@ -14,7 +14,6 @@
 import org.elasticsearch.gradle.internal.conventions.util.Util;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
-import org.gradle.api.model.ObjectFactory;
 import org.gradle.api.provider.Property;
 import org.gradle.api.provider.Provider;
 import org.gradle.api.provider.ProviderFactory;
@@ -35,11 +34,19 @@ public GitInfoPlugin(ProviderFactory factory) {
 
     @Override
     public void apply(Project project) {
-        File rootDir = Util.locateElasticsearchWorkspace(project.getGradle());
+        File rootDir = getGitRootDir(project);
         getGitInfo().convention(factory.of(GitInfoValueSource.class, spec -> { spec.getParameters().getPath().set(rootDir); }));
         revision = getGitInfo().map(info -> info.getRevision() == null ? info.getRevision() : "main");
     }
 
+    private static File getGitRootDir(Project project) {
+        File rootDir = project.getRootDir();
+        if (new File(rootDir, ".git").exists()) {
+            return rootDir;
+        }
+        return Util.locateElasticsearchWorkspace(project.getGradle());
+    }
+
     public abstract Property<GitInfo> getGitInfo();
 
     public Provider<String> getRevision() {

build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/GitInfoPlugin.java

@@ -14,18 +14,19 @@
 import org.gradle.api.Project;
 import org.gradle.api.file.FileTree;
 import org.gradle.api.initialization.IncludedBuild;
+import org.gradle.api.internal.GradleInternal;
 import org.gradle.api.invocation.Gradle;
 import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.SourceSetContainer;
 import org.gradle.api.tasks.util.PatternFilterable;
 
-import javax.annotation.Nullable;
 import java.io.File;
-import java.util.Collection;
 import java.util.Optional;
 import java.util.function.Supplier;
 
+import javax.annotation.Nullable;
+
 public class Util {
 
     public static boolean getBooleanProperty(String property, boolean defaultValue) {
@@ -120,6 +121,14 @@ public static SourceSetContainer getJavaSourceSets(Project project) {
         return project.getExtensions().getByType(JavaPluginExtension.class).getSourceSets();
     }
 
+    public static File getRootFolder(Gradle gradle) {
+        Gradle parent = gradle.getParent();
+        if (parent == null) {
+            return gradle.getRootProject().getRootDir();
+        }
+        return getRootFolder(parent);
+    }
+
     public static File locateElasticsearchWorkspace(Gradle gradle) {
         if (gradle.getRootProject().getName().startsWith("build-tools")) {
             File buildToolsParent = gradle.getRootProject().getRootDir().getParentFile();

build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/util/Util.java

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=89d4e70e4e84e2d2dfbb63e4daa53e21b25017cc70c37e4eea31ee51fb15098a
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
+distributionSha256Sum=7ebdac923867a3cec0098302416d1e3c6c0c729fc4e2e05c10637a8af33a76c5
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

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

@@ -285,7 +285,7 @@ class PublishPluginFuncTest extends AbstractGradleFuncTest {
 
             esplugin {
                 name = 'hello-world-plugin'
-                classname 'org.acme.HelloWorldPlugin'
+                classname = 'org.acme.HelloWorldPlugin'
                 description = "shadowed es plugin"
             }
 
@@ -375,7 +375,7 @@ class PublishPluginFuncTest extends AbstractGradleFuncTest {
 
             esplugin {
                 name = 'hello-world-plugin'
-                classname 'org.acme.HelloWorldPlugin'
+                classname = 'org.acme.HelloWorldPlugin'
                 description = "custom project description"
             }
 

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

@@ -98,8 +98,8 @@ develocity {
           link 'Source', "${prBaseUrl}/tree/${System.getenv('BUILDKITE_COMMIT')}"
           link 'Pull Request', "https://github.com/${repository}/pull/${prId}"
         } else {
-          value 'Git Commit ID', gitRevision
-          link 'Source', "https://github.com/${repository}/tree/${gitRevision}"
+          value 'Git Commit ID', gitRevision.get()
+          link 'Source', "https://github.com/${repository}/tree/${gitRevision.get()}"
         }
 
         buildFinished { result ->

build-tools-internal/src/main/groovy/elasticsearch.build-scan.gradle

@@ -166,7 +166,7 @@ if (providers.systemProperty('idea.active').getOrNull() == 'true') {
   tasks.register('buildDependencyArtifacts') {
     group = 'ide'
     description = 'Builds artifacts needed as dependency for IDE modules'
-    dependsOn([':plugins:repository-hdfs:hadoop-client-api:shadowJar',
+    dependsOn([':plugins:repository-hdfs:hadoop-client-api:jar',
       ':x-pack:plugin:esql:compute:ann:jar',
       ':x-pack:plugin:esql:compute:gen:jar',
       ':server:generateModulesList',

build-tools-internal/src/main/groovy/elasticsearch.ide.gradle

@@ -22,7 +22,7 @@ public enum DockerBase {
     // Chainguard based wolfi image with latest jdk
     // This is usually updated via renovatebot
     // spotless:off
-    WOLFI("docker.elastic.co/wolfi/chainguard-base:latest@sha256:bfdeddb33330a281950c2a54adef991dbbe6a42832bc505d13b11beaf50ae73f",
+    WOLFI("docker.elastic.co/wolfi/chainguard-base:latest@sha256:eef54b3a414aa53b98f0f8df2633aed83c3ba6230722769282925442968f0364",
         "-wolfi",
         "apk"
     ),

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

@@ -134,14 +134,14 @@ private void registerEmptyDirectoryTasks(Project project) {
         });
 
         File pluginsDir = new File(project.getBuildDir(), "plugins-hack/plugins");
-        project.getExtensions().add("pluginsDir", pluginsDir);
+        project.getExtensions().getExtraProperties().set("pluginsDir", pluginsDir);
         project.getTasks().register("createPluginsDir", EmptyDirTask.class, t -> {
             t.setDir(pluginsDir);
             t.setDirMode(0755);
         });
 
         File jvmOptionsDir = new File(project.getBuildDir(), "jvm-options-hack/jvm.options.d");
-        project.getExtensions().add("jvmOptionsDir", jvmOptionsDir);
+        project.getExtensions().getExtraProperties().set("jvmOptionsDir", jvmOptionsDir);
         project.getTasks().register("createJvmOptionsDir", EmptyDirTask.class, t -> {
             t.setDir(jvmOptionsDir);
             t.setDirMode(0750);

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

@@ -131,11 +131,13 @@ private static void configureBwcProject(
         // We don't use a normal `Copy` task here as snapshotting the entire gradle user home is very expensive. This task is cheap, so
         // up-to-date checking doesn't buy us much
         project.getTasks().register("setupGradleUserHome", task -> {
+            File gradleUserHome = project.getGradle().getGradleUserHomeDir();
+            String projectName = project.getName();
             task.doLast(t -> {
                 fileSystemOperations.copy(copy -> {
-                    String gradleUserHome = project.getGradle().getGradleUserHomeDir().getAbsolutePath();
-                    copy.into(gradleUserHome + "-" + project.getName());
-                    copy.from(gradleUserHome, copySpec -> {
+                    String absoluteGradleUserHomePath = gradleUserHome.getAbsolutePath();
+                    copy.into(absoluteGradleUserHomePath + "-" + projectName);
+                    copy.from(absoluteGradleUserHomePath, copySpec -> {
                         copySpec.include("gradle.properties");
                         copySpec.include("init.d/*");
                     });