Skip to content

Commit f81f195

Browse files
committed
Missing
1 parent e86a676 commit f81f195

File tree

4 files changed

+7
-100
lines changed

4 files changed

+7
-100
lines changed

src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java

+2-10
Original file line numberDiff line numberDiff line change
@@ -5855,8 +5855,7 @@ private boolean isJavadocVMInitError(String output) {
58555855

58565856
/**
58575857
* @param p not null
5858-
* @return the javadoc link based on the project url i.e. <code>${project.url}/${destDir}</code> where
5859-
* <code>destDir</code> is configued in the Javadoc plugin configuration (<code>apidocs</code> by default).
5858+
* @return the javadoc link based on the project url i.e. <code>${project.url}/apidocs</code>.
58605859
* @since 2.6
58615860
*/
58625861
private static String getJavadocLink(MavenProject p) {
@@ -5865,15 +5864,8 @@ private static String getJavadocLink(MavenProject p) {
58655864
}
58665865

58675866
String url = cleanUrl(p.getUrl());
5868-
String destDir = "apidocs"; // see JavadocReport#destDir
58695867

5870-
final String pluginId = "org.apache.maven.plugins:maven-javadoc-plugin";
5871-
String destDirConfigured = getPluginParameter(p, pluginId, "destDir");
5872-
if (destDirConfigured != null) {
5873-
destDir = destDirConfigured;
5874-
}
5875-
5876-
return url + "/" + destDir;
5868+
return url + "/apidocs";
58775869
}
58785870

58795871
/**

src/site/apt/examples/alternate-doclet.apt.vm

-3
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,6 @@ Using Alternate Doclet In Addition To The Javadoc Doclet
9797
<additionalOption>\${project.build.directory}/site/doccheck</additionalOption>
9898
</additionalOptions>
9999

100-
<!-- Other dir than apidocs -->
101-
<destDir>doccheck</destDir>
102-
103100
<!-- For the project-reports page-->
104101
<name>DocCheck</name>
105102
<description>DocCheck documentation.</description>

src/site/apt/examples/output-configuration.apt.vm

+5-6
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ Using Alternative Output Directory
4040
<artifactId>maven-javadoc-plugin</artifactId>
4141
<version>${project.version}</version>
4242
<configuration>
43-
<reportOutputDirectory>\${project.reporting.outputDirectory}/myoutput</reportOutputDirectory>
44-
<destDir>myapidocs</destDir>
43+
<reportOutputDirectory>\${project.build.directory}/myoutput</reportOutputDirectory>
4544
...
4645
</configuration>
4746
</plugin>
@@ -53,8 +52,8 @@ Using Alternative Output Directory
5352
+-----+
5453

5554
Running <<<mvn javadoc:javadoc>>> will output the Javadoc in the
56-
<$\{project.reporting.outputDirectory\}/myoutput/myapidocs> instead of the default directory, i.e.
57-
<$\{project.reporting.outputDirectory\}/apidocs>.
55+
<<<$\{project.build.directory\}/myoutput/apidocs>>> instead of the default directory, i.e.
56+
<<<$\{project.build.directory\}/reports/apidocs>>>.
5857

59-
<<Note>>: Running <mvn site> will automatically use the <$\{project.reporting.outputDirectory\}> directory and
60-
in this case, <reportOutputDirectory> has no effect. Only, <testDestDir> and <destDir> could be used.
58+
<<Note>>: Running <<<mvn site>>> will automatically use the <<<$\{project.reporting.outputDirectory\}>>>
59+
directory and in this case, <<<\<reportOutputDirectory /\>>>> has no effect.

src/test/java/org/apache/maven/plugins/javadoc/stubs/JavadocJarInvalidDestdirMavenProjectStub.java

-81
This file was deleted.

0 commit comments

Comments
 (0)