iter

Author: rjernst

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

@@ -9,6 +9,7 @@
 
 package org.elasticsearch.gradle.internal.transport;
 
+import org.elasticsearch.gradle.internal.BaseInternalPluginBuildPlugin;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
@@ -29,30 +30,24 @@ public void apply(Project project) {
         project.getPluginManager().apply(LifecycleBasePlugin.class);
 
         DependencyHandler depsHandler = project.getDependencies();
-        List<Dependency> tvDependencies = new ArrayList<>();
-        // TODO: created a named configuration so deps can be added dynamically?
-        for (String baseProjectPath : List.of(":modules", ":plugins", ":x-pack:plugin")) {
-            Project baseProject = project.project(baseProjectPath);
-            for (var pluginProject : baseProject.getSubprojects()) {
-                if (pluginProject.getParent() != baseProject) {
-                    continue; // skip nested projects
-                }
-                tvDependencies.add(depsHandler.project(Map.of("path", pluginProject.getPath())));
-            }
-        }
-        tvDependencies.add(depsHandler.project(Map.of("path", ":server")));
-
-        Configuration tvReferencesConfig = project.getConfigurations().detachedConfiguration(tvDependencies.toArray(new Dependency[0]));
+        Dependency selfDependency = depsHandler.project(Map.of("path", project.getPath()));
+        Configuration tvReferencesConfig = project.getConfigurations().detachedConfiguration(selfDependency);
         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
+        for (Project subProject : project.getRootProject().getSubprojects()) {
+            subProject.getPlugins().withType(BaseInternalPluginBuildPlugin.class).configureEach(plugin -> {
+                tvReferencesConfig.getDependencies().add(depsHandler.project(Map.of("path", subProject.getPath())));
+            });
+        }
+
         var validateTask = project.getTasks()
             .register("validateTransportVersionDefinitions", ValidateTransportVersionDefinitionsTask.class, t -> {
                 t.setGroup("Transport Versions");
                 t.setDescription("Validates that all defined TransportVersion constants are used in at least one project");
                 t.getDefinitionsDirectory().set(TransportVersionUtils.getDefinitionsDirectory(project));
                 t.getReferencesFiles().setFrom(tvReferencesConfig);
             });
-
         project.getTasks().named(LifecycleBasePlugin.CHECK_TASK_NAME).configure(t -> t.dependsOn(validateTask));
 
         var generateManifestTask = project.getTasks()

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

@@ -31,13 +31,9 @@ public void apply(Project project) {
                 t.getOutputFile().set(project.getLayout().getBuildDirectory().file("transport-version/references.txt"));
             });
 
-        Configuration transportVersionsConfig = project.getConfigurations().create("transportVersionNames", c -> {
-            c.setCanBeConsumed(true);
-            c.setCanBeResolved(false);
-            c.attributes(TransportVersionUtils::addTransportVersionReferencesAttribute);
-        });
-
-        project.getArtifacts().add(transportVersionsConfig.getName(), collectTask);
+        Configuration tvReferencesConfig = project.getConfigurations().detachedConfiguration();
+        tvReferencesConfig.attributes(TransportVersionUtils::addTransportVersionReferencesAttribute);
+        project.getArtifacts().add(tvReferencesConfig.getName(), collectTask);
 
         var validateTask = project.getTasks()
             .register("validateTransportVersionReferences", ValidateTransportVersionReferencesTask.class, t -> {
@@ -46,7 +42,6 @@ public void apply(Project project) {
                 t.getDefinitionsDirectory().set(TransportVersionUtils.getDefinitionsDirectory(project));
                 t.getReferencesFile().set(collectTask.get().getOutputFile());
             });
-
         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,8 +73,12 @@ static List<TransportVersionReference> readReferencesFile(Path file) throws IOEx
     }
 
     static Directory getDefinitionsDirectory(Project project) {
-        Directory serverDir = project.project(":server").getLayout().getProjectDirectory();
-        return serverDir.dir("src/main/resources/transport/defined");
+        var projectName = project.findProperty("org.elasticsearch.transport.definitionsProject");
+        if (projectName == null) {
+            projectName = ":server";
+        }
+        Directory projectDir = project.project(projectName.toString()).getLayout().getProjectDirectory();
+        return projectDir.dir("src/main/resources/transport/defined");
     }
 
     static void addTransportVersionReferencesAttribute(AttributeContainer attributes) {