From 283ac1cb5e53ac79cb96c324aab32feaa96a48e6 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sun, 1 Feb 2026 07:15:36 -0600 Subject: [PATCH 1/5] Deprecate StringUtils.concatenate --- src/main/java/org/apache/maven/shared/utils/StringUtils.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/apache/maven/shared/utils/StringUtils.java b/src/main/java/org/apache/maven/shared/utils/StringUtils.java index 8e89c4f8..166eea13 100644 --- a/src/main/java/org/apache/maven/shared/utils/StringUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/StringUtils.java @@ -553,7 +553,9 @@ public static String[] split(@Nonnull String str, @Nullable String separator, in * * @param array the array of values to concatenate. * @return the concatenated string. + * @deprecated use java.lang.String.join() instead */ + @Deprecated @Nonnull public static String concatenate(@Nonnull Object... array) { return join(array, ""); From ae25617c2c9715cbd7a10883eda188478b5167fe Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sun, 1 Feb 2026 08:04:51 -0600 Subject: [PATCH 2/5] javadoc --- .../org/apache/maven/shared/utils/StringUtils.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/StringUtils.java b/src/main/java/org/apache/maven/shared/utils/StringUtils.java index 166eea13..56065c22 100644 --- a/src/main/java/org/apache/maven/shared/utils/StringUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/StringUtils.java @@ -458,7 +458,7 @@ public static String mid(String str, int pos, int len) { * @param str the String to parse * @return an array of parsed Strings * @deprecated use java.lang.String.split() instead. Be careful when migrating. - * String.split()) splits on a regular expression so while it can + * String.split() splits on a regular expression so while it can * do anything this method does, it is not a drop-in replacement. */ @Nonnull @@ -473,7 +473,7 @@ public static String[] split(@Nonnull String str) { * @return the resulting array * @see #split(String, String, int) * @deprecated use java.lang.String.split() instead. Be careful when migrating. - * String.split()) splits on a regular expression so while it can + * String.split() splits on a regular expression so while it can * do anything this method does, it is not a drop-in replacement. */ @Nonnull @@ -500,7 +500,7 @@ public static String[] split(@Nonnull String text, @Nullable String separator) { * array. A zero or negative value implies no limit. * @return an array of parsed Strings * @deprecated use java.lang.String.split() instead. Be careful when migrating. - * String.split()) splits on a regular expression so while it can + * String.split() splits on a regular expression so while it can * do anything this method does, it is not a drop-in replacement. */ @Nonnull @@ -553,7 +553,7 @@ public static String[] split(@Nonnull String str, @Nullable String separator, in * * @param array the array of values to concatenate. * @return the concatenated string. - * @deprecated use java.lang.String.join() instead + * @deprecated use java.lang.String.join() instead */ @Deprecated @Nonnull @@ -571,7 +571,7 @@ public static String concatenate(@Nonnull Object... array) { * @param array the array of values to join together * @param separator the separator character to use * @return the joined String - * @deprecated use java.lang.String.join() instead + * @deprecated use java.lang.String.join() instead */ @Deprecated @Nonnull @@ -602,7 +602,7 @@ public static String join(@Nonnull Object[] array, @Nullable String separator) { * @param iterator the Iterator of values to join together * @param separator the separator character to use * @return the joined String - * @deprecated use java.lang.String.join() instead + * @deprecated use java.lang.String.join() instead */ @Deprecated @Nonnull From 32dc417e36ca0e12e04173a3856afe003d028559 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sun, 1 Feb 2026 08:08:55 -0600 Subject: [PATCH 3/5] javadoc --- .../java/org/apache/maven/shared/utils/StringUtils.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/StringUtils.java b/src/main/java/org/apache/maven/shared/utils/StringUtils.java index 56065c22..5d37248c 100644 --- a/src/main/java/org/apache/maven/shared/utils/StringUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/StringUtils.java @@ -553,7 +553,8 @@ public static String[] split(@Nonnull String str, @Nullable String separator, in * * @param array the array of values to concatenate. * @return the concatenated string. - * @deprecated use java.lang.String.join() instead + * @deprecated use java.lang.String.join() or + * Arrays.stream(array).map(Object::toString).collect(Collectors.joining("")) instead */ @Deprecated @Nonnull @@ -571,7 +572,8 @@ public static String concatenate(@Nonnull Object... array) { * @param array the array of values to join together * @param separator the separator character to use * @return the joined String - * @deprecated use java.lang.String.join() instead + * @deprecated use java.lang.String.join() or + * Arrays.stream(array).map(Object::toString).collect(Collectors.joining(separator)) instead */ @Deprecated @Nonnull From 88606b36784bb12f20078ad259f4f75c8ceec553 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sun, 1 Feb 2026 15:10:40 -0600 Subject: [PATCH 4/5] spotless --- src/main/java/org/apache/maven/shared/utils/StringUtils.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/apache/maven/shared/utils/StringUtils.java b/src/main/java/org/apache/maven/shared/utils/StringUtils.java index 0ae1f480..f9ca0758 100644 --- a/src/main/java/org/apache/maven/shared/utils/StringUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/StringUtils.java @@ -1,4 +1,3 @@ - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file From 625c83094e8885f18edd868c54c8ba3354c0b286 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sun, 1 Feb 2026 19:56:19 -0600 Subject: [PATCH 5/5] nonnull --- src/main/java/org/apache/maven/shared/utils/StringUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/apache/maven/shared/utils/StringUtils.java b/src/main/java/org/apache/maven/shared/utils/StringUtils.java index f9ca0758..0cd9e048 100644 --- a/src/main/java/org/apache/maven/shared/utils/StringUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/StringUtils.java @@ -554,7 +554,7 @@ public static String[] split(@NonNull String str, @Nullable String separator, in * Arrays.stream(array).map(Object::toString).collect(Collectors.joining("")) instead */ @Deprecated - @Nonnull + @NonNull public static String concatenate(@NonNull Object... array) { return join(array, ""); }