This is an automated email from the ASF dual-hosted git repository. elharo pushed a commit to branch plexus in repository https://gitbox.apache.org/repos/asf/maven.git
commit e4f6e1614f945a79d1d19fcddcf198284d2b6edb Author: Elliotte Rusty Harold <[email protected]> AuthorDate: Sun Feb 26 08:24:16 2023 -0500 Prefer Java standard library to Plexus util --- .../src/main/java/org/apache/maven/artifact/DefaultArtifact.java | 3 +-- .../apache/maven/artifact/versioning/ComparableVersionTest.java | 8 ++++++++ .../java/org/apache/maven/settings/merge/MavenSettingsMerger.java | 3 +-- .../maven/settings/validation/DefaultSettingsValidator.java | 3 +-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java b/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java index dbf93e9fc..379c60117 100644 --- a/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java +++ b/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java @@ -33,7 +33,6 @@ import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import org.apache.maven.artifact.versioning.OverConstrainedVersionException; import org.apache.maven.artifact.versioning.VersionRange; -import org.codehaus.plexus.util.StringUtils; /** * @author Jason van Zyl @@ -172,7 +171,7 @@ public class DefaultArtifact implements Artifact { } public boolean hasClassifier() { - return StringUtils.isNotEmpty(classifier); + return classifier != null && !classifier.isEmpty(); } public String getScope() { diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java index 5695a2b9a..57ba5c9c8 100644 --- a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java +++ b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java @@ -364,4 +364,12 @@ public class ComparableVersionTest { checkVersionsEqual("2.0." + x, "2.0.0." + x); // previously ordered, now equals } } + + @Test + public void testMNG7701() { + ComparableVersion c1 = new ComparableVersion("1.x"); + ComparableVersion c2 = new ComparableVersion("1_x"); + + assertTrue(c1.compareTo(c2) < 0); + } } 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..f80197a75 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:[email protected]";>Vincent Siveton</a> @@ -80,7 +79,7 @@ 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..5a0374872 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 @@ -60,7 +59,7 @@ public class DefaultSettingsValidator implements SettingsValidator { for (int i = 0; i < pluginGroups.size(); i++) { String pluginGroup = pluginGroups.get(i).trim(); - if (StringUtils.isBlank(pluginGroup)) { + if (pluginGroup.trim().isEmpty()) { addViolation( problems, Severity.ERROR, "pluginGroups.pluginGroup[" + i + "]", null, "must not be empty"); } else if (!ID_REGEX.matcher(pluginGroup).matches()) {
