[7.17] Update Gradle Wrapper to 8.2 (#96686) (#97484)

* Update Gradle Wrapper to 8.2 (#96686) - Convention usage has been deprecated and was fixed in our build files - Fix test dependencies and deprecation
elastic · Sep 27, 2023 · 5afd06a · 5afd06a
1 parent 4bec040
commit 5afd06a
Show file tree

Hide file tree

Showing 100 changed files with 648 additions and 206 deletions.
diff --git a/benchmarks/build.gradle b/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 }
 

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

diff --git a/build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/util/Util.java b/build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/util/Util.java
@@ -12,12 +12,16 @@
 import org.gradle.api.GradleException;
 import org.gradle.api.Project;
 import org.gradle.api.file.FileTree;
+import org.gradle.api.initialization.IncludedBuild;
+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;
 
@@ -102,7 +106,6 @@ private static boolean isJavaExtensionAvailable(Project project) {
         return project.getExtensions().getByType(JavaPluginExtension.class) == null;
     }
 
-
     public static Object toStringable(Supplier<String> getter) {
         return new Object() {
             @Override
@@ -116,4 +119,31 @@ public static SourceSetContainer getJavaSourceSets(Project project) {
         return project.getExtensions().getByType(JavaPluginExtension.class).getSourceSets();
     }
 
+    public static File locateElasticsearchWorkspace(Gradle gradle) {
+        if(gradle.getRootProject().getName().startsWith("build-tools")) {
+            File buildToolsParent = gradle.getRootProject().getRootDir().getParentFile();
+            if(versionFileExists(buildToolsParent)) {
+                return buildToolsParent;
+            }
+            return buildToolsParent;
+        }
+        if (gradle.getParent() == null) {
+            // See if any of these included builds is the Elasticsearch gradle
+            for (IncludedBuild includedBuild : gradle.getIncludedBuilds()) {
+                if (versionFileExists(includedBuild.getProjectDir())) {
+                    return includedBuild.getProjectDir();
+                }
+            }
+
+            // Otherwise assume this gradle is the root elasticsearch workspace
+            return gradle.getRootProject().getRootDir();
+        } else {
+            // We're an included build, so keep looking
+            return locateElasticsearchWorkspace(gradle.getParent());
+        }
+    }
+
+    private static boolean versionFileExists(File rootDir) {
+        return new File(rootDir, "build-tools-internal/version.properties").exists();
+    }
 }
diff --git a/build-tools-internal/build.gradle b/build-tools-internal/build.gradle
@@ -184,8 +184,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()}.")
@@ -241,7 +243,6 @@ dependencies {
   api buildLibs.commons.codec
   api buildLibs.apache.compress
   api buildLibs.ant
-  api 'com.netflix.nebula:gradle-extra-configurations-plugin:7.0.0'
   api buildLibs.nebula.info
   api buildLibs.apache.rat
   api buildLibs.jna

diff --git a/build-tools-internal/gradle/wrapper/gradle-wrapper.properties b/build-tools-internal/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.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
-distributionSha256Sum=db9c8211ed63f61f60292c69e80d89196f9eb36665e369e7f00ac4cc841c2219
+zipStorePath=wrapper/dists
diff --git a/...rces/org/elasticsearch/gradle/internal/fake_git/remote/distribution/archives/build.gradle b/...rces/org/elasticsearch/gradle/internal/fake_git/remote/distribution/archives/build.gradle
@@ -16,6 +16,7 @@ subprojects {
         archiveVersion.set("${versionFromBranch}-SNAPSHOT")
         archiveClassifier.set("darwin-x86_64")
         archiveExtension.set('tar.gz')
+        exclude('build')
     }
 
     tasks.register('extracted', Copy) {

diff --git a/build-tools-internal/src/main/groovy/elasticsearch.runtime-jdk-provision.gradle b/build-tools-internal/src/main/groovy/elasticsearch.runtime-jdk-provision.gradle
@@ -32,7 +32,8 @@ configure(allprojects) {
   }
   project.tasks.withType(Test).configureEach { Test test ->
     if (BuildParams.getIsRuntimeJavaHomeSet()) {
-      test.executable = "${BuildParams.runtimeJavaHome}/bin/java"
+      test.executable = "${BuildParams.runtimeJavaHome}/bin/java" +
+          (OS.current() == OS.WINDOWS ? '.exe' : '')
     } else {
       test.dependsOn(project.jdks.provisioned_runtime)
       test.executable = project.jdks.provisioned_runtime.getBinJavaPath()

diff --git a/...-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchJavadocPlugin.java b/...-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchJavadocPlugin.java
@@ -51,10 +51,12 @@ public void apply(Project project) {
             var withShadowPlugin = project1.getPlugins().hasPlugin(ShadowPlugin.class);
             var compileClasspath = project.getConfigurations().getByName("compileClasspath");
 
+            var copiedCompileClasspath = project.getConfigurations().create("copiedCompileClasspath");
+            copiedCompileClasspath.extendsFrom(compileClasspath);
             if (withShadowPlugin) {
                 var shadowConfiguration = project.getConfigurations().getByName("shadow");
                 var shadowedDependencies = shadowConfiguration.getAllDependencies();
-                var nonShadowedCompileClasspath = compileClasspath.copyRecursive(
+                var nonShadowedCompileClasspath = copiedCompileClasspath.copyRecursive(
                     dependency -> shadowedDependencies.contains(dependency) == false
                 );
                 configureJavadocForConfiguration(project, false, nonShadowedCompileClasspath);

diff --git a/...ternal/src/main/java/org/elasticsearch/gradle/internal/InternalTestArtifactExtension.java b/...ternal/src/main/java/org/elasticsearch/gradle/internal/InternalTestArtifactExtension.java
@@ -9,6 +9,7 @@
 package org.elasticsearch.gradle.internal;
 
 import org.gradle.api.Project;
+import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.Dependency;
 import org.gradle.api.artifacts.dsl.DependencyHandler;
 import org.gradle.api.plugins.BasePluginExtension;
@@ -40,9 +41,18 @@ public void registerTestArtifactFromSourceSet(SourceSet sourceSet) {
 
         DependencyHandler dependencies = project.getDependencies();
         project.getPlugins().withType(JavaPlugin.class, javaPlugin -> {
+            Configuration apiElements = project.getConfigurations().getByName(sourceSet.getApiElementsConfigurationName());
+            Configuration apiElementsTestArtifacts = project.getConfigurations()
+                .create(sourceSet.getApiConfigurationName() + "TestArtifacts");
+            apiElements.extendsFrom(apiElementsTestArtifacts);
             Dependency projectDependency = dependencies.create(project);
-            dependencies.add(sourceSet.getApiElementsConfigurationName(), projectDependency);
-            dependencies.add(sourceSet.getRuntimeElementsConfigurationName(), projectDependency);
+            dependencies.add(apiElementsTestArtifacts.getName(), projectDependency);
+
+            Configuration runtimeElements = project.getConfigurations().getByName(sourceSet.getRuntimeElementsConfigurationName());
+            Configuration runtimeElementsTestArtifacts = project.getConfigurations()
+                .create(sourceSet.getRuntimeElementsConfigurationName() + "TestArtifacts");
+            runtimeElements.extendsFrom(runtimeElementsTestArtifacts);
+            dependencies.add(runtimeElementsTestArtifacts.getName(), projectDependency);
         });
         // PolicyUtil doesn't handle classifier notation well probably.
         // Instead of fixing PoliceUtil we stick to the pattern of changing

diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/info/BuildParams.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/info/BuildParams.java
@@ -8,14 +8,19 @@
 package org.elasticsearch.gradle.internal.info;
 
 import org.elasticsearch.gradle.internal.BwcVersions;
+import org.gradle.api.Action;
 import org.gradle.api.JavaVersion;
+import org.gradle.api.Task;
 import org.gradle.api.provider.Provider;
+import org.gradle.jvm.toolchain.JavaToolchainSpec;
 
 import java.io.File;
+import java.io.IOException;
 import java.lang.reflect.Modifier;
 import java.time.ZonedDateTime;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Random;
 import java.util.function.Consumer;
 
 import static java.util.Objects.requireNonNull;
@@ -28,6 +33,7 @@ public class BuildParams {
     private static JavaVersion minimumRuntimeVersion;
     private static JavaVersion gradleJavaVersion;
     private static JavaVersion runtimeJavaVersion;
+    private static Provider<? extends Action<JavaToolchainSpec>> javaToolChainSpec;
     private static String runtimeJavaDetails;
     private static Boolean inFipsJvm;
     private static String gitRevision;
@@ -87,6 +93,10 @@ public static Boolean isInFipsJvm() {
         return value(inFipsJvm);
     }
 
+    public static void withFipsEnabledOnly(Task task) {
+        task.onlyIf("FIPS mode disabled", task1 -> isInFipsJvm() == false);
+    }
+
     public static String getGitRevision() {
         return value(gitRevision);
     }
@@ -107,10 +117,18 @@ public static String getTestSeed() {
         return value(testSeed);
     }
 
+    public static Random getRandom() {
+        return new Random(Long.parseUnsignedLong(testSeed.split(":")[0], 16));
+    }
+
     public static Boolean isCi() {
         return value(isCi);
     }
 
+    public static Boolean isGraalVmRuntime() {
+        return value(runtimeJavaDetails.toLowerCase().contains("graalvm"));
+    }
+
     public static Integer getDefaultParallel() {
         return value(defaultParallel);
     }
@@ -119,6 +137,10 @@ public static boolean isSnapshotBuild() {
         return value(BuildParams.isSnapshotBuild);
     }
 
+    public static Provider<? extends Action<JavaToolchainSpec>> getJavaToolChainSpec() {
+        return javaToolChainSpec;
+    }
+
     private static <T> T value(T object) {
         if (object == null) {
             String callingMethod = Thread.currentThread().getStackTrace()[2].getMethodName();
@@ -161,7 +183,11 @@ public void reset() {
         }
 
         public void setRuntimeJavaHome(File runtimeJavaHome) {
-            BuildParams.runtimeJavaHome = requireNonNull(runtimeJavaHome);
+            try {
+                BuildParams.runtimeJavaHome = requireNonNull(runtimeJavaHome).getCanonicalFile();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
         }
 
         public void setIsRuntimeJavaHomeSet(boolean isRutimeJavaHomeSet) {
@@ -227,5 +253,9 @@ public void setIsSnapshotBuild(final boolean isSnapshotBuild) {
         public void setBwcVersions(Provider<BwcVersions> bwcVersions) {
             BuildParams.bwcVersions = requireNonNull(bwcVersions);
         }
+
+        public void setJavaToolChainSpec(Provider<? extends Action<JavaToolchainSpec>> javaToolChain) {
+            BuildParams.javaToolChainSpec = javaToolChain;
+        }
     }
 }