Skip to content

PlexusStringUtils Refaster recipes #1263

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −6
Draft

PlexusStringUtils Refaster recipes #1263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,13 +325,13 @@ protected Archiver createArchiver(
archiver.setOverrideUid(configSource.getOverrideUid());
}
if (StringUtils.isNotBlank(configSource.getOverrideUserName())) {
archiver.setOverrideUserName(StringUtils.trim(configSource.getOverrideUserName()));
archiver.setOverrideUserName(configSource.getOverrideUserName() == null ? null : configSource.getOverrideUserName().trim());
}
if (configSource.getOverrideGid() != null) {
archiver.setOverrideGid(configSource.getOverrideGid());
}
if (StringUtils.isNotBlank(configSource.getOverrideGroupName())) {
archiver.setOverrideGroupName(StringUtils.trim(configSource.getOverrideGroupName()));
archiver.setOverrideGroupName(configSource.getOverrideGroupName() == null ? null : configSource.getOverrideGroupName().trim());
}

return archiver;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,8 +346,8 @@ public static String evaluateFileNameMapping(

value = interpolator.interpolate(value);

value = StringUtils.replace(value, "//", "/");
value = StringUtils.replace(value, "\\\\", "\\");
value = value == null || value.isEmpty() ? value : value.replace("//", "/");
value = value == null || value.isEmpty() ? value : value.replace("\\\\", "\\");
value = fixRelativeRefs(value);

return value;
Expand Down Expand Up @@ -410,8 +410,8 @@ public static String getOutputDirectory(
value = value.substring(1);
}

value = StringUtils.replace(value, "//", "/");
value = StringUtils.replace(value, "\\\\", "\\");
value = value == null || value.isEmpty() ? value : value.replace("//", "/");
value = value == null || value.isEmpty() ? value : value.replace("\\\\", "\\");
value = fixRelativeRefs(value);

return value;
Expand Down
Loading