Skip to content

Commit 104b261

Browse files
committed
[MPLUGIN-493] Consistently evaluate skip parameter in MavenReport#canGenerateReport()
1 parent b8ba9ef commit 104b261

File tree

3 files changed

+20
-22
lines changed

3 files changed

+20
-22
lines changed

maven-plugin-report-plugin/src/it/plugin-report-annotations/src/main/java/org/DummyReport.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,21 +107,18 @@ protected MavenProject getProject() {
107107
* {@inheritDoc}
108108
*/
109109
public boolean canGenerateReport() {
110+
if (skip || skipReport) {
111+
getLog().info("Maven Plugin Plugin Report generation skipped.");
112+
return false;
113+
}
114+
110115
return true;
111116
}
112117

113118
/**
114119
* {@inheritDoc}
115120
*/
116121
protected void executeReport(Locale locale) throws MavenReportException {
117-
if (!canGenerateReport()) {
118-
return;
119-
}
120-
if (skip || skipReport) {
121-
getLog().info("Maven Plugin Plugin Report generation skipped.");
122-
return;
123-
}
124-
125122
// Generate the plugin's documentation
126123
generatePluginDocumentation(locale);
127124
}

maven-plugin-report-plugin/src/it/plugin-report/src/main/java/org/DummyReport.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,19 +101,16 @@ protected MavenProject getProject() {
101101

102102
/** {@inheritDoc} */
103103
public boolean canGenerateReport() {
104+
if (skip || skipReport) {
105+
getLog().info("Maven Plugin Plugin Report generation skipped.");
106+
return false;
107+
}
108+
104109
return true;
105110
}
106111

107112
/** {@inheritDoc} */
108113
protected void executeReport(Locale locale) throws MavenReportException {
109-
if (!canGenerateReport()) {
110-
return;
111-
}
112-
if (skip || skipReport) {
113-
getLog().info("Maven Plugin Plugin Report generation skipped.");
114-
return;
115-
}
116-
117114
// Generate the plugin's documentation
118115
generatePluginDocumentation(locale);
119116
}

maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginReport.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,19 +128,23 @@ public class PluginReport extends AbstractMavenReport {
128128
*/
129129
@Override
130130
public boolean canGenerateReport() {
131-
return enhancedPluginXmlFile != null && enhancedPluginXmlFile.isFile() && enhancedPluginXmlFile.canRead();
131+
if (skip) {
132+
getLog().info("Maven Plugin Plugin Report generation skipped.");
133+
return false;
134+
}
135+
136+
if (!(enhancedPluginXmlFile != null && enhancedPluginXmlFile.isFile() && enhancedPluginXmlFile.canRead())) {
137+
return false;
138+
}
139+
140+
return true;
132141
}
133142

134143
/**
135144
* {@inheritDoc}
136145
*/
137146
@Override
138147
protected void executeReport(Locale locale) throws MavenReportException {
139-
if (skip) {
140-
getLog().info("Maven Plugin Plugin Report generation skipped.");
141-
return;
142-
}
143-
144148
PluginDescriptor pluginDescriptor = extractPluginDescriptor();
145149

146150
// Generate the mojos' documentation

0 commit comments

Comments
 (0)