(maven-javadoc-plugin) 01/01: [MJAVADOC-713] Skipping Javadoc reportset leaves empty Javadoc link in site

[michaelo]

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

michaelo pushed a commit to branch MJAVADOC-713
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git

commit afb2dee6b644dc5cd921eec0395ed40d6d6dc0c2
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Sun Oct 29 23:26:16 2023 +0100

    [MJAVADOC-713] Skipping Javadoc reportset leaves empty Javadoc link in site
    
    This closes #246
---
 src/main/java/org/apache/maven/plugins/javadoc/JavadocReport.java | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/main/java/org/apache/maven/plugins/javadoc/JavadocReport.java 
b/src/main/java/org/apache/maven/plugins/javadoc/JavadocReport.java
index 5bab790e..0d857831 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocReport.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocReport.java
@@ -221,7 +221,7 @@ public class JavadocReport extends AbstractJavadocMojo 
implements MavenMultiPage
     public boolean canGenerateReport() {
         boolean canGenerate = false;
 
-        if (this.isAggregator() || !"pom".equals(this.project.getPackaging())) 
{
+        if (!skip && (this.isAggregator() || 
!"pom".equals(this.project.getPackaging()))) {
             Collection<Path> sourcePaths;
             Map<Path, Collection<String>> files;
             try {
@@ -289,11 +289,6 @@ public class JavadocReport extends AbstractJavadocMojo 
implements MavenMultiPage
     /** {@inheritDoc} */
     @Override
     public void doExecute() throws MojoExecutionException, 
MojoFailureException {
-        if (skip) {
-            getLog().info("Skipping javadoc generation");
-            return;
-        }
-
         File outputDirectory = new File(getOutputDirectory());
 
         String filename = getOutputName() + ".html";