MSHARED-1032

apache · Jun 24, 2023 · 1303ee3 · 1303ee3
1 parent 0f8cb00
commit 1303ee3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -197,8 +197,8 @@ under the License.
     <javaVersion>8</javaVersion>
     <!-- for dependencies -->
     <jettyVersion>9.4.51.v20230217</jettyVersion>
-    <doxiaVersion>2.0.0-M6</doxiaVersion>
-    <doxiaSitetoolsVersion>2.0.0-M10</doxiaSitetoolsVersion>
+    <doxiaVersion>2.0.0-M7</doxiaVersion>
+    <doxiaSitetoolsVersion>2.0.0-M11-SNAPSHOT</doxiaSitetoolsVersion>
     <wagonVersion>3.5.3</wagonVersion>
     <slf4jVersion>1.7.36</slf4jVersion>
     <!-- for ITs -->
@@ -209,7 +209,7 @@ under the License.
     <projectInfoReportsPluginVersion>3.4.5</projectInfoReportsPluginVersion>
     <surefirePluginVersion>3.0.0</surefirePluginVersion>
     <mavenPluginPluginVersion>3.9.0</mavenPluginPluginVersion>
-    <mavenReportingImplVersion>4.0.0-M8</mavenReportingImplVersion>
+    <mavenReportingImplVersion>4.0.0-M9-SNAPSHOT</mavenReportingImplVersion>
     <testingFluidoSkinVersion>2.0.0-M6</testingFluidoSkinVersion>
     <surefire.version>3.1.2</surefire.version>
     <project.build.outputTimestamp>2023-04-29T19:38:51Z</project.build.outputTimestamp>
@@ -220,12 +220,12 @@ under the License.
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-api</artifactId>
-      <version>4.0.0-M6</version>
+      <version>4.0.0-M7-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-exec</artifactId>
-      <version>2.0.0-M8</version>
+      <version>2.0.0-M9-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.shared</groupId>

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
@@ -53,6 +53,7 @@
 import org.apache.maven.plugins.site.descriptor.AbstractSiteDescriptorMojo;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.reporting.MavenReport;
+import org.apache.maven.reporting.MavenReportException;
 import org.apache.maven.reporting.exec.MavenReportExecution;
 import org.apache.maven.reporting.exec.MavenReportExecutor;
 import org.apache.maven.reporting.exec.MavenReportExecutorRequest;
@@ -214,8 +215,14 @@ protected List<MavenReportExecution> getReports() throws MojoExecutionException
         // filter out reports that can't be generated
         List<MavenReportExecution> reportExecutions = new ArrayList<>(allReports.size());
         for (MavenReportExecution exec : allReports) {
-            if (exec.canGenerateReport()) {
-                reportExecutions.add(exec);
+            try {
+                if (exec.canGenerateReport()) {
+                    reportExecutions.add(exec);
+                }
+            } catch (MavenReportException e) {
+                String reportMojoInfo = exec.getPlugin().getId() + ":" + exec.getGoal();
+                throw new MojoExecutionException(
+                        String.format("Failed to determine whether report '%s' can be generated", reportMojoInfo), e);
             }
         }
         return reportExecutions;