[MPIR-372] Remove fields duplicating parent class members

apache · Jun 23, 2018 · ecdd722 · ecdd722
1 parent b8e7175
commit ecdd722
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 86 deletions.
diff --git a/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java b/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
@@ -90,12 +90,6 @@ public abstract class AbstractProjectInfoReport
     @Component
     protected SiteTool siteTool;
 
-    /**
-     * Doxia Site Renderer component.
-     */
-    @Component
-    protected Renderer siteRenderer;
-
     /**
      * Artifact Resolver component.
      */
@@ -121,20 +115,6 @@ public abstract class AbstractProjectInfoReport
     // Mojo parameters
     // ----------------------------------------------------------------------
 
-    /**
-     * The output directory for the report. Note that this parameter is only evaluated if the goal is run directly from
-     * the command line. If the goal is run indirectly as part of a site generation, the output directory configured in
-     * the Maven Site Plugin is used instead.
-     */
-    @Parameter( property = "project.reporting.outputDirectory", required = true )
-    protected File outputDirectory;
-
-    /**
-     * The Maven Project.
-     */
-    @Parameter( defaultValue = "${project}", readonly = true, required = true )
-    protected MavenProject project;
-
     @Parameter( defaultValue = "${session}", readonly = true, required = true )
     private MavenSession session;
 

diff --git a/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java b/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
@@ -38,13 +38,11 @@
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.project.DefaultProjectBuildingRequest;
-import org.apache.maven.project.ProjectBuilder;
 import org.apache.maven.project.ProjectBuildingRequest;
 import org.apache.maven.report.projectinfo.dependencies.Dependencies;
 import org.apache.maven.report.projectinfo.dependencies.DependenciesReportConfiguration;
 import org.apache.maven.report.projectinfo.dependencies.RepositoryUtils;
 import org.apache.maven.report.projectinfo.dependencies.renderer.DependenciesRenderer;
-import org.apache.maven.repository.RepositorySystem;
 import org.apache.maven.shared.dependency.graph.DependencyGraphBuilder;
 import org.apache.maven.shared.dependency.graph.DependencyGraphBuilderException;
 import org.apache.maven.shared.dependency.graph.DependencyNode;
@@ -72,12 +70,6 @@ public class DependenciesReport
     // Mojo components
     // ----------------------------------------------------------------------
 
-    /**
-     * Maven Project Builder component.
-     */
-    @Component
-    private ProjectBuilder projectBuilder;
-
     /**
      * Dependency graph builder component.
      *
@@ -102,14 +94,6 @@ public class DependenciesReport
     @Component
     private RepositoryMetadataManager repositoryMetadataManager;
 
-    /**
-     * Maven Artifact Factory component.
-     *
-     * @since 2.1
-     */
-    @Component
-    private RepositorySystem repositorySystem;
-
     // ----------------------------------------------------------------------
     // Mojo parameters
     // ----------------------------------------------------------------------

diff --git a/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java b/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
@@ -40,7 +40,6 @@
 import org.apache.maven.model.Dependency;
 import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.DefaultProjectBuildingRequest;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.ProjectBuildingRequest;
@@ -84,12 +83,6 @@ public class DependencyConvergenceReport
     // Mojo parameters
     // ----------------------------------------------------------------------
 
-    /**
-     * The projects in the current build. The effective POM for each of these projects will written.
-     */
-    @Parameter( property = "reactorProjects", required = true, readonly = true )
-    private List<MavenProject> reactorProjects;
-
     /**
      * Dependency tree builder, will use it to build dependency tree.
      */

diff --git a/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java b/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java
@@ -27,12 +27,10 @@
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.project.DefaultProjectBuildingRequest;
-import org.apache.maven.project.ProjectBuilder;
 import org.apache.maven.project.ProjectBuildingRequest;
 import org.apache.maven.report.projectinfo.dependencies.ManagementDependencies;
 import org.apache.maven.report.projectinfo.dependencies.RepositoryUtils;
 import org.apache.maven.report.projectinfo.dependencies.renderer.DependencyManagementRenderer;
-import org.apache.maven.repository.RepositorySystem;
 
 /**
  * Generates the Project Dependency Management report.
@@ -48,12 +46,6 @@ public class DependencyManagementReport
     // Mojo components
     // ----------------------------------------------------------------------
 
-    /**
-     * Maven Project Builder component.
-     */
-    @Component
-    private ProjectBuilder projectBuilder;
-
     /**
      * Artifact metadata source component.
      *
@@ -62,12 +54,6 @@ public class DependencyManagementReport
     @Component
     protected ArtifactMetadataSource artifactMetadataSource;
 
-    /**
-     * Maven Artifact Factory component.
-     */
-    @Component
-    private RepositorySystem repositorySystem;
-
     /**
      * Repository metadata component.
      *

diff --git a/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java b/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java
@@ -25,7 +25,6 @@
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.PluginManagement;
 import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.project.DefaultProjectBuildingRequest;
@@ -52,16 +51,6 @@
 public class PluginManagementReport
     extends AbstractProjectInfoReport
 {
-    // ----------------------------------------------------------------------
-    // Mojo components
-    // ----------------------------------------------------------------------
-
-    /**
-     * Maven Project Builder component.
-     */
-    @Component
-    private ProjectBuilder projectBuilder;
-
     // ----------------------------------------------------------------------
     // Public methods
     // ----------------------------------------------------------------------

diff --git a/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java b/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java
@@ -32,7 +32,6 @@
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.ReportPlugin;
 import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.project.DefaultProjectBuildingRequest;
@@ -54,22 +53,6 @@
 public class PluginsReport
     extends AbstractProjectInfoReport
 {
-    // ----------------------------------------------------------------------
-    // Mojo components
-    // ----------------------------------------------------------------------
-
-    /**
-     * Maven Project Builder component.
-     */
-    @Component
-    private ProjectBuilder projectBuilder;
-
-    /**
-     * Maven Artifact Factory component.
-     */
-    @Component
-    private RepositorySystem repositorySystem;
-
     // ----------------------------------------------------------------------
     // Public methods
     // ----------------------------------------------------------------------

diff --git a/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java b/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
@@ -188,7 +188,7 @@ protected AbstractProjectInfoReport createReportMojo( String goal, File pluginXm
 
         setVariableValueToObject( mojo, "session", legacySupport.getSession() );
 
-        setVariableValueToObject( mojo, "remoteRepositories", mojo.project.getRemoteArtifactRepositories() );
+        setVariableValueToObject( mojo, "remoteRepositories", mojo.getProject().getRemoteArtifactRepositories() );
         return mojo;
     }