You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2023/11/21 20:46:56 UTC

(maven-site-plugin) branch MSITE-987 updated (fbf0596c -> 8ceb7b02)

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a change to branch MSITE-987
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git


    omit fbf0596c [MSITE-987] Consistently log when skipping report goal execution
     add a157124f [MSITE-991] Upgrade to Parent 41
     add 952ef111 [MSITE-993] Upgrade to Maven Reporting API 4.0.0-M9
     add 90797338 [MSITE-994] Upgrade to Maven Reporting Exec 4.0.0-M12
     add 87aeeb5f [MSITE-992] Upgrade to Doxia Sitetools 2.0.0-M16
     add fea50671 [MSITE-995] Upgrade plugins and components (in ITs)
     new 8ceb7b02 [MSITE-987] Consistently log when skipping report goal execution

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (fbf0596c)
            \
             N -- N -- N   refs/heads/MSITE-987 (8ceb7b02)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)


(maven-site-plugin) 01/01: [MSITE-987] Consistently log when skipping report goal execution

Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch MSITE-987
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git

commit 8ceb7b02a892ea4084bb1788e6dfdba896521c9c
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Oct 29 19:11:07 2023 +0100

    [MSITE-987] Consistently log when skipping report goal execution
    
    This closes #162
---
 .../apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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
index 76bcfac5..90f60165 100644
--- a/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
+++ b/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
@@ -225,12 +225,14 @@ public abstract class AbstractSiteRenderingMojo extends AbstractSiteDescriptorMo
         // filter out reports that can't be generated
         List<MavenReportExecution> reportExecutions = new ArrayList<>(allReports.size());
         for (MavenReportExecution exec : allReports) {
+            String reportMojoInfo = exec.getPlugin().getId() + ":" + exec.getGoal();
             try {
                 if (exec.canGenerateReport()) {
                     reportExecutions.add(exec);
+                } else if (exec.isUserDefined()) {
+                    getLog().info("Skipping " + reportMojoInfo + " report");
                 }
             } catch (MavenReportException e) {
-                String reportMojoInfo = exec.getPlugin().getId() + ":" + exec.getGoal();
                 throw new MojoExecutionException(
                         "Failed to determine whether report '" + reportMojoInfo + "' can be generated", e);
             }