From 1d71771c6a4d2394daf5fe55e898fd303ee88597 Mon Sep 17 00:00:00 2001
From: Michael Osipov <michaelo@apache.org>
Date: Sun, 12 Nov 2023 23:40:40 +0100
Subject: [PATCH] Dynamically calculate javadocDir/testJavadocDir

@kriegaex
---
 .../main/java/org/apache/maven/plugin/jxr/JxrReport.java    | 6 ++++--
 .../java/org/apache/maven/plugin/jxr/JxrTestReport.java     | 6 ++++--
 2 files changed, 8 insertions(+), 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
index b890aa9c..af039915 100644
--- 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
index 546e3b3b..bcc26cde 100644
--- 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,10 @@ 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")
+    @Parameter
     private File testJavadocDir;
 
     @Override
@@ -103,6 +105,6 @@ public String getOutputName() {
 
     @Override
     protected File getJavadocDir() {
-        return testJavadocDir;
+        return testJavadocDir != null ? testJavadocDir : new File(getReportOutputDirectory(), "testapidocs");
     }
 }