Improve maven-plugin-plugin task inputs

Author: larsgrefer

maven-plugin-plugin/src/main/java/io/freefair/gradle/plugins/maven/plugin/DescriptorGeneratorTask.java

@@ -8,7 +8,6 @@
 import org.apache.maven.plugin.descriptor.InvalidPluginDescriptorException;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
 import org.apache.maven.plugin.plugin.DescriptorGeneratorMojo;
-import org.apache.maven.project.MavenProject;
 import org.apache.maven.tools.plugin.DefaultPluginToolsRequest;
 import org.apache.maven.tools.plugin.extractor.ExtractionException;
 import org.apache.maven.tools.plugin.extractor.MojoDescriptorExtractor;
@@ -22,6 +21,10 @@
 import org.apache.maven.tools.plugin.scanner.MojoScanner;
 import org.codehaus.plexus.component.repository.ComponentDependency;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.artifacts.component.ComponentIdentifier;
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
+import org.gradle.api.artifacts.result.ResolvedArtifactResult;
 import org.gradle.api.file.ConfigurableFileCollection;
 import org.gradle.api.file.DirectoryProperty;
 import org.gradle.api.file.ProjectLayout;
@@ -30,15 +33,13 @@
 import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.provider.Property;
 import org.gradle.api.tasks.*;
+import org.gradle.api.tasks.Optional;
 
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import java.io.IOException;
 import java.lang.reflect.Field;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -78,8 +79,18 @@ public abstract class DescriptorGeneratorTask extends AbstractGeneratorTask {
     @Input
     public abstract Property<Boolean> getSkipErrorNoDescriptorsFound();
 
+    @InputFiles
+    public abstract ConfigurableFileCollection getMainSourceDirs();
+
+    @Internal
+    public abstract DirectoryProperty getMainOutputDirectory();
+
     public DescriptorGeneratorTask() {
         getSkipErrorNoDescriptorsFound().convention(false);
+
+        SourceSet main = getProject().getExtensions().getByType(JavaPluginExtension.class).getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME);
+        getMainSourceDirs().from(main.getAllJava().getSourceDirectories());
+        getMainOutputDirectory().convention(main.getJava().getClassesDirectory());
     }
 
     /**
@@ -89,8 +100,9 @@ public DescriptorGeneratorTask() {
     protected void generate() throws ExtractionException, InvalidPluginDescriptorException, XmlPullParserException, IOException, GeneratorException {
         PluginDescriptor pluginDescriptor = new PluginDescriptor();
 
-        SourceSetContainer sourceSets = getProject().getExtensions().getByType(JavaPluginExtension.class).getSourceSets();
-        MavenProject project = new MavenProjectWrapper(getProjectLayout(), sourceSets, getPomFile().getAsFile().get());
+        MavenProjectWrapper project = new MavenProjectWrapper(getProjectLayout(), getPomFile().getAsFile().get());
+        project.setMainSourceDirs(getMainSourceDirs());
+        project.setMainOutputDirectory(getMainOutputDirectory());
 
         pluginDescriptor.setGroupId(project.getGroupId());
         pluginDescriptor.setArtifactId(project.getArtifactId());

maven-plugin-plugin/src/main/java/io/freefair/gradle/plugins/maven/plugin/wrappers/MavenProjectWrapper.java

@@ -6,9 +6,9 @@
 import org.apache.maven.project.artifact.ProjectArtifact;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 import org.gradle.api.Project;
+import org.gradle.api.file.DirectoryProperty;
+import org.gradle.api.file.FileCollection;
 import org.gradle.api.file.ProjectLayout;
-import org.gradle.api.tasks.SourceSet;
-import org.gradle.api.tasks.SourceSetContainer;
 
 import java.io.File;
 import java.io.FileReader;
@@ -26,10 +26,9 @@ public class MavenProjectWrapper extends MavenProject {
     private final ProjectLayout projectLayout;
     private final File pomFile;
 
-    private final SourceSet main;
-    private final SourceSet test;
+    private FileCollection mainSourceDirs;
 
-    public MavenProjectWrapper(ProjectLayout projectLayout, SourceSetContainer sourceSets, File pomFile) throws IOException, XmlPullParserException {
+    public MavenProjectWrapper(ProjectLayout projectLayout, File pomFile) throws IOException, XmlPullParserException {
         this.projectLayout = projectLayout;
         this.pomFile = pomFile;
 
@@ -40,14 +39,6 @@ public MavenProjectWrapper(ProjectLayout projectLayout, SourceSetContainer sourc
 
         getBuild().setDirectory(projectLayout.getBuildDirectory().get().getAsFile().getAbsolutePath());
 
-        main = sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME);
-        getBuild().setSourceDirectory(main.getJava().getSrcDirs().iterator().next().getAbsolutePath());
-        getBuild().setOutputDirectory(main.getJava().getClassesDirectory().get().getAsFile().getAbsolutePath());
-
-        test = sourceSets.getByName(SourceSet.TEST_SOURCE_SET_NAME);
-        getBuild().setTestSourceDirectory(test.getJava().getSrcDirs().iterator().next().getAbsolutePath());
-        getBuild().setTestOutputDirectory(test.getJava().getClassesDirectory().get().getAsFile().getAbsolutePath());
-
         setArtifact(new ProjectArtifact(this));
     }
 
@@ -63,15 +54,18 @@ public File getBasedir() {
 
     @Override
     public List<String> getCompileSourceRoots() {
-        return main.getJava().getSrcDirs().stream()
+        return mainSourceDirs.getFiles().stream()
                 .map(File::getAbsolutePath)
                 .collect(Collectors.toList());
     }
 
-    @Override
-    public List<String> getTestCompileSourceRoots() {
-        return test.getJava().getSrcDirs().stream()
-                .map(File::getAbsolutePath)
-                .collect(Collectors.toList());
+    public void setMainSourceDirs(FileCollection mainSourceDirs) {
+        this.mainSourceDirs = mainSourceDirs;
+        getBuild().setSourceDirectory(mainSourceDirs.getFiles().iterator().next().getAbsolutePath());
+    }
+
+    public void setMainOutputDirectory(DirectoryProperty mainOutputDirectory) {
+        getBuild().setOutputDirectory(mainOutputDirectory.get().getAsFile().getAbsolutePath());
     }
+
 }