Update Gradle wrapper to 8.12 (#118683) (#119356)

This updates the gradle wrapper to 8.12 We addressed deprecation warnings due to the update that includes: - Fix change in TestOutputEvent api - Fix deprecation in groovy syntax - Use latest ospackage plugin containing our fix - Remove project usages at execution time - Fix deprecated project references in repository-old-versions (cherry picked from commit ba61f8c) # Conflicts: # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/distribution/DockerUbiElasticsearchDistributionType.java # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/Fixture.java # plugins/repository-hdfs/hadoop-client-api/build.gradle # qa/entitlements/build.gradle # server/src/main/java/org/elasticsearch/indices/IndicesFeatures.java # x-pack/plugin/migrate/build.gradle # x-pack/plugin/security/qa/security-basic/build.gradle
elastic · Dec 31, 2024 · 49c0f5c · 49c0f5c
1 parent df39798
commit 49c0f5c
Show file tree

Hide file tree

Showing 156 changed files with 4,417 additions and 456 deletions.
diff --git a/build-tools-internal/gradle/wrapper/gradle-wrapper.properties b/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

diff --git a/...ernal/src/integTest/groovy/org/elasticsearch/gradle/internal/PublishPluginFuncTest.groovy b/...ernal/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"
             }
 

diff --git a/...l/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java b/...l/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java
@@ -130,11 +130,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/*");
                     });

diff --git a/...rnal/src/main/java/org/elasticsearch/gradle/internal/test/ErrorReportingTestListener.java b/...rnal/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;

diff --git a/build-tools-internal/src/main/resources/minimumGradleVersion b/build-tools-internal/src/main/resources/minimumGradleVersion
@@ -1 +1 @@
-8.11.1
+8.12
diff --git a/build-tools/src/integTest/groovy/org/elasticsearch/gradle/TestClustersPluginFuncTest.groovy b/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"
             }
 

diff --git a/build.gradle b/build.gradle
@@ -371,24 +371,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"
   }
 }

diff --git a/client/client-benchmark-noop-api-plugin/build.gradle b/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

diff --git a/distribution/build.gradle b/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'
 }
 

diff --git a/distribution/docker/build.gradle b/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]'
@@ -575,8 +575,8 @@ subprojects { Project subProject ->
     }
 
     artifacts.add('default', file(tarFile)) {
-      type 'tar'
-      name artifactName
+      type = 'tar'
+      name = artifactName
       builtBy exportTaskName
     }
   }

diff --git a/distribution/packages/build.gradle b/distribution/packages/build.gradle
@@ -44,7 +44,7 @@ import java.util.regex.Pattern
  */
 
 plugins {
-  id "com.netflix.nebula.ospackage-base" version "11.10.0"
+  id "com.netflix.nebula.ospackage-base" version "11.10.1"
 }
 
 ['deb', 'rpm'].each { type ->
@@ -88,21 +88,21 @@ def commonPackageConfig(String type, String architecture) {
       OS.current().equals(OS.WINDOWS) == false
     }
     dependsOn "process${type.capitalize()}Files"
-    packageName "elasticsearch"
+    packageName = "elasticsearch"
     if (type == 'deb') {
       if (architecture == 'x64') {
-        arch('amd64')
+        arch = 'amd64'
       } else {
         assert architecture == 'aarch64': architecture
-        arch('arm64')
+        arch = 'arm64'
       }
     } else {
       assert type == 'rpm': type
       if (architecture == 'x64') {
-        arch('X86_64')
+        arch = 'X86_64'
       } else {
         assert architecture == 'aarch64': architecture
-        arch('aarch64')
+        arch = 'aarch64'
       }
     }
     // Follow elasticsearch's file naming convention
@@ -201,7 +201,7 @@ def commonPackageConfig(String type, String architecture) {
       into('/etc')
       permissionGroup 'elasticsearch'
       setgid true
-      includeEmptyDirs true
+      includeEmptyDirs = true
       createDirectoryEntry true
       include("elasticsearch") // empty dir, just to add directory entry
       include("elasticsearch/jvm.options.d") // empty dir, just to add directory entry
@@ -216,7 +216,7 @@ def commonPackageConfig(String type, String architecture) {
         unix(0660)
       }
       permissionGroup 'elasticsearch'
-      includeEmptyDirs true
+      includeEmptyDirs = true
       createDirectoryEntry true
       fileType CONFIG | NOREPLACE
     }
@@ -266,7 +266,7 @@ def commonPackageConfig(String type, String architecture) {
       into(file.parent) {
         from "${packagingFiles}/${file.parent}"
         include file.name
-        includeEmptyDirs true
+        includeEmptyDirs = true
         createDirectoryEntry true
         user u
         permissionGroup g
@@ -290,15 +290,15 @@ def commonPackageConfig(String type, String architecture) {
 
 // this is package independent configuration
 ospackage {
-  maintainer 'Elasticsearch Team <info@elastic.co>'
-  summary 'Distributed RESTful search engine built for the cloud'
-  packageDescription '''
+  maintainer = 'Elasticsearch Team <info@elastic.co>'
+  summary = 'Distributed RESTful search engine built for the cloud'
+  packageDescription = '''
     Reference documentation can be found at
     https://www.elastic.co/guide/en/elasticsearch/reference/current/index.html
     and the 'Elasticsearch: The Definitive Guide' book can be found at
     https://www.elastic.co/guide/en/elasticsearch/guide/current/index.html
   '''.stripIndent().trim()
-  url 'https://www.elastic.co/'
+  url = 'https://www.elastic.co/'
 
   // signing setup
   if (project.hasProperty('signing.password') && buildParams.isSnapshotBuild() == false) {
@@ -312,10 +312,10 @@ ospackage {
   // version found on oldest supported distro, centos-6
   requires('coreutils', '8.4', GREATER | EQUAL)
 
-  fileMode 0644
-  dirMode 0755
-  user 'root'
-  permissionGroup 'root'
+  fileMode = 0644
+  dirMode = 0755
+  user = 'root'
+  permissionGroup = 'root'
 
   into '/usr/share/elasticsearch'
 }
@@ -331,7 +331,7 @@ Closure commonDebConfig(String architecture) {
     customFields['License'] = 'Elastic-License'
 
     archiveVersion = project.version.replace('-', '~')
-    packageGroup 'web'
+    packageGroup = 'web'
 
     // versions found on oldest supported distro, centos-6
     requires('bash', '4.1', GREATER | EQUAL)
@@ -360,24 +360,24 @@ Closure commonRpmConfig(String architecture) {
   return {
     configure(commonPackageConfig('rpm', architecture))
 
-    license 'Elastic License'
+    license = 'Elastic License'
 
-    packageGroup 'Application/Internet'
+    packageGroup = 'Application/Internet'
     requires '/bin/bash'
 
     obsoletes packageName, '7.0.0', Flags.LESS
 
     prefix '/usr'
-    packager 'Elasticsearch'
+    packager = 'Elasticsearch'
     archiveVersion = project.version.replace('-', '_')
     release = '1'
-    os 'LINUX'
-    distribution 'Elasticsearch'
-    vendor 'Elasticsearch'
+    os = 'LINUX'
+    distribution = 'Elasticsearch'
+    vendor = 'Elasticsearch'
     // TODO ospackage doesn't support icon but we used to have one
 
     // without this the rpm will have parent dirs of any files we copy in, eg /etc/elasticsearch
-    addParentDirs false
+    addParentDirs = false
   }
 }
 

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -939,14 +939,9 @@
             <sha256 value="d694edd7bae3bc1a8e0dae2f5a22c479ff04d6b9bfcb0ab751a42f02e02d2100" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.netflix.nebula" name="gradle-ospackage-plugin" version="11.10.0">
-         <artifact name="gradle-ospackage-plugin-11.10.0.jar">
-            <sha256 value="93c264b05864f8db979a169a99e4bfaad84caa30b829743f67210382dff89619" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.netflix.nebula" name="gradle-ospackage-plugin" version="11.9.1">
-         <artifact name="gradle-ospackage-plugin-11.9.1.jar">
-            <sha256 value="63b2c387cb83481bb8d7e33e0be02e9000c0ec30843ca7730641392f3f5f28ad" origin="Generated by Gradle"/>
+      <component group="com.netflix.nebula" name="gradle-ospackage-plugin" version="11.10.1">
+         <artifact name="gradle-ospackage-plugin-11.10.1.jar">
+            <sha256 value="8f1daf5885f1a8f6bcab00bf9b52cf484d87da7839e9bbd327a94af27df5dacc" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.netflix.nebula" name="nebula-gradle-interop" version="2.0.0">

diff --git a/gradle/wrapper/gradle-wrapper.properties b/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

diff --git a/gradlew b/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git a/libs/native/libraries/build.gradle b/libs/native/libraries/build.gradle
@@ -25,7 +25,7 @@ repositories {
   exclusiveContent {
     forRepository {
       maven {
-        url "https://artifactory.elastic.dev/artifactory/elasticsearch-native"
+        url = "https://artifactory.elastic.dev/artifactory/elasticsearch-native"
         metadataSources {
           artifact()
         }