added files to resources

Author: jdconrad

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

@@ -121,7 +121,7 @@ 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().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

@@ -57,9 +57,6 @@ public GenerateTestBuildInfoTask() {
 
     @TaskAction
     public void generatePropertiesFile() throws IOException {
-        // TODO: use ASM to load module-info.class as bytes
-        // TODO: META-INF jar manifest -- automatic name property
-        // TODO: look at jar file name -- remove version number of .jar
         Map<String, String> classesToModules = new HashMap<>();
         for (File file : getCodeLocations().get().getFiles()) {
             if (file.exists()) {

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

@@ -58,39 +58,28 @@ public void apply(final Project project) {
 
         SourceSetContainer sourceSets = project.getExtensions().getByType(SourceSetContainer.class);
 
-        // TODO: we no longer care about descriptor remove as inputs
-        // TODO: we no longer care about policy-yaml file remove as inputs
         var testBuildInfoTask = project.getTasks().register("generateTestBuildInfo", GenerateTestBuildInfoTask.class, task -> {
-            var pluginProperties = project.getTasks().withType(GeneratePluginPropertiesTask.class).named("pluginProperties");
-            // task.getDescriptorFile().set(pluginProperties.flatMap(GeneratePluginPropertiesTask::getOutputFile));
             var propertiesExtension = project.getExtensions().getByType(PluginPropertiesExtension.class);
             task.getComponentName().set(providerFactory.provider(propertiesExtension::getName));
-            var policy = project.getLayout().getProjectDirectory().file("src/main/plugin-metadata/entitlement-policy.yaml");
-            if (policy.getAsFile().exists()) {
-                // task.getPolicyFile().set(policy);
-            }
-            // TODO: get first class of each location in deterministic order
-            // TODO: filter META_INF and module-info.class out of these
-
             task.getCodeLocations()
                 .set(
                     project.getConfigurations()
                         .getByName("runtimeClasspath")
                         .minus(project.getConfigurations().getByName(CompileOnlyResolvePlugin.RESOLVEABLE_COMPILE_ONLY_CONFIGURATION_NAME))
                         .plus(sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME).getOutput().getClassesDirs())
                 );
-
-            Provider<Directory> directory = project.getLayout().getBuildDirectory().dir("generated-build-info/test");
+            Provider<Directory> directory = project.getLayout().getBuildDirectory().dir("generated-build-info");
             task.getOutputDirectory().set(directory);
         });
 
-        sourceSets.named(SourceSet.TEST_SOURCE_SET_NAME).configure(sourceSet -> { sourceSet.getResources().srcDir(testBuildInfoTask); });
-
         project.getTasks().withType(ProcessResources.class).named("processResources").configure(task -> {
-            // TODO: this is a copy task
-            // TODO: do this for descriptor and policy-yaml file
-            // TODO: use child copy spec
-            // task.into()
+            var componentName = project.getExtensions().getByType(PluginPropertiesExtension.class).getName();
+            var pluginProperties = project.getTasks().withType(GeneratePluginPropertiesTask.class).named("pluginProperties");
+            task.into("META-INF/es-plugins/" + componentName + "/", copy -> {
+                copy.from(pluginProperties);
+                copy.from(project.getLayout().getProjectDirectory().file("src/main/plugin-metadata/entitlement-policy.yaml"));
+            });
+            task.into("META-INF", copy -> copy.from(testBuildInfoTask));
         });
     }