You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2023/11/16 16:32:11 UTC

(maven-jxr) 01/02: Dynamically calculate javadocDir/testJavadocDir

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch doxia-2.0.0
in repository https://gitbox.apache.org/repos/asf/maven-jxr.git

commit d4c03604b28f5df290e2199bec58157fd248bbc1
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Nov 12 23:40:40 2023 +0100

    Dynamically calculate javadocDir/testJavadocDir
    
    @kriegaex
---
 .../src/main/java/org/apache/maven/plugin/jxr/JxrReport.java       | 7 ++++---
 .../src/main/java/org/apache/maven/plugin/jxr/JxrTestReport.java   | 6 +++---
 2 files changed, 7 insertions(+), 6 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 b890aa9..cd9ee68 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
@@ -53,9 +53,10 @@ public class JxrReport extends AbstractJxrReport {
     private String sourcePath;
 
     /**
-     * Directory where Javadoc is generated for this project.
+     * Directory where Javadoc is generated for this project. The default value is calculated from
+     * {@link #getReportOutputDirectory()} and concatenated with {@code apidocs}.
      */
-    @Parameter(defaultValue = "${project.reporting.outputDirectory}/apidocs")
+    @Parameter
     private File javadocDir;
 
     @Override
@@ -121,6 +122,6 @@ public class JxrReport extends AbstractJxrReport {
 
     @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 cdcbbdf..cc16774 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
@@ -46,9 +46,9 @@ public class JxrTestReport extends AbstractJxrReport {
     private List<String> sourceDirs;
 
     /**
-     * Directory where Test Javadoc is generated for this project.
+     * Directory where Test Javadoc is generated for this project. The default value is calculated from
+     * {@link #getReportOutputDirectory()} and concatenated with {@code testapidocs}.
      */
-    @Parameter(defaultValue = "${project.reporting.outputDirectory}/testapidocs")
     private File testJavadocDir;
 
     @Override
@@ -103,6 +103,6 @@ public class JxrTestReport extends AbstractJxrReport {
 
     @Override
     protected File getJavadocDir() {
-        return testJavadocDir;
+        return testJavadocDir != null ? testJavadocDir : new File(getReportOutputDirectory(), "testapidocs");
     }
 }