diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-site/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-site/pom.xml index 7ffc7eef34..35243e75c7 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-site/pom.xml +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-site/pom.xml @@ -51,29 +51,12 @@ under the License. org.apache.maven.reporting maven-reporting-api - 3.1.0 - - - doxia - doxia-sink-api - - - - - org.apache.maven.doxia - doxia-sink-api - 1.0 + 4.0.0 org.apache.maven.reporting maven-reporting-exec - 1.6.0 - - - org.apache.maven - * - - + 2.0.0 diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-site/src/main/java/org/apache/maven/plugin/coreit/GenerateMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-site/src/main/java/org/apache/maven/plugin/coreit/GenerateMojo.java index 9e237e211f..009a0f29c4 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-site/src/main/java/org/apache/maven/plugin/coreit/GenerateMojo.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-site/src/main/java/org/apache/maven/plugin/coreit/GenerateMojo.java @@ -33,6 +33,7 @@ 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.reporting.MavenReport; +import org.apache.maven.reporting.MavenReportException; /** * Generates the available/configured reports. @@ -88,19 +89,23 @@ public class GenerateMojo extends AbstractMojo { for (Object report1 : reports) { MavenReport report = (MavenReport) report1; - if (report.canGenerateReport()) { - getLog().info("[MAVEN-CORE-IT-LOG] Generating report " + report); - try { - report.setReportOutputDirectory(outputDirectory); - report.generate(sink, locale); - } catch (Throwable e) { - getLog().warn("[MAVEN-CORE-IT-LOG] " + e, e); - if (!ignoreErrors) { - throw new MojoExecutionException("Failed to generate report " + report, e); + try { + if (report.canGenerateReport()) { + getLog().info("[MAVEN-CORE-IT-LOG] Generating report " + report); + try { + report.setReportOutputDirectory(outputDirectory); + report.generate(sink, locale); + } catch (Throwable e) { + getLog().warn("[MAVEN-CORE-IT-LOG] " + e, e); + if (!ignoreErrors) { + throw new MojoExecutionException("Failed to generate report " + report, e); + } } + } else { + getLog().info("[MAVEN-CORE-IT-LOG] Skipping report " + report); } - } else { - getLog().info("[MAVEN-CORE-IT-LOG] Skipping report " + report); + } catch (MavenReportException e) { + getLog().info("[MAVEN-CORE-IT-LOG] Failing report " + report); } } }