[MJAVADOC-713] Skipping Javadoc reportset leaves empty Javadoc link in site

michael-o · michael-o · commit afb2dee6b644 · 2023-10-29T23:26:16.000+01:00
This closes #246
diff --git 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 boolean isExternalReport() {
     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 @@ private void updateReportOutputDirectory(File reportOutputDirectory, String dest
     /** {@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";
