Skip to content

PathTool.getRelativeFilePath: fix broken Windows drive-letter regex #384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
elharo wants to merge 5 commits into
base: master
Choose a base branch
from
Open

PathTool.getRelativeFilePath: fix broken Windows drive-letter regex #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
616d4a4
Add failing test: PathTool Windows drive letter regex
elharo Jul 1, 2026
86d6878
PathTool.getRelativeFilePath: fix broken Windows drive-letter regex
elharo Jul 1, 2026
10c0767
spotless:apply formatting
elharo Jul 1, 2026
43eb1ef
Potential fix for pull request finding
elharo Jul 24, 2026
6dd9321
Fix misleading comment: code strips backslash before drive letter, no…
Jul 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/main/java/org/apache/maven/shared/utils/PathTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,17 @@ public static String getRelativeFilePath(final String oldPath, final String newP
String fromPath = new File(oldPath).getPath();
String toPath = new File(newPath).getPath();

// strip any leading slashes if its a windows path
if (toPath.matches("^\\[a-zA-Z]:")) {
// strip any leading backslash before a Windows drive letter
if (toPath.length() > 2
&& toPath.charAt(0) == '\\'
&& Character.isLetter(toPath.charAt(1))
&& toPath.charAt(2) == ':') {
toPath = toPath.substring(1);
}
if (fromPath.matches("^\\[a-zA-Z]:")) {
if (fromPath.length() > 2
&& fromPath.charAt(0) == '\\'
&& Character.isLetter(fromPath.charAt(1))
&& fromPath.charAt(2) == ':') {
fromPath = fromPath.substring(1);
}

Expand Down
8 changes: 8 additions & 0 deletions src/test/java/org/apache/maven/shared/utils/PathToolTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,14 @@ public void testGetRelativePath2Parm() {
assertEquals("", PathTool.getRelativePath("/usr/local/java/bin/java.sh", "/usr/local/"));
}

@Test
public void testGetRelativeFilePathWithDifferentWindowsDrives() {
// Verifies that a leading backslash before a Windows drive letter (e.g. "\C:\\...")
// is stripped so the drive-letter comparison logic runs.
// Different drives should return null.
assertNull(PathTool.getRelativeFilePath("\\C:\\usr\\local", "\\D:\\usr\\local\\java\\bin"));
}

@Test
public void testUppercaseDrive() {
assertNull(PathTool.uppercaseDrive(null));
Expand Down
Loading