Skip to content

[MNG-8707] Add methods to remove compile and test source roots #2275

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

Merged
gnodet merged 10 commits into from
Apr 30, 2025
Merged

[MNG-8707] Add methods to remove compile and test source roots #2275

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c4ff210
Add methods to remove compile and test source roots
gnodet Apr 25, 2025
6338192
Add @since 3.9.10 Javadoc to remove source root methods
gnodet Apr 25, 2025
83bdcdf
Add Javadoc to source root methods and implement warning for direct c…
gnodet Apr 25, 2025
9fdd16b
Fix add/remove methods to access fields directly instead of using wra…
gnodet Apr 25, 2025
27bfbaf
Improve warning message and add ability to disable warnings with syst…
gnodet Apr 25, 2025
36668fd
Fix LoggingList to properly delegate to underlying collection
gnodet Apr 25, 2025
65d71d1
Simplify LoggingList by extending AbstractList
gnodet Apr 25, 2025
20ba4b1
Extract common path sanitization logic into sanitizePath method
gnodet Apr 25, 2025
f0657dc
Add import for AbstractList and fix code formatting
gnodet Apr 25, 2025
bfa1fc5
Use project properties
gnodet Apr 30, 2025
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
28 changes: 27 additions & 1 deletion maven-core/src/main/java/org/apache/maven/project/MavenProject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ public DependencyManagement getDependencyManagement() {
private void addPath(List<String> paths, String path) {
if (path != null) {
path = path.trim();
if (path.length() > 0) {
if (!path.isEmpty()) {
File file = new File(path);
if (file.isAbsolute()) {
path = file.getAbsolutePath();
Expand All @@ -296,14 +296,40 @@ private void addPath(List<String> paths, String path) {
}
}

private void removePath(List<String> paths, String path) {
if (path != null) {
path = path.trim();
if (!path.isEmpty()) {
File file = new File(path);
if (file.isAbsolute()) {
path = file.getAbsolutePath();
} else if (".".equals(path)) {
path = getBasedir().getAbsolutePath();
} else {
path = new File(getBasedir(), path).getAbsolutePath();
}

paths.remove(path);
}
}
}

public void addCompileSourceRoot(String path) {
addPath(getCompileSourceRoots(), path);
}

public void removeCompileSourceRoot(String path) {
removePath(getCompileSourceRoots(), path);
}

public void addTestCompileSourceRoot(String path) {
addPath(getTestCompileSourceRoots(), path);
}

public void removeTestCompileSourceRoot(String path) {
removePath(getTestCompileSourceRoots(), path);
}

public List<String> getCompileSourceRoots() {
return compileSourceRoots;
}
Expand Down