(maven-archetype) branch master updated: Migrate from collections to collections4

[slachiewicz]

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


The following commit(s) were added to refs/heads/master by this push:
     new 1b80bdea Migrate from collections to collections4
1b80bdea is described below

commit 1b80bdeaadc04d7aee398f709b40c27ebbc20317
Author: Sylwester Lachiewicz <slachiew...@apache.org>
AuthorDate: Tue Nov 25 02:12:34 2025 +0100

    Migrate from collections to collections4
    
    
    Co-authored-by: Moderne <t...@moderne.io>
---
 archetype-common/pom.xml                                            | 5 +++--
 .../org/apache/maven/archetype/creator/FilesetArchetypeCreator.java | 2 +-
 maven-archetype-plugin/pom.xml                                      | 5 +++--
 .../java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java  | 2 +-
 pom.xml                                                             | 6 +++---
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/archetype-common/pom.xml b/archetype-common/pom.xml
index df1f0458..f7dd8544 100644
--- a/archetype-common/pom.xml
+++ b/archetype-common/pom.xml
@@ -122,8 +122,9 @@
       <artifactId>commons-io</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-collections4</artifactId>
+      <version>4.5.0</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
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 ad78e7cd..7ebddb51 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,7 @@ import java.util.Set;
 
 import com.ibm.icu.text.CharsetDetector;
 import com.ibm.icu.text.CharsetMatch;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.maven.archetype.ArchetypeCreationRequest;
 import org.apache.maven.archetype.ArchetypeCreationResult;
 import org.apache.maven.archetype.common.ArchetypeFilesResolver;
diff --git a/maven-archetype-plugin/pom.xml b/maven-archetype-plugin/pom.xml
index 9017ed7e..aa2afc26 100644
--- a/maven-archetype-plugin/pom.xml
+++ b/maven-archetype-plugin/pom.xml
@@ -140,8 +140,9 @@
       <artifactId>velocity-engine-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-collections4</artifactId>
+      <version>4.5.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
diff --git 
a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
 
b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
index 0e81a266..1bf77499 100644
--- 
a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
+++ 
b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
@@ -40,7 +40,7 @@ import java.util.Objects;
 import java.util.Properties;
 import java.util.Set;
 
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.maven.archetype.ArchetypeGenerationRequest;
 import org.apache.maven.archetype.ArchetypeGenerationResult;
 import org.apache.maven.archetype.common.Constants;
diff --git a/pom.xml b/pom.xml
index e29d9d79..728903f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,9 +185,9 @@
         <version>2.4.1</version>
       </dependency>
       <dependency>
-        <groupId>commons-collections</groupId>
-        <artifactId>commons-collections</artifactId>
-        <version>3.2.2</version>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-collections4</artifactId>
+        <version>4.5.0</version>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>