Merge branch 'main' into lucene_snapshot_10_1

Author: ChrisHegarty

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

@@ -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/src/integTest/groovy/org/elasticsearch/gradle/internal/PublishPluginFuncTest.groovy

@@ -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/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.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/*");
                     });

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

@@ -172,6 +172,11 @@ public Destination getDestination() {
                             return Destination.StdErr;
                         }
 
+                        @Override
+                        public long getLogTime() {
+                            return result.getEndTime();
+                        }
+
                         @Override
                         public String getMessage() {
                             return message;

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

@@ -1 +1 @@
-8.11.1
+8.12

build-tools/src/integTest/groovy/org/elasticsearch/gradle/TestClustersPluginFuncTest.groovy

@@ -135,7 +135,7 @@ class TestClustersPluginFuncTest extends AbstractGradleFuncTest {
 
             esplugin {
                 name = 'test-$pluginType'
-                classname 'org.acme.TestModule'
+                classname = 'org.acme.TestModule'
                 description = "test $pluginType description"
             }
 

build.gradle

@@ -364,24 +364,24 @@ tasks.register("verifyBwcTestsEnabled") {
 }
 
 tasks.register("branchConsistency") {
-  description 'Ensures this branch is internally consistent. For example, that versions constants match released versions.'
+  description = 'Ensures this branch is internally consistent. For example, that versions constants match released versions.'
   group 'Verification'
   dependsOn ":verifyVersions", ":verifyBwcTestsEnabled"
 }
 
 tasks.named("wrapper").configure {
   distributionType = 'ALL'
+  def minimumGradleVersionFile = project.file('build-tools-internal/src/main/resources/minimumGradleVersion')
   doLast {
     // copy wrapper properties file to build-tools-internal to allow seamless idea integration
     def file = new File("build-tools-internal/gradle/wrapper/gradle-wrapper.properties")
-    Files.copy(wrapper.getPropertiesFile().toPath(), file.toPath(), REPLACE_EXISTING)
+    Files.copy(getPropertiesFile().toPath(), file.toPath(), REPLACE_EXISTING)
     // copy wrapper properties file to plugins/examples to allow seamless idea integration
     def examplePluginsWrapperProperties = new File("plugins/examples/gradle/wrapper/gradle-wrapper.properties")
-    Files.copy(wrapper.getPropertiesFile().toPath(), examplePluginsWrapperProperties.toPath(), REPLACE_EXISTING)
-
+    Files.copy(getPropertiesFile().toPath(), examplePluginsWrapperProperties.toPath(), REPLACE_EXISTING)
     // Update build-tools to reflect the Gradle upgrade
     // TODO: we can remove this once we have tests to make sure older versions work.
-    project.file('build-tools-internal/src/main/resources/minimumGradleVersion').text = gradleVersion
+    minimumGradleVersionFile.text = gradleVersion
     println "Updated minimum Gradle Version"
   }
 }

client/client-benchmark-noop-api-plugin/build.gradle

@@ -12,9 +12,9 @@ group = 'org.elasticsearch.plugin'
 apply plugin: 'elasticsearch.internal-es-plugin'
 
 esplugin {
-  name 'client-benchmark-noop-api'
-  description 'Stubbed out Elasticsearch actions that can be used for client-side benchmarking'
-  classname 'org.elasticsearch.plugin.noop.NoopPlugin'
+  name = 'client-benchmark-noop-api'
+  description = 'Stubbed out Elasticsearch actions that can be used for client-side benchmarking'
+  classname ='org.elasticsearch.plugin.noop.NoopPlugin'
 }
 
 // Not published so no need to assemble

distribution/build.gradle

@@ -647,8 +647,8 @@ subprojects {
 // in the final log4j2.properties configuration, as it appears in the
 // archive distribution.
 artifacts.add('log4jConfig', file("${defaultOutputs}/log4j2.properties")) {
-  type 'file'
-  name 'log4j2.properties'
+  type = 'file'
+  name = 'log4j2.properties'
   builtBy 'buildDefaultLog4jConfig'
 }
 

distribution/docker/build.gradle

@@ -28,7 +28,7 @@ repositories {
   // other Docker variants, the need for the main image to be rebuildable by Docker Hub
   // means that the Dockerfile itself has to fetch the binary.
   ivy {
-    url 'https://github.com/'
+    url = 'https://github.com/'
     patternLayout {
       artifact '/[organisation]/[module]/releases/download/v[revision]/[module]-[classifier]'
     }
@@ -50,7 +50,7 @@ if (useDra == false) {
               artifact '/[organisation]/[module]-[revision]-[classifier].[ext]'
             }
           } else {
-            url "https://artifacts-snapshot.elastic.co/"
+            url = "https://artifacts-snapshot.elastic.co/"
             patternLayout {
               if (VersionProperties.isElasticsearchSnapshot()) {
                 artifact '/[organization]/[revision]/downloads/[organization]/[module]/[module]-[revision]-[classifier].[ext]'
@@ -583,8 +583,8 @@ subprojects { Project subProject ->
     }
 
     artifacts.add('default', file(tarFile)) {
-      type 'tar'
-      name artifactName
+      type = 'tar'
+      name = artifactName
       builtBy exportTaskName
     }
   }