You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2026/10/01 06:08:49 UTC
(maven-enforcer) 01/01: Replace plexus-utils StringUtils with commons-lang3 in enforcer-rules
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch agent/plexus-utils-enforcer
in repository https://gitbox.apache.org/repos/asf/maven-enforcer.git
commit 09dd48d848f157e209b8693c99d61398531ff010
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Thu Oct 1 08:07:02 2026 +0200
Replace plexus-utils StringUtils with commons-lang3 in enforcer-rules
---
.../java/org/apache/maven/enforcer/rules/ReactorModuleConvergence.java | 2 +-
.../java/org/apache/maven/enforcer/rules/RequireNoRepositories.java | 2 +-
.../src/main/java/org/apache/maven/enforcer/rules/RequireOS.java | 2 +-
.../java/org/apache/maven/enforcer/rules/RequirePluginVersions.java | 2 +-
.../java/org/apache/maven/enforcer/rules/RequireProfileIdsExist.java | 3 +--
.../java/org/apache/maven/enforcer/rules/utils/ArtifactMatcher.java | 2 +-
.../org/apache/maven/enforcer/rules/version/RequireJavaVersion.java | 2 +-
7 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/ReactorModuleConvergence.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/ReactorModuleConvergence.java
index ff296086..b1412038 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/ReactorModuleConvergence.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/ReactorModuleConvergence.java
@@ -28,11 +28,11 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;
+import org.apache.commons.lang3.StringUtils;
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Dependency;
import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.StringUtils;
/**
* This rule will check if a multi-module build will follow the best practices.
diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireNoRepositories.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireNoRepositories.java
index df08c725..c47c1cc9 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireNoRepositories.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireNoRepositories.java
@@ -30,6 +30,7 @@ import java.util.Optional;
import java.util.function.Function;
import java.util.stream.Collectors;
+import org.apache.commons.lang3.StringUtils;
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Model;
@@ -38,7 +39,6 @@ import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.settings.Profile;
import org.apache.maven.settings.RepositoryBase;
-import org.codehaus.plexus.util.StringUtils;
/**
* This rule checks that this pom or its parents don't define a repository.
diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireOS.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireOS.java
index 945cde59..d1438766 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireOS.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireOS.java
@@ -23,6 +23,7 @@ import javax.inject.Named;
import java.util.Objects;
+import org.apache.commons.lang3.StringUtils;
import org.apache.maven.enforcer.rule.api.EnforcerRuleError;
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
import org.apache.maven.enforcer.rules.utils.OSUtil;
@@ -34,7 +35,6 @@ import org.apache.maven.model.profile.DefaultProfileActivationContext;
import org.apache.maven.model.profile.ProfileActivationContext;
import org.apache.maven.model.profile.activation.ProfileActivator;
import org.codehaus.plexus.util.Os;
-import org.codehaus.plexus.util.StringUtils;
/**
* This rule checks that the OS is allowed by combinations of family, name, version and cpu architecture. The behavior
diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequirePluginVersions.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequirePluginVersions.java
index 417ce78a..86994926 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequirePluginVersions.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequirePluginVersions.java
@@ -32,6 +32,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.Set;
+import org.apache.commons.lang3.StringUtils;
import org.apache.maven.BuildFailureException;
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.Artifact;
@@ -71,7 +72,6 @@ import org.apache.maven.settings.Settings;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import org.codehaus.plexus.util.StringUtils;
import org.eclipse.aether.RepositorySystem;
import org.eclipse.aether.resolution.ArtifactRequest;
import org.eclipse.aether.resolution.ArtifactResolutionException;
diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireProfileIdsExist.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireProfileIdsExist.java
index ad8cc17c..32c4079d 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireProfileIdsExist.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/RequireProfileIdsExist.java
@@ -28,7 +28,6 @@ import java.util.Objects;
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.StringUtils;
/**
* Ensure that all profiles mentioned on the commandline do exist.
@@ -87,7 +86,7 @@ public final class RequireProfileIdsExist extends AbstractStandardEnforcerRule {
} else {
sb.append("The requested profile doesn't exist: ");
}
- sb.append(StringUtils.join(profileIds.iterator(), ", "));
+ sb.append(String.join(", ", profileIds));
throw new EnforcerRuleException(sb.toString());
}
diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/utils/ArtifactMatcher.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/utils/ArtifactMatcher.java
index 99b62ec1..ade30ce2 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/utils/ArtifactMatcher.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/utils/ArtifactMatcher.java
@@ -24,13 +24,13 @@ import java.util.Objects;
import java.util.function.Function;
import java.util.function.Predicate;
+import org.apache.commons.lang3.StringUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.model.Dependency;
-import org.codehaus.plexus.util.StringUtils;
import static java.util.Optional.ofNullable;
diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/version/RequireJavaVersion.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/version/RequireJavaVersion.java
index 0252956b..7882ccf0 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/version/RequireJavaVersion.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/version/RequireJavaVersion.java
@@ -26,13 +26,13 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.SystemUtils;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
-import org.codehaus.plexus.util.StringUtils;
/**
* This rule checks that the Java version is allowed.