Skip to content

[MSHARED-1298] Missing site report should be detected #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asfgit merged 1 commit into from
Oct 2, 2023
Merged

[MSHARED-1298] Missing site report should be detected #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,10 @@ protected List<MavenReportExecution> buildReportPlugin(
plugin.getArtifactId(),
plugin.getVersion(),
buff);
} else if (!hasUserDefinedReports) {
LOGGER.warn("Ignoring report plugin {}:{},"
+ " it does not contain any report goals: should be removed from reporting configuration in POM",
plugin.getArtifactId(), plugin.getVersion());
}

return reports;
Expand All @@ -225,7 +229,7 @@ protected List<MavenReportExecution> buildReportPlugin(
private boolean prepareGoals(
ReportPlugin reportPlugin, PluginDescriptor pluginDescriptor, List<GoalWithConf> goalsWithConfiguration) {
if (reportPlugin.getReportSets().isEmpty() && reportPlugin.getReports().isEmpty()) {
// by default, use every goal, which will be filtered later to only keep reporting goals
// by default, use every goal which will be filtered later to only keep reporting goals
List<MojoDescriptor> mojoDescriptors = pluginDescriptor.getMojos();
for (MojoDescriptor mojoDescriptor : mojoDescriptors) {
goalsWithConfiguration.add(new GoalWithConf(
Expand Down Expand Up @@ -292,11 +296,12 @@ private MavenReportExecution prepareReportExecution(
if (!isMavenReport(mojoExecution, pluginDescriptor)) {
if (hasUserDefinedReports) {
// reports were explicitly written in the POM
LOGGER.warn(
"Ignoring {}:{}"
LOGGER.warn("Ignoring {}:{}"
+ " goal since it is not a report: should be removed from reporting configuration in POM",
mojoExecution.getPlugin().getId(),
report.getGoal());
mojoExecution.getPlugin().getId(), report.getGoal());
} else {
LOGGER.debug("Ignoring {}:{} goal since it is not a report",
mojoExecution.getPlugin().getId(), report.getGoal());
}
return null;
}
Expand Down Expand Up @@ -411,15 +416,14 @@ private boolean isMavenReport(MojoExecution mojoExecution, PluginDescriptor plug

if (LOGGER.isDebugEnabled()) {
if (mojoDescriptor != null && mojoDescriptor.getImplementationClass() != null) {
LOGGER.debug(
"Class {} is MavenReport: ",
LOGGER.debug("Class {} is {}a MavenReport",
mojoDescriptor.getImplementationClass().getName(),
isMavenReport);
isMavenReport ? "" : "NOT ");
}

if (!isMavenReport) {
LOGGER.debug(
"Skipping non MavenReport {}",
"Skipping non-MavenReport {}",
mojoExecution.getMojoDescriptor().getId());
}
}
Expand Down