address review comments

Author: rjernst

.gitignore

@@ -69,6 +69,7 @@ testfixtures_shared/
 # Generated
 checkstyle_ide.xml
 x-pack/plugin/esql/src/main/generated-src/generated/
+server/src/main/resources/transport/defined/manifest.txt
 
 # JEnv
 .java-version

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

@@ -12,6 +12,7 @@
 import org.gradle.api.DefaultTask;
 import org.gradle.api.file.ConfigurableFileCollection;
 import org.gradle.api.file.RegularFileProperty;
+import org.gradle.api.tasks.CacheableTask;
 import org.gradle.api.tasks.Classpath;
 import org.gradle.api.tasks.InputFiles;
 import org.gradle.api.tasks.OutputFile;
@@ -41,6 +42,7 @@
  * provided directory, and then records the value of string literals passed as arguments. It then records each
  * string on a newline along with path and line number in the provided output file.
  */
+@CacheableTask
 public abstract class CollectTransportVersionReferencesTask extends DefaultTask {
     public static final String TRANSPORT_VERSION_SET_CLASS = "org/elasticsearch/TransportVersion";
     public static final String TRANSPORT_VERSION_SET_METHOD_NAME = "fromName";
@@ -50,7 +52,6 @@ public abstract class CollectTransportVersionReferencesTask extends DefaultTask
     /**
      * The directory to scan for method invocations.
      */
-    @InputFiles
     @Classpath
     public abstract ConfigurableFileCollection getClassPath();
 
@@ -145,6 +146,6 @@ public void visitMethodInsn(int opcode, String owner, String name, String descri
     }
 
     private static String classname(String filename) {
-        return filename.substring(0, filename.length() - CLASS_EXTENSION.length()).replace('/', '.');
+        return filename.substring(0, filename.length() - CLASS_EXTENSION.length()).replaceAll("[/\\\\]", ".");
     }
 }

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

@@ -16,6 +16,7 @@
 import org.gradle.api.artifacts.dsl.DependencyHandler;
 import org.gradle.api.plugins.JavaPlugin;
 import org.gradle.api.tasks.Copy;
+import org.gradle.language.base.plugins.LifecycleBasePlugin;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -25,6 +26,7 @@ public class GlobalTransportVersionManagementPlugin implements Plugin<Project> {
 
     @Override
     public void apply(Project project) {
+        project.getPluginManager().apply(LifecycleBasePlugin.class);
 
         DependencyHandler depsHandler = project.getDependencies();
         List<Dependency> tvDependencies = new ArrayList<>();
@@ -51,7 +53,7 @@ public void apply(Project project) {
                 t.getReferencesFiles().setFrom(tvReferencesConfig);
             });
 
-        project.getTasks().named("check").configure(t -> t.dependsOn(validateTask));
+        project.getTasks().named(LifecycleBasePlugin.CHECK_TASK_NAME).configure(t -> t.dependsOn(validateTask));
 
         var generateManifestTask = project.getTasks()
             .register("generateTransportVersionManifest", GenerateTransportVersionManifestTask.class, t -> {

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

@@ -14,19 +14,21 @@
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.tasks.SourceSet;
+import org.gradle.language.base.plugins.LifecycleBasePlugin;
 
 public class TransportVersionManagementPlugin implements Plugin<Project> {
 
     @Override
     public void apply(Project project) {
-        String transportVersionReferencesFile = "transport-version/references.txt";
+        project.getPluginManager().apply(LifecycleBasePlugin.class);
+
         var collectTask = project.getTasks()
             .register("collectTransportVersionReferences", CollectTransportVersionReferencesTask.class, t -> {
                 t.setGroup("Transport Versions");
                 t.setDescription("Collects all TransportVersion references used throughout the project");
                 SourceSet mainSourceSet = GradleUtils.getJavaSourceSets(project).findByName(SourceSet.MAIN_SOURCE_SET_NAME);
                 t.getClassPath().setFrom(mainSourceSet.getRuntimeClasspath());
-                t.getOutputFile().set(project.getLayout().getBuildDirectory().file(transportVersionReferencesFile));
+                t.getOutputFile().set(project.getLayout().getBuildDirectory().file("transport-version/references.txt"));
             });
 
         Configuration transportVersionsConfig = project.getConfigurations().create("transportVersionNames", c -> {
@@ -42,11 +44,9 @@ public void apply(Project project) {
                 t.setGroup("Transport Versions");
                 t.setDescription("Validates that all TransportVersion references used in the project have an associated definition file");
                 t.getDefinitionsDirectory().set(TransportVersionUtils.getDefinitionsDirectory(project));
-                t.getReferencesFile().set(project.getLayout().getBuildDirectory().file(transportVersionReferencesFile));
-                t.dependsOn(collectTask);
-
+                t.getReferencesFile().set(collectTask.get().getOutputFile());
             });
 
-        project.getTasks().named("check").configure(t -> t.dependsOn(validateTask));
+        project.getTasks().named(LifecycleBasePlugin.CHECK_TASK_NAME).configure(t -> t.dependsOn(validateTask));
     }
 }

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

@@ -73,7 +73,7 @@ static List<TransportVersionReference> readReferencesFile(Path file) throws IOEx
     }
 
     static Directory getDefinitionsDirectory(Project project) {
-        Directory serverDir = project.getRootProject().project(":server").getLayout().getProjectDirectory();
+        Directory serverDir = project.project(":server").getLayout().getProjectDirectory();
         return serverDir.dir("src/main/resources/transport/defined");
     }
 

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

@@ -13,6 +13,7 @@
 import org.gradle.api.DefaultTask;
 import org.gradle.api.file.ConfigurableFileCollection;
 import org.gradle.api.file.DirectoryProperty;
+import org.gradle.api.tasks.CacheableTask;
 import org.gradle.api.tasks.InputDirectory;
 import org.gradle.api.tasks.InputFiles;
 import org.gradle.api.tasks.TaskAction;
@@ -29,6 +30,7 @@
 /**
  * Validates that each defined transport version constant is referenced by at least one project.
  */
+@CacheableTask
 public abstract class ValidateTransportVersionDefinitionsTask extends DefaultTask {
 
     @InputDirectory

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

@@ -12,6 +12,7 @@
 import org.gradle.api.DefaultTask;
 import org.gradle.api.file.DirectoryProperty;
 import org.gradle.api.file.RegularFileProperty;
+import org.gradle.api.tasks.CacheableTask;
 import org.gradle.api.tasks.InputDirectory;
 import org.gradle.api.tasks.InputFile;
 import org.gradle.api.tasks.TaskAction;
@@ -23,6 +24,7 @@
 /**
  * Validates that each transport version named reference has a constant definition.
  */
+@CacheableTask
 public abstract class ValidateTransportVersionReferencesTask extends DefaultTask {
 
     @InputDirectory