From c4e7806ed4426b2a7a45b30bfdf7119733f30fbc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 May 2023 11:56:53 +0000
Subject: [PATCH 1/2] Bump plexus-utils from 3.5.1 to 4.0.0

Bumps [plexus-utils](https://github.com/codehaus-plexus/plexus-utils) from 3.5.1 to 4.0.0.
- [Release notes](https://github.com/codehaus-plexus/plexus-utils/releases)
- [Commits](https://github.com/codehaus-plexus/plexus-utils/compare/plexus-utils-3.5.1...plexus-utils-4.0.0)

---
updated-dependencies:
- dependency-name: org.codehaus.plexus:plexus-utils
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ffa153ba8..d6733a5e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -339,7 +339,7 @@
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-utils</artifactId>
-        <version>3.5.1</version>
+        <version>4.0.0</version>
       </dependency>
       <dependency>
         <groupId>org.sonatype.plexus</groupId>

From 9527b527100a9410365a2a3a3dea704ce1b58b34 Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Mon, 22 May 2023 21:41:35 +0200
Subject: [PATCH 2/2] Fix build and tests

# Conflicts:
#	pom.xml
---
 modello-core/pom.xml                                         | 4 ++++
 modello-plugins/pom.xml                                      | 2 +-
 modello-test/pom.xml                                         | 4 ++++
 .../codehaus/modello/AbstractModelloJavaGeneratorTest.java   | 3 +++
 pom.xml                                                      | 5 +++++
 5 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/modello-core/pom.xml b/modello-core/pom.xml
index 5d0b6cd37..56aa88033 100644
--- a/modello-core/pom.xml
+++ b/modello-core/pom.xml
@@ -29,6 +29,10 @@
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-xml</artifactId>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/modello-plugins/pom.xml b/modello-plugins/pom.xml
index 4f4de80f7..a49695c9f 100644
--- a/modello-plugins/pom.xml
+++ b/modello-plugins/pom.xml
@@ -61,7 +61,7 @@
               <phase>process-test-resources</phase>
               <configuration>
                 <outputDirectory>${project.build.directory}/test-libs</outputDirectory>
-                <excludeTransitive>true</excludeTransitive>
+                <excludeTransitive>false</excludeTransitive>
                 <stripVersion>true</stripVersion>
               </configuration>
             </execution>
diff --git a/modello-test/pom.xml b/modello-test/pom.xml
index b8c968f4c..fd4dca719 100644
--- a/modello-test/pom.xml
+++ b/modello-test/pom.xml
@@ -24,6 +24,10 @@
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-xml</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-compiler-javac</artifactId>
diff --git a/modello-test/src/main/java/org/codehaus/modello/AbstractModelloJavaGeneratorTest.java b/modello-test/src/main/java/org/codehaus/modello/AbstractModelloJavaGeneratorTest.java
index 2b9ee7f4c..1dd1f7ab0 100755
--- a/modello-test/src/main/java/org/codehaus/modello/AbstractModelloJavaGeneratorTest.java
+++ b/modello-test/src/main/java/org/codehaus/modello/AbstractModelloJavaGeneratorTest.java
@@ -174,6 +174,9 @@ private void compileGeneratedSources(String verifierId, String javaSource) throw
 
         addDependency("junit", "junit");
         addDependency("org.codehaus.plexus", "plexus-utils");
+        addDependency("org.codehaus.plexus", "plexus-xml");
+        addDependency("org.apache.maven", "maven-api-xml");
+        addDependency("org.apache.maven", "maven-xml-impl");
         addDependency("org.codehaus.modello", "modello-test");
 
         String[] classPathElements = new String[dependencies.size() + 2];
diff --git a/pom.xml b/pom.xml
index d6733a5e2..3286d802a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -341,6 +341,11 @@
         <artifactId>plexus-utils</artifactId>
         <version>4.0.0</version>
       </dependency>
+      <dependency>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-xml</artifactId>
+        <version>4.0.0</version>
+      </dependency>
       <dependency>
         <groupId>org.sonatype.plexus</groupId>
         <artifactId>plexus-build-api</artifactId>