(maven-javadoc-plugin) 01/01: Use Java 7 relativization instead of our hand-rolled code

[elharo]

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

elharo pushed a commit to branch relative
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git

commit b10b2ae8f5112c5be908c43cd949126ff4452b44
Author: Elliotte Rusty Harold <elh...@ibiblio.org>
AuthorDate: Fri May 30 07:05:17 2025 -0400

    Use Java 7 relativization instead of our hand-rolled code
---
 .../org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 d3d2b42d..84bdcd5c 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -2228,10 +2228,10 @@ public abstract class AbstractJavadocMojo extends 
AbstractMojo {
                         }
 
                         if (getJavadocDirectory() != null) {
-                            String javadocDirRelative = PathUtils.toRelative(
-                                    project.getBasedir(), 
getJavadocDirectory().getAbsolutePath());
-                            File javadocDir = new 
File(subProject.getBasedir(), javadocDirRelative);
-                            if (javadocDir.exists() && 
javadocDir.isDirectory()) {
+                            Path base = project.getBasedir().toPath();
+                            Path relative = 
base.relativize(getJavadocDirectory().toPath().toAbsolutePath());
+                            Path javadocDir = 
subProject.getBasedir().toPath().resolve(relative);
+                            if (Files.exists(javadocDir) && 
javadocDir.isDirectory()) {
                                 Collection<Path> l = JavadocUtil.pruneDirs(
                                         subProject, 
Collections.singletonList(javadocDir.getAbsolutePath()));
                                 additionalSourcePaths.addAll(l);