[MSITE-970] Upgrade to Maven Reporting API 4.0.0-M7, Maven Reporting …

…Impl 4.0.0-M9, Maven Reporting Exec 2.0.0-M9
apache · Jul 7, 2023 · 0e4b54e · 0e4b54e
1 parent 8aa5412
commit 0e4b54e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -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</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</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</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;