Missing

apache · Aug 14, 2024 · f81f195 · f81f195
1 parent e86a676
commit f81f195
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 100 deletions.
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -5855,8 +5855,7 @@ private boolean isJavadocVMInitError(String output) {
 
     /**
      * @param p not null
-     * @return the javadoc link based on the project url i.e. <code>${project.url}/${destDir}</code> where
-     *         <code>destDir</code> is configued in the Javadoc plugin configuration (<code>apidocs</code> by default).
+     * @return the javadoc link based on the project url i.e. <code>${project.url}/apidocs</code>.
      * @since 2.6
      */
     private static String getJavadocLink(MavenProject p) {
@@ -5865,15 +5864,8 @@ private static String getJavadocLink(MavenProject p) {
         }
 
         String url = cleanUrl(p.getUrl());
-        String destDir = "apidocs"; // see JavadocReport#destDir
 
-        final String pluginId = "org.apache.maven.plugins:maven-javadoc-plugin";
-        String destDirConfigured = getPluginParameter(p, pluginId, "destDir");
-        if (destDirConfigured != null) {
-            destDir = destDirConfigured;
-        }
-
-        return url + "/" + destDir;
+        return url + "/apidocs";
     }
 
     /**

diff --git a/src/site/apt/examples/alternate-doclet.apt.vm b/src/site/apt/examples/alternate-doclet.apt.vm
@@ -97,9 +97,6 @@ Using Alternate Doclet In Addition To The Javadoc Doclet
                 <additionalOption>\${project.build.directory}/site/doccheck</additionalOption>
               </additionalOptions>
 
-              <!-- Other dir than apidocs -->
-              <destDir>doccheck</destDir>
-
               <!-- For the project-reports page-->
               <name>DocCheck</name>
               <description>DocCheck documentation.</description>

diff --git a/src/site/apt/examples/output-configuration.apt.vm b/src/site/apt/examples/output-configuration.apt.vm
@@ -40,8 +40,7 @@ Using Alternative Output Directory
         <artifactId>maven-javadoc-plugin</artifactId>
         <version>${project.version}</version>
         <configuration>
-          <reportOutputDirectory>\${project.reporting.outputDirectory}/myoutput</reportOutputDirectory>
-          <destDir>myapidocs</destDir>
+          <reportOutputDirectory>\${project.build.directory}/myoutput</reportOutputDirectory>
           ...
         </configuration>
       </plugin>
@@ -53,8 +52,8 @@ Using Alternative Output Directory
 +-----+
 
   Running <<<mvn javadoc:javadoc>>> will output the Javadoc in the
-  <$\{project.reporting.outputDirectory\}/myoutput/myapidocs> instead of the default directory, i.e.
-  <$\{project.reporting.outputDirectory\}/apidocs>.
+  <<<$\{project.build.directory\}/myoutput/apidocs>>> instead of the default directory, i.e.
+  <<<$\{project.build.directory\}/reports/apidocs>>>.
 
- <<Note>>: Running <mvn site> will automatically use the <$\{project.reporting.outputDirectory\}> directory and
- in this case, <reportOutputDirectory> has no effect. Only, <testDestDir> and <destDir> could be used.
+ <<Note>>: Running <<<mvn site>>> will automatically use the <<<$\{project.reporting.outputDirectory\}>>>
+ directory and in this case, <<<\<reportOutputDirectory /\>>>> has no effect.
diff --git a/...java/org/apache/maven/plugins/javadoc/stubs/JavadocJarInvalidDestdirMavenProjectStub.java b/...java/org/apache/maven/plugins/javadoc/stubs/JavadocJarInvalidDestdirMavenProjectStub.java