[maven-archetype] 01/01: [ARCHETYPE-648] upgrade p-u 3 to p-u 4 + p-xml 3

[hboutemy]

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

hboutemy pushed a commit to branch ARCHETYPE-648
in repository https://gitbox.apache.org/repos/asf/maven-archetype.git

commit 45c1d90e3bc6903020f6f082a814977044935542
Author: Hervé Boutemy <hbout...@apache.org>
AuthorDate: Tue Sep 12 07:49:15 2023 +0200

    [ARCHETYPE-648] upgrade p-u 3 to p-u 4 + p-xml 3
---
 archetype-models/archetype-catalog/pom.xml    |  7 -------
 archetype-models/archetype-descriptor/pom.xml |  7 -------
 archetype-models/pom.xml                      | 11 +++++++++++
 pom.xml                                       | 10 ++++++++--
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/archetype-models/archetype-catalog/pom.xml 
b/archetype-models/archetype-catalog/pom.xml
index f3e0d549..f18bd2d0 100644
--- a/archetype-models/archetype-catalog/pom.xml
+++ b/archetype-models/archetype-catalog/pom.xml
@@ -33,13 +33,6 @@
   <name>Maven Archetype Catalog Model</name>
   <description>Core Archetype Catalog Model.</description>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-    </dependency>
-  </dependencies>
-
   <build>
     <plugins>
       <plugin>
diff --git a/archetype-models/archetype-descriptor/pom.xml 
b/archetype-models/archetype-descriptor/pom.xml
index 2f47788b..fb48e71e 100644
--- a/archetype-models/archetype-descriptor/pom.xml
+++ b/archetype-models/archetype-descriptor/pom.xml
@@ -33,13 +33,6 @@
   <name>Maven Archetype Descriptor Model</name>
   <description>Core Archetype Descriptor Model.</description>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-    </dependency>
-  </dependencies>
-
   <build>
     <plugins>
       <plugin>
diff --git a/archetype-models/pom.xml b/archetype-models/pom.xml
index 9d89cb6f..f8ff75f9 100644
--- a/archetype-models/pom.xml
+++ b/archetype-models/pom.xml
@@ -38,6 +38,17 @@
     <module>archetype-descriptor</module>
   </modules>
 
+  <dependencies>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-xml</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+    </dependency>
+  </dependencies>
+
   <build>
     <pluginManagement>
       <plugins>
diff --git a/pom.xml b/pom.xml
index aad25deb..54fdb522 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,7 +158,13 @@
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-utils</artifactId>
-        <version>3.5.1</version>
+        <version>4.0.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-xml</artifactId>
+        <!-- DO NOT UPGRADE TO 4 -->
+        <version>3.0.0</version>
       </dependency>
       <dependency>
         <groupId>commons-io</groupId>
@@ -295,7 +301,7 @@
         <plugin>
           <groupId>org.codehaus.modello</groupId>
           <artifactId>modello-maven-plugin</artifactId>
-          <version>1.11</version>
+          <version>2.1.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>