(maven-antrun-plugin) branch master updated: Prefer JDK String.join method (#345)

[elharo]

This is an automated email from the ASF dual-hosted git repository.

elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-antrun-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new 605285a  Prefer JDK String.join method (#345)
605285a is described below

commit 605285ab5822a1cb961db879bd0aec3025c627be
Author: Elliotte Rusty Harold <elh...@users.noreply.github.com>
AuthorDate: Tue Oct 21 19:38:56 2025 +0000

    Prefer JDK String.join method (#345)
---
 .../maven/ant/tasks/support/VersionMapper.java     |  6 +++---
 .../apache/maven/plugins/antrun/AntRunMojo.java    | 23 +++++++++++-----------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git 
a/src/main/java/org/apache/maven/ant/tasks/support/VersionMapper.java 
b/src/main/java/org/apache/maven/ant/tasks/support/VersionMapper.java
index fac67ae..77f0f2b 100644
--- a/src/main/java/org/apache/maven/ant/tasks/support/VersionMapper.java
+++ b/src/main/java/org/apache/maven/ant/tasks/support/VersionMapper.java
@@ -24,7 +24,6 @@ import java.util.Comparator;
 import java.util.List;
 
 import org.apache.tools.ant.util.FileNameMapper;
-import org.codehaus.plexus.util.StringUtils;
 
 /**
  * Ant filename mapper to remove version info from filename when copying 
dependencies.
@@ -59,11 +58,12 @@ public class VersionMapper implements FileNameMapper, 
Comparator<String> {
     /**
      * Set the versions identifiers that this mapper can remove from 
filenames. The separator value used is path
      * separator, as used by dependencies task when setting 
<code>versionsId</code> property value.
-     * @param from The string from which we set.
+     *
+     * @param from the string from which we set
      */
     @Override
     public void setFrom(String from) {
-        String[] split = StringUtils.split(from, File.pathSeparator);
+        String[] split = from.split(File.pathSeparator);
         // sort, from lengthiest to smallest
         Arrays.sort(split, this);
         versions = Arrays.asList(split);
diff --git a/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java 
b/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java
index 25b026c..94462ec 100644
--- a/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java
+++ b/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java
@@ -51,7 +51,6 @@ import org.apache.tools.ant.taskdefs.Typedef;
 import org.apache.tools.ant.types.Path;
 import org.codehaus.plexus.configuration.PlexusConfiguration;
 import org.codehaus.plexus.util.ReaderFactory;
-import org.codehaus.plexus.util.StringUtils;
 
 /**
  * <p>
@@ -341,20 +340,20 @@ public class AntRunMojo extends AbstractMojo {
 
     private void addAntProjectReferences(MavenProject mavenProject, Project 
antProject)
             throws DependencyResolutionRequiredException {
-        Path p = new Path(antProject);
-        
p.setPath(StringUtils.join(mavenProject.getCompileClasspathElements().iterator(),
 File.pathSeparator));
+        Path path = new Path(antProject);
+        path.setPath(String.join(File.pathSeparator, 
mavenProject.getCompileClasspathElements()));
 
         /* maven.dependency.classpath it's deprecated as it's equal to 
maven.compile.classpath */
-        antProject.addReference(MAVEN_REFID_PREFIX + "dependency.classpath", 
p);
-        antProject.addReference(MAVEN_REFID_PREFIX + "compile.classpath", p);
+        antProject.addReference(MAVEN_REFID_PREFIX + "dependency.classpath", 
path);
+        antProject.addReference(MAVEN_REFID_PREFIX + "compile.classpath", 
path);
 
-        p = new Path(antProject);
-        
p.setPath(StringUtils.join(mavenProject.getRuntimeClasspathElements().iterator(),
 File.pathSeparator));
-        antProject.addReference(MAVEN_REFID_PREFIX + "runtime.classpath", p);
+        path = new Path(antProject);
+        path.setPath(String.join(File.pathSeparator, 
mavenProject.getRuntimeClasspathElements()));
+        antProject.addReference(MAVEN_REFID_PREFIX + "runtime.classpath", 
path);
 
-        p = new Path(antProject);
-        
p.setPath(StringUtils.join(mavenProject.getTestClasspathElements().iterator(), 
File.pathSeparator));
-        antProject.addReference(MAVEN_REFID_PREFIX + "test.classpath", p);
+        path = new Path(antProject);
+        path.setPath(String.join(File.pathSeparator, 
mavenProject.getTestClasspathElements()));
+        antProject.addReference(MAVEN_REFID_PREFIX + "test.classpath", path);
 
         /* set maven.plugin.classpath with plugin dependencies */
         antProject.addReference(
@@ -388,7 +387,7 @@ public class AntRunMojo extends AbstractMojo {
         }
 
         Path p = new Path(antProject);
-        p.setPath(StringUtils.join(list.iterator(), File.pathSeparator));
+        p.setPath(String.join(File.pathSeparator, list));
 
         return p;
     }