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 2025/11/04 01:44:42 UTC
(maven-release) branch master updated: `PlexusStringUtils` Refaster recipes (#1404)
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 b3d49dc7 `PlexusStringUtils` Refaster recipes (#1404)
b3d49dc7 is described below
commit b3d49dc70db1687d26b51e0bd47cf5cc8a3e0262
Author: Sylwester Lachiewicz <sl...@gmail.com>
AuthorDate: Tue Nov 4 02:44:36 2025 +0100
`PlexusStringUtils` Refaster recipes (#1404)
Co-authored-by: Moderne <te...@moderne.io>
---
.../java/org/apache/maven/shared/release/versions/Version.java | 8 ++++----
.../apache/maven/shared/release/versions/DefaultVersionInfo.java | 9 +++++----
.../org/apache/maven/plugins/release/PerformReleaseMojo.java | 2 +-
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/Version.java b/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/Version.java
index 1e896041..b6fdfeb4 100644
--- a/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/Version.java
+++ b/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/Version.java
@@ -199,21 +199,21 @@ public class Version implements Comparable<Version>, Cloneable {
}
if (info.annotation != null && !info.annotation.isEmpty()) {
- sb.append(StringUtils.defaultString(info.annotationSeparator));
+ sb.append(Objects.toString(info.annotationSeparator, ""));
sb.append(info.annotation);
}
if (info.annotationRevision != null && !info.annotationRevision.isEmpty()) {
if (info.annotation == null || info.annotation.isEmpty()) {
- sb.append(StringUtils.defaultString(info.annotationSeparator));
+ sb.append(Objects.toString(info.annotationSeparator, ""));
} else {
- sb.append(StringUtils.defaultString(info.annotationRevSeparator));
+ sb.append(Objects.toString(info.annotationRevSeparator, ""));
}
sb.append(info.annotationRevision);
}
if (buildSpecifier != null && !buildSpecifier.isEmpty()) {
- sb.append(StringUtils.defaultString(buildSeparator));
+ sb.append(Objects.toString(buildSeparator, ""));
sb.append(buildSpecifier);
}
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 c7d71c8f..d9f0bae1 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
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
+import java.util.Objects;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -333,21 +334,21 @@ public class DefaultVersionInfo implements VersionInfo {
}
if (info.annotation != null && !info.annotation.isEmpty()) {
- sb.append(StringUtils.defaultString(info.annotationSeparator));
+ sb.append(Objects.toString(info.annotationSeparator, ""));
sb.append(info.annotation);
}
if (info.annotationRevision != null && !info.annotationRevision.isEmpty()) {
if (info.annotation == null || info.annotation.isEmpty()) {
- sb.append(StringUtils.defaultString(info.annotationSeparator));
+ sb.append(Objects.toString(info.annotationSeparator, ""));
} else {
- sb.append(StringUtils.defaultString(info.annotationRevSeparator));
+ sb.append(Objects.toString(info.annotationRevSeparator, ""));
}
sb.append(info.annotationRevision);
}
if (buildSpecifier != null && !buildSpecifier.isEmpty()) {
- sb.append(StringUtils.defaultString(buildSeparator));
+ sb.append(Objects.toString(buildSeparator, ""));
sb.append(buildSpecifier);
}
diff --git a/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java b/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java
index dc4076f8..64bfe149 100644
--- a/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java
+++ b/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java
@@ -122,7 +122,7 @@ public class PerformReleaseMojo extends AbstractScmReadReleaseMojo {
// goals may be split into multiple lines in configuration.
// Let's build a single line command
if (goals != null) {
- goals = StringUtils.join(StringUtils.split(goals), " ");
+ goals = StringUtils.join(goals.split("\\s+"), " ");
}
try {