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 2023/04/15 20:31:15 UTC
[maven-site-plugin] 02/12: [MSITE-949] Properly populate DocumentRenderingContext#generator for ReportDocumentRenderer
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch open-issues
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit 9883f84f039435a8585d2c950069262f4d9887ce
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Apr 15 17:57:26 2023 +0200
[MSITE-949] Properly populate DocumentRenderingContext#generator for ReportDocumentRenderer
---
.../maven/plugins/site/render/AbstractSiteRenderingMojo.java | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java b/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
index 2b5d81e6..36940a07 100644
--- a/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
+++ b/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
@@ -342,15 +342,11 @@ public abstract class AbstractSiteRenderingMojo extends AbstractSiteDescriptorMo
getLog().info("Skipped \"" + report.getName(locale) + "\" report" + reportMojoInfo + ", file \""
+ outputName + "\" already exists.");
} else {
- String reportMojoInfo = mavenReportExecution.getPlugin().getGroupId()
- + ':'
- + mavenReportExecution.getPlugin().getArtifactId()
- + ':'
- + mavenReportExecution.getPlugin().getVersion()
- + ':'
- + mavenReportExecution.getGoal();
+ String generator = mavenReportExecution.getGoal() == null
+ ? null
+ : mavenReportExecution.getPlugin().getId() + ':' + mavenReportExecution.getGoal();
DocumentRenderingContext docRenderingContext =
- new DocumentRenderingContext(siteDirectory, outputName, reportMojoInfo);
+ new DocumentRenderingContext(siteDirectory, outputName, generator);
DocumentRenderer docRenderer =
new ReportDocumentRenderer(mavenReportExecution, docRenderingContext, getLog());
documents.put(outputName, docRenderer);