You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2022/09/13 21:19:57 UTC
[maven-dependency-plugin] 01/01: [MDEP-826] Upgrade maven-reporting-imp from 3.1.0 to 3.2.0
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch MDEP-826
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
commit 904dbbde471a1889b7bc76a4c5f77f8a924f8c3b
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Tue Sep 13 23:19:41 2022 +0200
[MDEP-826] Upgrade maven-reporting-imp from 3.1.0 to 3.2.0
---
pom.xml | 2 +-
.../dependency/analyze/AnalyzeReportMojo.java | 67 +++++++---------------
2 files changed, 21 insertions(+), 48 deletions(-)
diff --git a/pom.xml b/pom.xml
index ef875699..ebd78323 100644
--- a/pom.xml
+++ b/pom.xml
@@ -164,7 +164,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
diff --git a/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeReportMojo.java b/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeReportMojo.java
index 3d39533d..b6f522f8 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeReportMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeReportMojo.java
@@ -20,14 +20,12 @@ package org.apache.maven.plugins.dependency.analyze;
*/
import org.apache.maven.doxia.sink.Sink;
-import org.apache.maven.doxia.siterenderer.Renderer;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.LifecyclePhase;
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.MavenProject;
import org.apache.maven.reporting.AbstractMavenReport;
import org.apache.maven.reporting.MavenReportException;
import org.apache.maven.shared.dependency.analyzer.ProjectDependencyAnalysis;
@@ -51,24 +49,12 @@ public class AnalyzeReportMojo
{
// fields -----------------------------------------------------------------
- /**
- * The Maven project to analyze.
- */
- @Parameter( defaultValue = "${project}", readonly = true, required = true )
- private MavenProject project;
-
/**
* The Maven project dependency analyzer to use.
*/
@Component
private ProjectDependencyAnalyzer analyzer;
- /**
- *
- */
- @Component
- private Renderer siteRenderer;
-
/**
* Target folder
*
@@ -111,19 +97,6 @@ public class AnalyzeReportMojo
public void executeReport( Locale locale )
throws MavenReportException
{
- if ( skip )
- {
- getLog().info( "Skipping plugin execution" );
- return;
- }
-
- // Step 0: Checking pom availability
- if ( "pom".equals( project.getPackaging() ) )
- {
- getLog().info( "Skipping pom project" );
- return;
- }
-
if ( outputDirectory == null || !outputDirectory.exists() )
{
getLog().info( "Skipping project with no Target directory" );
@@ -163,6 +136,26 @@ public class AnalyzeReportMojo
// MavenReport methods ----------------------------------------------------
+
+ @Override
+ public boolean canGenerateReport()
+ {
+ if ( skip )
+ {
+ getLog().info( "Skipping plugin execution" );
+ return false;
+ }
+
+ // Step 0: Checking pom availability
+ if ( "pom".equals( project.getPackaging() ) )
+ {
+ getLog().info( "Skipping pom project" );
+ return false;
+ }
+
+ return true;
+ }
+
/*
* @see org.apache.maven.reporting.AbstractMavenReport#getOutputName()
*/
@@ -190,17 +183,6 @@ public class AnalyzeReportMojo
return getBundle( locale ).getString( "analyze.report.description" );
}
- // AbstractMavenReport methods --------------------------------------------
-
- /*
- * @see org.apache.maven.reporting.AbstractMavenReport#getProject()
- */
- @Override
- protected MavenProject getProject()
- {
- return project;
- }
-
/*
* @see org.apache.maven.reporting.AbstractMavenReport#getOutputDirectory()
*/
@@ -212,15 +194,6 @@ public class AnalyzeReportMojo
return outputDirectory.toString();
}
- /*
- * @see org.apache.maven.reporting.AbstractMavenReport#getSiteRenderer()
- */
- @Override
- protected Renderer getSiteRenderer()
- {
- return siteRenderer;
- }
-
// protected methods ------------------------------------------------------
/**