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 19:01:59 UTC
(maven-release) branch master updated: Use commons-lang3 and the JDK instead of plexus-utils StringUtils in the release manager
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git
The following commit(s) were added to refs/heads/master by this push:
new 7f56a52c Use commons-lang3 and the JDK instead of plexus-utils StringUtils in the release manager
7f56a52c is described below
commit 7f56a52c330e89d6d7c0b0970620bba06b64ce75
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Thu Oct 1 07:57:53 2026 +0200
Use commons-lang3 and the JDK instead of plexus-utils StringUtils in the release manager
---
.../shared/release/config/PropertiesReleaseDescriptorStore.java | 5 +----
.../apache/maven/shared/release/exec/AbstractMavenExecutor.java | 2 +-
.../apache/maven/shared/release/phase/AbstractCheckPomPhase.java | 2 +-
.../maven/shared/release/phase/AbstractRewritePomsPhase.java | 2 +-
.../apache/maven/shared/release/phase/AbstractRunGoalsPhase.java | 5 +----
.../apache/maven/shared/release/phase/RunPerformGoalsPhase.java | 2 +-
.../maven/shared/release/phase/ScmCheckModificationsPhase.java | 3 +--
.../apache/maven/shared/release/versions/DefaultVersionInfo.java | 7 ++++---
8 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
index 00fe00b0..626f63e5 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
@@ -37,7 +37,6 @@ import org.apache.maven.shared.release.config.ReleaseDescriptorBuilder.BuilderRe
import org.apache.maven.shared.release.scm.IdentifiedScm;
import org.apache.maven.shared.release.util.MavenCrypto;
import org.apache.maven.shared.release.util.MavenCrypto.MavenCryptoException;
-import org.codehaus.plexus.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -207,9 +206,7 @@ public class PropertiesReleaseDescriptorStore implements ReleaseDescriptorStore
properties.setProperty("exec.pomFileName", config.getPomFileName());
}
if (!config.getActivateProfiles().isEmpty()) {
- properties.setProperty(
- "exec.activateProfiles",
- StringUtils.join(config.getActivateProfiles().iterator(), ","));
+ properties.setProperty("exec.activateProfiles", String.join(",", config.getActivateProfiles()));
}
if (config.getPreparationGoals() != null) {
properties.setProperty("preparationGoals", config.getPreparationGoals());
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
index 980929a1..63d252af 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.apache.commons.lang3.StringUtils;
import org.apache.maven.settings.Proxy;
import org.apache.maven.settings.Server;
import org.apache.maven.settings.Settings;
@@ -32,7 +33,6 @@ import org.apache.maven.shared.release.ReleaseResult;
import org.apache.maven.shared.release.env.ReleaseEnvironment;
import org.apache.maven.shared.release.util.MavenCrypto;
import org.apache.maven.shared.release.util.MavenCrypto.MavenCryptoException;
-import org.codehaus.plexus.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractCheckPomPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractCheckPomPhase.java
index 7b24d39a..06b266d9 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractCheckPomPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractCheckPomPhase.java
@@ -20,6 +20,7 @@ package org.apache.maven.shared.release.phase;
import java.util.List;
+import org.apache.commons.lang3.StringUtils;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.project.MavenProject;
import org.apache.maven.scm.manager.NoSuchScmProviderException;
@@ -32,7 +33,6 @@ import org.apache.maven.shared.release.env.ReleaseEnvironment;
import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
import org.apache.maven.shared.release.util.MavenExpression;
-import org.codehaus.plexus.util.StringUtils;
import static java.util.Objects.requireNonNull;
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
index 7420fb77..5b59c3fd 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
@@ -33,6 +33,7 @@ import java.util.Properties;
import java.util.Set;
import java.util.TimeZone;
+import org.apache.commons.lang3.StringUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.model.Build;
@@ -66,7 +67,6 @@ import org.apache.maven.shared.release.transform.domtrip.DomTripModelETLFactory;
import org.apache.maven.shared.release.util.CiFriendlyVersion;
import org.apache.maven.shared.release.util.MavenExpression;
import org.apache.maven.shared.release.util.ReleaseUtil;
-import org.codehaus.plexus.util.StringUtils;
import static java.util.Objects.requireNonNull;
import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java
index 0aca7610..97db86e4 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java
@@ -29,7 +29,6 @@ import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.env.ReleaseEnvironment;
import org.apache.maven.shared.release.exec.MavenExecutor;
import org.apache.maven.shared.release.exec.MavenExecutorException;
-import org.codehaus.plexus.util.StringUtils;
import static java.util.Objects.requireNonNull;
import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
@@ -130,9 +129,7 @@ public abstract class AbstractRunGoalsPhase extends AbstractReleasePhase {
}
if (!releaseDescriptor.getActivateProfiles().isEmpty()) {
- builder.append(" -P ")
- .append(StringUtils.join(
- releaseDescriptor.getActivateProfiles().iterator(), ","));
+ builder.append(" -P ").append(String.join(",", releaseDescriptor.getActivateProfiles()));
}
return builder.length() > 0 ? builder.toString().trim() : null;
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java
index 43a89add..68816144 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java
@@ -26,6 +26,7 @@ import java.io.File;
import java.util.List;
import java.util.Map;
+import org.apache.commons.lang3.StringUtils;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseResult;
@@ -33,7 +34,6 @@ import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.env.ReleaseEnvironment;
import org.apache.maven.shared.release.exec.MavenExecutor;
import org.apache.maven.shared.release.util.PomFinder;
-import org.codehaus.plexus.util.StringUtils;
import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java
index 3cc020d7..37238d50 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java
@@ -49,7 +49,6 @@ import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
import org.apache.maven.shared.release.scm.ScmTranslator;
import org.codehaus.plexus.util.SelectorUtils;
-import org.codehaus.plexus.util.StringUtils;
import static java.util.Objects.requireNonNull;
@@ -107,7 +106,7 @@ public class ScmCheckModificationsPhase extends AbstractReleasePhase {
}
logInfo(relResult, "Verifying that there are no local modifications...");
- logInfo(relResult, " ignoring changes on: " + StringUtils.join(exclusionPatterns.toArray(), ", "));
+ logInfo(relResult, " ignoring changes on: " + String.join(", ", exclusionPatterns));
ScmRepository repository;
ScmProvider provider;
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/versions/DefaultVersionInfo.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/versions/DefaultVersionInfo.java
index c24cdbf6..ceb510bc 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/versions/DefaultVersionInfo.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/versions/DefaultVersionInfo.java
@@ -26,10 +26,10 @@ import java.util.Objects;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.commons.lang3.StringUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
-import org.codehaus.plexus.util.StringUtils;
/**
* This compares and increments versions for a common java versioning scheme.
@@ -199,7 +199,8 @@ public class DefaultVersionInfo implements VersionInfo {
if (digits != null) {
List<String> digits = new ArrayList<>(this.digits);
String annotationRevision = this.annotationRevision;
- if (StringUtils.isNumeric(annotationRevision)) {
+ // plexus-utils returns true for "" where commons-lang3 returns false; keep the original behaviour
+ if (org.codehaus.plexus.util.StringUtils.isNumeric(annotationRevision)) {
annotationRevision = incrementVersionString(annotationRevision);
} else {
digits.set(digits.size() - 1, incrementVersionString(digits.get(digits.size() - 1)));
@@ -362,7 +363,7 @@ public class DefaultVersionInfo implements VersionInfo {
* @return a single {@code String} of the items in the passed list, joined with a "."
*/
protected static String joinDigitString(List<String> digits) {
- return digits != null ? StringUtils.join(digits.iterator(), DIGIT_SEPARATOR_STRING) : null;
+ return digits != null ? String.join(DIGIT_SEPARATOR_STRING, digits) : null;
}
/**