Dynamically calculate javadocDir/testJavadocDir

@kriegaex
apache · Nov 16, 2023 · 85d3d26 · 85d3d26
1 parent 80e165a
commit 85d3d26
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrReport.java b/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrReport.java
@@ -54,8 +54,10 @@ public class JxrReport extends AbstractJxrReport {
 
     /**
      * Directory where Javadoc is generated for this project.
+     * <br>
+     * <strong>Default</strong>: {@link #getReportOutputDirectory()} + {@code /apidocs}
      */
-    @Parameter(defaultValue = "${project.reporting.outputDirectory}/apidocs")
+    @Parameter
     private File javadocDir;
 
     @Override
@@ -121,6 +123,6 @@ public String getOutputName() {
 
     @Override
     protected File getJavadocDir() {
-        return javadocDir;
+        return javadocDir != null ? javadocDir : new File(getReportOutputDirectory(), "apidocs");
     }
 }
diff --git a/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrTestReport.java b/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrTestReport.java
@@ -47,8 +47,9 @@ public class JxrTestReport extends AbstractJxrReport {
 
     /**
      * Directory where Test Javadoc is generated for this project.
+     * <br>
+     * <strong>Default</strong>: {@link #getReportOutputDirectory()} + {@code /testapidocs}
      */
-    @Parameter(defaultValue = "${project.reporting.outputDirectory}/testapidocs")
     private File testJavadocDir;
 
     @Override
@@ -103,6 +104,6 @@ public String getOutputName() {
 
     @Override
     protected File getJavadocDir() {
-        return testJavadocDir;
+        return testJavadocDir != null ? testJavadocDir : new File(getReportOutputDirectory(), "testapidocs");
     }
 }