add output for server

Author: jdconrad

build-tools/build.gradle

@@ -51,6 +51,10 @@ gradlePlugin {
           id = 'elasticsearch.stable-esplugin'
           implementationClass = 'org.elasticsearch.gradle.plugin.StablePluginBuildPlugin'
         }
+        testBuildInfo {
+          id = 'elasticsearch.test-build-info'
+          implementationClass = 'org.elasticsearch.gradle.test.TestBuildInfoPlugin'
+        }
         javaRestTest {
             id = 'elasticsearch.java-rest-test'
             implementationClass = 'org.elasticsearch.gradle.test.JavaRestTestPlugin'

build-tools/src/main/java/org/elasticsearch/gradle/plugin/BasePluginBuildPlugin.java

@@ -121,7 +121,10 @@ private TaskProvider<Zip> createBundleTasks(final Project project, PluginPropert
             task.getIsLicensed().set(providerFactory.provider(extension::isLicensed));
 
             var mainSourceSet = project.getExtensions().getByType(SourceSetContainer.class).getByName(SourceSet.MAIN_SOURCE_SET_NAME);
-            FileCollection moduleInfoFile = mainSourceSet.getOutput().getClassesDirs().getAsFileTree().matching(p -> p.include("module-info.class"));
+            FileCollection moduleInfoFile = mainSourceSet.getOutput()
+                .getClassesDirs()
+                .getAsFileTree()
+                .matching(p -> p.include("module-info.class"));
             task.getModuleInfoFile().setFrom(moduleInfoFile);
 
         });

build-tools/src/main/java/org/elasticsearch/gradle/plugin/GenerateTestBuildInfoTask.java

@@ -29,7 +29,11 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.jar.Attributes;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
@@ -52,6 +56,9 @@ public GenerateTestBuildInfoTask() {
     @InputFiles
     public abstract Property<FileCollection> getCodeLocations();
 
+    @Input
+    public abstract Property<String> getOutputFileName();
+
     @OutputDirectory
     public abstract DirectoryProperty getOutputDirectory();
 
@@ -70,7 +77,7 @@ public void generatePropertiesFile() throws IOException {
                                 cr.accept(new ClassVisitor(Opcodes.ASM9) {
                                     @Override
                                     public ModuleVisitor visitModule(String name, int access, String version) {
-                                        //getLogger().lifecycle("FOUND 0: " + name + " | " + file.getAbsolutePath());
+                                        // getLogger().lifecycle("FOUND 0: " + name + " | " + file.getAbsolutePath());
                                         moduleName[0] = name;
                                         return super.visitModule(name, access, version);
                                     }
@@ -110,7 +117,7 @@ public ModuleVisitor visitModule(String name, int access, String version) {
                                                     cr.accept(new ClassVisitor(Opcodes.ASM9) {
                                                         @Override
                                                         public ModuleVisitor visitModule(String name, int access, String version) {
-                                                            //getLogger().lifecycle("FOUND 1: " + name + " | " + file.getAbsolutePath());
+                                                            // getLogger().lifecycle("FOUND 1: " + name + " | " + file.getAbsolutePath());
                                                             moduleName[0] = name;
                                                             return super.visitModule(name, access, version);
                                                         }
@@ -122,7 +129,7 @@ public ModuleVisitor visitModule(String name, int access, String version) {
                                     if (moduleName[0] == null) {
                                         String amn = manifest.getMainAttributes().getValue("Automatic-Module-Name");
                                         if (amn != null) {
-                                            //getLogger().lifecycle("FOUND 2: " + amn + " | " + file.getAbsolutePath());
+                                            // getLogger().lifecycle("FOUND 2: " + amn + " | " + file.getAbsolutePath());
                                             moduleName[0] = amn;
                                         }
                                     }
@@ -135,7 +142,7 @@ public ModuleVisitor visitModule(String name, int access, String version) {
                                     jn = jn.substring(0, matcher.start());
                                 }
                                 jn = jn.replaceAll("[^A-Za-z0-9]", ".");
-                                //getLogger().lifecycle("FOUND 3: " + jn + " | " + file.getAbsolutePath());
+                                // getLogger().lifecycle("FOUND 3: " + jn + " | " + file.getAbsolutePath());
                                 moduleName[0] = jn;
                             }
                         }
@@ -174,7 +181,7 @@ public ModuleVisitor visitModule(String name, int access, String version) {
 
         Path outputDirectory = getOutputDirectory().get().getAsFile().toPath();
         Files.createDirectories(outputDirectory);
-        Path outputFile = outputDirectory.resolve(PROPERTIES_FILENAME);
+        Path outputFile = outputDirectory.resolve(getOutputFileName().get());
 
         try (var writer = Files.newBufferedWriter(outputFile, StandardCharsets.UTF_8)) {
             writer.write("{\n");

build-tools/src/main/java/org/elasticsearch/gradle/plugin/PluginBuildPlugin.java

@@ -10,16 +10,12 @@
 package org.elasticsearch.gradle.plugin;
 
 import org.elasticsearch.gradle.VersionProperties;
-import org.elasticsearch.gradle.dependencies.CompileOnlyResolvePlugin;
 import org.elasticsearch.gradle.test.TestBuildInfoPlugin;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
-import org.gradle.api.file.Directory;
 import org.gradle.api.file.RegularFile;
 import org.gradle.api.provider.Provider;
 import org.gradle.api.provider.ProviderFactory;
-import org.gradle.api.tasks.SourceSet;
-import org.gradle.api.tasks.SourceSetContainer;
 import org.gradle.language.jvm.tasks.ProcessResources;
 
 import javax.inject.Inject;
@@ -61,6 +57,7 @@ public void apply(final Project project) {
         project.getTasks().withType(GenerateTestBuildInfoTask.class).named("generateTestBuildInfo").configure(task -> {
             var propertiesExtension = project.getExtensions().getByType(PluginPropertiesExtension.class);
             task.getComponentName().set(providerFactory.provider(propertiesExtension::getName));
+            task.getOutputFileName().set("plugin-test-build-info.json");
         });
 
         project.getTasks().withType(ProcessResources.class).named("processResources").configure(task -> {

server/build.gradle

@@ -11,7 +11,7 @@ apply plugin: 'elasticsearch.build'
 apply plugin: 'elasticsearch.publish'
 apply plugin: 'elasticsearch.internal-cluster-test'
 apply plugin: 'elasticsearch.internal-test-artifact'
-// TODO: apply new plugin
+apply plugin: 'elasticsearch.test-build-info'
 
 publishing {
   publications {
@@ -286,4 +286,9 @@ tasks.named("licenseHeaders").configure {
 
 tasks.withType(Checkstyle.class).configureEach { t -> t.getMaxHeapSize().set("2g") }
 
-// TODO: add tasks.named for new task and set server as component
+tasks.named("generateTestBuildInfo").configure {
+  t -> {
+    t.getComponentName().set("server")
+    t.getOutputFileName().set("server-test-build-info.json")
+  }
+}