more feedback

Author: rjernst

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

@@ -14,8 +14,9 @@
 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;
+import org.gradle.api.tasks.PathSensitive;
+import org.gradle.api.tasks.PathSensitivity;
 import org.gradle.api.tasks.TaskAction;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassVisitor;
@@ -70,9 +71,6 @@ public void checkTransportVersion() throws IOException {
             Path file = cpElement.toPath();
             if (Files.isDirectory(file)) {
                 addNamesFromClassesDirectory(results, file);
-            } else {
-                assert file.getFileName().toString().endsWith(".jar");
-                addNamesFromJar(results, file);
             }
         }
 
@@ -95,18 +93,6 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO
         });
     }
 
-    private void addNamesFromJar(Set<TransportVersionUtils.TransportVersionReference> results, Path file) throws IOException {
-        try (var jar = new JarInputStream(Files.newInputStream(file))) {
-            ZipEntry entry;
-            while ((entry = jar.getNextEntry()) != null) {
-                String filename = entry.getName();
-                if (filename.endsWith(CLASS_EXTENSION) && filename.endsWith(MODULE_INFO) == false) {
-                    addNamesFromClass(results, jar, classname(entry.toString()));
-                }
-            }
-        }
-    }
-
     private void addNamesFromClass(Set<TransportVersionUtils.TransportVersionReference> results, InputStream classBytes, String classname)
         throws IOException {
         ClassVisitor classVisitor = new ClassVisitor(Opcodes.ASM9) {

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

@@ -30,13 +30,12 @@ public void apply(Project project) {
         project.getPluginManager().apply(LifecycleBasePlugin.class);
 
         DependencyHandler depsHandler = project.getDependencies();
-        Dependency selfDependency = depsHandler.project(Map.of("path", project.getPath()));
-        Configuration tvReferencesConfig = project.getConfigurations().detachedConfiguration(selfDependency);
+        Configuration tvReferencesConfig = project.getConfigurations().detachedConfiguration();
         tvReferencesConfig.attributes(TransportVersionUtils::addTransportVersionReferencesAttribute);
 
-        // iterate through all projects, and if the ES plugin build plugin is applied, add that project back as a dep to check
+        // iterate through all projects, and if the management plugin is applied, add that project back as a dep to check
         for (Project subProject : project.getRootProject().getSubprojects()) {
-            subProject.getPlugins().withType(BaseInternalPluginBuildPlugin.class).configureEach(plugin -> {
+            subProject.getPlugins().withType(TransportVersionManagementPlugin.class).configureEach(plugin -> {
                 tvReferencesConfig.getDependencies().add(depsHandler.project(Map.of("path", subProject.getPath())));
             });
         }

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

@@ -27,12 +27,15 @@ public void apply(Project project) {
                 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.getClassPath().setFrom(mainSourceSet.getOutput());
                 t.getOutputFile().set(project.getLayout().getBuildDirectory().file("transport-version/references.txt"));
             });
 
-        Configuration tvReferencesConfig = project.getConfigurations().detachedConfiguration();
-        tvReferencesConfig.attributes(TransportVersionUtils::addTransportVersionReferencesAttribute);
+        Configuration tvReferencesConfig = project.getConfigurations().create("transportVersionReferences", c -> {
+            c.setCanBeConsumed(true);
+            c.setCanBeResolved(false);
+            c.attributes(TransportVersionUtils::addTransportVersionReferencesAttribute);
+        });
         project.getArtifacts().add(tvReferencesConfig.getName(), collectTask);
 
         var validateTask = project.getTasks()

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

@@ -16,6 +16,8 @@
 import org.gradle.api.tasks.CacheableTask;
 import org.gradle.api.tasks.InputDirectory;
 import org.gradle.api.tasks.InputFiles;
+import org.gradle.api.tasks.PathSensitive;
+import org.gradle.api.tasks.PathSensitivity;
 import org.gradle.api.tasks.TaskAction;
 
 import java.io.IOException;
@@ -34,9 +36,11 @@
 public abstract class ValidateTransportVersionDefinitionsTask extends DefaultTask {
 
     @InputDirectory
+    @PathSensitive(PathSensitivity.RELATIVE)
     public abstract DirectoryProperty getDefinitionsDirectory();
 
     @InputFiles
+    @PathSensitive(PathSensitivity.RELATIVE)
     public abstract ConfigurableFileCollection getReferencesFiles();
 
     @TaskAction

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

@@ -15,6 +15,8 @@
 import org.gradle.api.tasks.CacheableTask;
 import org.gradle.api.tasks.InputDirectory;
 import org.gradle.api.tasks.InputFile;
+import org.gradle.api.tasks.PathSensitive;
+import org.gradle.api.tasks.PathSensitivity;
 import org.gradle.api.tasks.TaskAction;
 
 import java.io.IOException;
@@ -28,9 +30,11 @@
 public abstract class ValidateTransportVersionReferencesTask extends DefaultTask {
 
     @InputDirectory
+    @PathSensitive(PathSensitivity.RELATIVE)
     public abstract DirectoryProperty getDefinitionsDirectory();
 
     @InputFile
+    @PathSensitive(PathSensitivity.RELATIVE)
     public abstract RegularFileProperty getReferencesFile();
 
     @TaskAction

x-pack/plugin/esql/compute/build.gradle

@@ -3,6 +3,7 @@ import org.elasticsearch.gradle.internal.util.SourceDirectoryCommandLineArgument
 apply plugin: 'elasticsearch.build'
 apply plugin: 'elasticsearch.string-templates'
 apply plugin: 'elasticsearch.publish'
+apply plugin: 'elasticsearch.transport-version-management'
 
 base {
   archivesName = 'x-pack-esql-compute'