Skip to content
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

Jump to bottom

Prefer Java standard library to Plexus util #1015

Merged
merged 8 commits into from
May 16, 2023
Merged

Prefer Java standard library to Plexus util #1015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e4f6e16
Prefer Java standard library to Plexus util
elharo Feb 26, 2023
772a907
format
elharo Feb 26, 2023
dd91917
revert accidental test
elharo Feb 26, 2023
92ed672
address code review
elharo Feb 26, 2023
de89800
don't trim
elharo Mar 11, 2023
2b91e28
Update DefaultSettingsValidator.java
gnodet Mar 13, 2023
7170d11
Update DefaultSettingsValidator.java
gnodet Mar 13, 2023
0fa4329
Merge branch 'master' into plexus
elharo Mar 24, 2023
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 ...n-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

import org.apache.maven.settings.IdentifiableBase;
import org.apache.maven.settings.Settings;
import org.codehaus.plexus.util.StringUtils;

/**
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
Expand Down Expand Up @@ -80,7 +79,8 @@ public void merge(Settings dominant, Settings recessive, String recessiveSourceL
}
}

if (StringUtils.isEmpty(dominant.getLocalRepository())) {
if (dominant.getLocalRepository() == null
|| dominant.getLocalRepository().isEmpty()) {
dominant.setLocalRepository(recessive.getLocalRepository());
}

Expand Down
10 changes: 4 additions & 6 deletions ...-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
import org.apache.maven.settings.Settings;
import org.apache.maven.settings.building.SettingsProblem.Severity;
import org.apache.maven.settings.building.SettingsProblemCollector;
import org.codehaus.plexus.util.StringUtils;

/**
* @author Milos Kleint
Expand All @@ -58,12 +57,11 @@ public void validate(Settings settings, SettingsProblemCollector problems) {

if (pluginGroups != null) {
for (int i = 0; i < pluginGroups.size(); i++) {
String pluginGroup = pluginGroups.get(i).trim();
String pluginGroup = pluginGroups.get(i);

if (StringUtils.isBlank(pluginGroup)) {
addViolation(
problems, Severity.ERROR, "pluginGroups.pluginGroup[" + i + "]", null, "must not be empty");
} else if (!ID_REGEX.matcher(pluginGroup).matches()) {
validateStringNotEmpty(problems, "pluginGroups.pluginGroup[" + i + "]", pluginGroup, null);

if (!ID_REGEX.matcher(pluginGroup).matches()) {
addViolation(
problems,
Severity.ERROR,
Expand Down