You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2018/06/23 20:15:06 UTC
[maven-project-info-reports-plugin] 01/02: [MPIR-372] Remove fields
duplicating parent class members
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-project-info-reports-plugin.git
commit ecdd72249300f64331b89bcd11ad3cdd253cf223
Author: Sylwester Lachiewicz <sl...@gmail.com>
AuthorDate: Mon Apr 30 22:59:39 2018 +0200
[MPIR-372] Remove fields duplicating parent class members
---
.../projectinfo/AbstractProjectInfoReport.java | 20 --------------------
.../maven/report/projectinfo/DependenciesReport.java | 16 ----------------
.../projectinfo/DependencyConvergenceReport.java | 7 -------
.../projectinfo/DependencyManagementReport.java | 14 --------------
.../report/projectinfo/PluginManagementReport.java | 11 -----------
.../maven/report/projectinfo/PluginsReport.java | 17 -----------------
.../projectinfo/AbstractProjectInfoTestCase.java | 2 +-
7 files changed, 1 insertion(+), 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
index 1243341..37bbeee 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
@@ -91,12 +91,6 @@ public abstract class AbstractProjectInfoReport
protected SiteTool siteTool;
/**
- * Doxia Site Renderer component.
- */
- @Component
- protected Renderer siteRenderer;
-
- /**
* Artifact Resolver component.
*/
@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
index 0b72c7c..02a531a 100644
--- 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.Mojo;
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;
@@ -73,12 +71,6 @@ public class DependenciesReport
// ----------------------------------------------------------------------
/**
- * Maven Project Builder component.
- */
- @Component
- private ProjectBuilder projectBuilder;
-
- /**
* Dependency graph builder component.
*
* @since 2.5
@@ -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
index 31697d4..94ecb1f 100644
--- 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.doxia.sink.impl.SinkEventAttributeSet;
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;
@@ -85,12 +84,6 @@ public class DependencyConvergenceReport
// ----------------------------------------------------------------------
/**
- * 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.
*/
@Component
diff --git a/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java b/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java
index ce494c9..9445a63 100644
--- 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.Component;
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.
@@ -49,12 +47,6 @@ public class DependencyManagementReport
// ----------------------------------------------------------------------
/**
- * Maven Project Builder component.
- */
- @Component
- private ProjectBuilder projectBuilder;
-
- /**
* Artifact metadata source component.
*
* @since 2.4
@@ -63,12 +55,6 @@ public class DependencyManagementReport
protected ArtifactMetadataSource artifactMetadataSource;
/**
- * Maven Artifact Factory component.
- */
- @Component
- private RepositorySystem repositorySystem;
-
- /**
* Repository metadata component.
*
* @since 2.3
diff --git a/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java b/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java
index e46e457..78389a6 100644
--- 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.doxia.sink.Sink;
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;
@@ -53,16 +52,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
index 1c2159a..4f5a1f6 100644
--- 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.doxia.sink.Sink;
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;
@@ -55,22 +54,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
index 7dde513..cf8d2f3 100644
--- 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 @@ public abstract class AbstractProjectInfoTestCase
setVariableValueToObject( mojo, "session", legacySupport.getSession() );
- setVariableValueToObject( mojo, "remoteRepositories", mojo.project.getRemoteArtifactRepositories() );
+ setVariableValueToObject( mojo, "remoteRepositories", mojo.getProject().getRemoteArtifactRepositories() );
return mojo;
}