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-archetype.git

commit dc2dfae84f72df13b6633c934626743a473fd2ab
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Sat Oct 31 17:51:24 2026 +0000

    Replace commons-lang3 with JDK and plexus-utils in archetype-common
---
 archetype-common/pom.xml                                             | 4 ----
 .../java/org/apache/maven/archetype/common/DefaultPomManager.java    | 2 +-
 .../java/org/apache/maven/archetype/common/util/ListScanner.java     | 2 +-
 .../main/java/org/apache/maven/archetype/common/util/PathUtils.java  | 2 +-
 .../org/apache/maven/archetype/creator/FilesetArchetypeCreator.java  | 2 +-
 .../apache/maven/archetype/generator/DefaultArchetypeGenerator.java  | 2 +-
 .../apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java | 2 +-
 .../apache/maven/archetype/ui/generation/ArchetypeSelectorUtils.java | 5 ++---
 .../maven/archetype/ui/generation/DefaultArchetypeSelector.java      | 2 +-
 9 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/archetype-common/pom.xml b/archetype-common/pom.xml
index 76262b78..96476ac3 100644
--- a/archetype-common/pom.xml
+++ b/archetype-common/pom.xml
@@ -109,10 +109,6 @@
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-xml</artifactId>
diff --git 
a/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java
 
b/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java
index c24e8cc0..3f89e48e 100644
--- 
a/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java
+++ 
b/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java
@@ -39,7 +39,6 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.archetype.common.util.Format;
 import org.apache.maven.archetype.common.util.PomUtils;
 import org.apache.maven.archetype.exception.InvalidPackaging;
@@ -57,6 +56,7 @@ import org.apache.maven.model.Reporting;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
 import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.XmlStreamReader;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.codehaus.plexus.util.xml.Xpp3DomUtils;
diff --git 
a/archetype-common/src/main/java/org/apache/maven/archetype/common/util/ListScanner.java
 
b/archetype-common/src/main/java/org/apache/maven/archetype/common/util/ListScanner.java
index dd8c447c..68b6af42 100644
--- 
a/archetype-common/src/main/java/org/apache/maven/archetype/common/util/ListScanner.java
+++ 
b/archetype-common/src/main/java/org/apache/maven/archetype/common/util/ListScanner.java
@@ -22,8 +22,8 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.lang3.StringUtils;
 import org.codehaus.plexus.util.SelectorUtils;
+import org.codehaus.plexus.util.StringUtils;
 
 /**
  * <p>Class for scanning a directory for files/directories which match certain 
criteria.</p>
diff --git 
a/archetype-common/src/main/java/org/apache/maven/archetype/common/util/PathUtils.java
 
b/archetype-common/src/main/java/org/apache/maven/archetype/common/util/PathUtils.java
index 935f2228..17caef37 100644
--- 
a/archetype-common/src/main/java/org/apache/maven/archetype/common/util/PathUtils.java
+++ 
b/archetype-common/src/main/java/org/apache/maven/archetype/common/util/PathUtils.java
@@ -22,7 +22,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.lang3.StringUtils;
+import org.codehaus.plexus.util.StringUtils;
 
 /**
  * @author rafale
diff --git 
a/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
 
b/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
index b87a8563..1b59573d 100644
--- 
a/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
+++ 
b/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
@@ -44,7 +44,6 @@ import java.util.Set;
 
 import com.ibm.icu.text.CharsetDetector;
 import com.ibm.icu.text.CharsetMatch;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.archetype.ArchetypeCreationRequest;
 import org.apache.maven.archetype.ArchetypeCreationResult;
 import org.apache.maven.archetype.common.ArchetypeFilesResolver;
@@ -71,6 +70,7 @@ import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.util.DirectoryScanner;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.XmlStreamReader;
 import org.codehaus.plexus.util.xml.XmlStreamWriter;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
diff --git 
a/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultArchetypeGenerator.java
 
b/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultArchetypeGenerator.java
index cf4b1f47..f3b32c5d 100644
--- 
a/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultArchetypeGenerator.java
+++ 
b/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultArchetypeGenerator.java
@@ -27,7 +27,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.archetype.ArchetypeGenerationRequest;
 import org.apache.maven.archetype.ArchetypeGenerationResult;
 import org.apache.maven.archetype.common.ArchetypeArtifactManager;
@@ -37,6 +36,7 @@ import 
org.apache.maven.archetype.exception.ArchetypeNotDefined;
 import org.apache.maven.archetype.exception.InvalidPackaging;
 import org.apache.maven.archetype.exception.UnknownArchetype;
 import org.apache.maven.archetype.old.OldArchetype;
+import org.codehaus.plexus.util.StringUtils;
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.repository.RemoteRepository;
diff --git 
a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
 
b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
index d46bf93b..df023058 100644
--- 
a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
+++ 
b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
@@ -24,7 +24,6 @@ import java.io.File;
 import java.util.Arrays;
 import java.util.Properties;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.archetype.ArchetypeGenerationRequest;
 import org.apache.maven.archetype.ArchetypeGenerationResult;
 import org.apache.maven.archetype.ArchetypeManager;
@@ -43,6 +42,7 @@ import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.util.StringUtils;
 import org.eclipse.aether.RepositorySystem;
 
 /**
diff --git 
a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/ArchetypeSelectorUtils.java
 
b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/ArchetypeSelectorUtils.java
index 7ba2150d..58849bcd 100644
--- 
a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/ArchetypeSelectorUtils.java
+++ 
b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/ArchetypeSelectorUtils.java
@@ -24,7 +24,6 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.archetype.catalog.Archetype;
 
 /**
@@ -37,12 +36,12 @@ public class ArchetypeSelectorUtils {
     }
 
     private static String extractGroupIdFromFilter(String filter) {
-        return filter.contains(":") ? StringUtils.substringBefore(filter, ":") 
: null;
+        return filter.contains(":") ? filter.substring(0, filter.indexOf(':')) 
: null;
     }
 
     private static String extractArtifactIdFromFilter(String filter) {
         // if no : the full text is considered as artifactId content
-        return filter.contains(":") ? StringUtils.substringAfter(filter, ":") 
: filter;
+        return filter.contains(":") ? filter.substring(filter.indexOf(':') + 
1) : filter;
     }
 
     /**
diff --git 
a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelector.java
 
b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelector.java
index 8fdaeeb9..57a76b58 100644
--- 
a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelector.java
+++ 
b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelector.java
@@ -27,13 +27,13 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.archetype.ArchetypeGenerationRequest;
 import org.apache.maven.archetype.ArchetypeManager;
 import org.apache.maven.archetype.catalog.Archetype;
 import org.apache.maven.archetype.exception.ArchetypeSelectionFailure;
 import org.apache.maven.archetype.ui.ArchetypeDefinition;
 import org.codehaus.plexus.components.interactivity.PrompterException;
+import org.codehaus.plexus.util.StringUtils;
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.repository.RemoteRepository;
 import org.slf4j.Logger;

Reply via email to