You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2023/05/16 09:10:46 UTC
[maven] branch master updated: Prefer Java standard library to Plexus util (#1015)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new 2bbdd9788 Prefer Java standard library to Plexus util (#1015)
2bbdd9788 is described below
commit 2bbdd9788e3668462e859dff71c1fb7b4943b434
Author: Elliotte Rusty Harold <el...@users.noreply.github.com>
AuthorDate: Tue May 16 05:10:39 2023 -0400
Prefer Java standard library to Plexus util (#1015)
Co-authored-by: Guillaume Nodet <gn...@gmail.com>
---
.../org/apache/maven/settings/merge/MavenSettingsMerger.java | 4 ++--
.../maven/settings/validation/DefaultSettingsValidator.java | 10 ++++------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java
index 01f751b7f..5a8c44efe 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java
@@ -25,7 +25,6 @@ import java.util.Map;
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>
@@ -80,7 +79,8 @@ public class MavenSettingsMerger {
}
}
- if (StringUtils.isEmpty(dominant.getLocalRepository())) {
+ if (dominant.getLocalRepository() == null
+ || dominant.getLocalRepository().isEmpty()) {
dominant.setLocalRepository(recessive.getLocalRepository());
}
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java
index 3706775f7..5ed3d37f7 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java
@@ -34,7 +34,6 @@ import org.apache.maven.settings.Server;
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
@@ -58,12 +57,11 @@ public class DefaultSettingsValidator implements SettingsValidator {
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,