From fb99aa5136d2a0e96fd8062564fbd7d1253e5c5d Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Fri, 30 May 2025 08:26:15 -0400 Subject: [PATCH 1/3] Use JDK 7 relativization instead of hand-rolled code --- .../apache/maven/plugins/javadoc/AbstractJavadocMojo.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 index d3d2b42db..0e1af0184 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java @@ -6012,8 +6012,10 @@ protected final JavadocOptions buildJavadocOptions() throws IOException { options.setTags(toList(tags)); if (getProject() != null && getJavadocDirectory() != null) { - options.setJavadocResourcesDirectory( - toRelative(getProject().getBasedir(), getJavadocDirectory().getAbsolutePath())); + Path basedir = getProject().getBasedir().toPath().toAbsolutePath(); + Path javadocDirectory = getJavadocDirectory().toPath().toAbsolutePath(); + Path javadocResourcesDirectory = basedir.relativize(javadocDirectory); + options.setJavadocResourcesDirectory(javadocResourcesDirectory.toString()); } File optionsFile = getJavadocOptionsFile(); From 92a44203bf40dc84d3679e9a3cba017675a39f3d Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Fri, 30 May 2025 08:27:16 -0400 Subject: [PATCH 2/3] spotless --- .../org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java index 0e1af0184..8bcd7c791 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java @@ -145,7 +145,6 @@ import static org.apache.maven.plugins.javadoc.JavadocUtil.isEmpty; import static org.apache.maven.plugins.javadoc.JavadocUtil.isNotEmpty; import static org.apache.maven.plugins.javadoc.JavadocUtil.toList; -import static org.apache.maven.plugins.javadoc.JavadocUtil.toRelative; /** * Base class with majority of Javadoc functionalities. From cbdd09a2d9944f26a18ec3e52a1fc118481148e2 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Fri, 30 May 2025 08:34:41 -0400 Subject: [PATCH 3/3] relative --- .../org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java index 8bcd7c791..b8ff98220 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java @@ -6011,7 +6011,7 @@ protected final JavadocOptions buildJavadocOptions() throws IOException { options.setTags(toList(tags)); if (getProject() != null && getJavadocDirectory() != null) { - Path basedir = getProject().getBasedir().toPath().toAbsolutePath(); + Path basedir = getProject().getBasedir().toPath(); Path javadocDirectory = getJavadocDirectory().toPath().toAbsolutePath(); Path javadocResourcesDirectory = basedir.relativize(javadocDirectory); options.setJavadocResourcesDirectory(javadocResourcesDirectory.toString());