From 151d487fb9c07fb8f3b22b881ec448fcebebf7df Mon Sep 17 00:00:00 2001
From: Jan Bartel <janb@webtide.com>
Date: Fri, 23 Jun 2023 16:06:58 +0200
Subject: [PATCH 1/2] Update plexus-utils to 4.0.0

---
 jetty-maven-plugin/pom.xml            |  4 ++++
 pom.xml                               |  8 +++++++-
 tests/test-websocket-autobahn/pom.xml | 13 ++++++++++++-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml
index f28ec134c85..6b0bac97ce3 100644
--- a/jetty-maven-plugin/pom.xml
+++ b/jetty-maven-plugin/pom.xml
@@ -160,6 +160,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.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-tools-api</artifactId>
diff --git a/pom.xml b/pom.xml
index 00afeede81f..e14ea7ee15d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,7 +114,8 @@
     <org.osgi.util.function.version>1.2.0</org.osgi.util.function.version>
     <org.osgi.util.promise.version>1.2.0</org.osgi.util.promise.version>
     <plexus-component-annotations.version>2.1.1</plexus-component-annotations.version>
-    <plexus-utils.version>3.5.1</plexus-utils.version>
+    <plexus-utils.version>4.0.0</plexus-utils.version>
+    <plexus-xml.version>4.0.0</plexus-xml.version>
     <slf4j.version>2.0.5</slf4j.version>
     <springboot.version>2.1.1.RELEASE</springboot.version>
     <taglibs-standard-impl.version>1.2.5</taglibs-standard-impl.version>
@@ -1256,6 +1257,11 @@
         <artifactId>plexus-utils</artifactId>
         <version>${plexus-utils.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-xml</artifactId>
+        <version>${plexus-xml.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>apache-jsp</artifactId>
diff --git a/tests/test-websocket-autobahn/pom.xml b/tests/test-websocket-autobahn/pom.xml
index 7505b770425..66f8ccfa565 100644
--- a/tests/test-websocket-autobahn/pom.xml
+++ b/tests/test-websocket-autobahn/pom.xml
@@ -60,6 +60,17 @@
       <artifactId>plexus-utils</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-xml</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.annotation</groupId>
+          <artifactId>javax.annotation-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>com.googlecode.json-simple</groupId>
       <artifactId>json-simple</artifactId>
@@ -131,4 +142,4 @@
     </profile>
   </profiles>
 
-</project>
\ No newline at end of file
+</project>

From 20869acff4f13c705f483abb2efb0c8529574d65 Mon Sep 17 00:00:00 2001
From: Jan Bartel <janb@webtide.com>
Date: Wed, 28 Jun 2023 18:51:35 +0200
Subject: [PATCH 2/2] Add plexus-xml to test-distribution

---
 tests/test-distribution/pom.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/test-distribution/pom.xml b/tests/test-distribution/pom.xml
index 3e21f60789a..662aeca4d56 100644
--- a/tests/test-distribution/pom.xml
+++ b/tests/test-distribution/pom.xml
@@ -17,6 +17,17 @@
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-xml</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.annotation</groupId>
+          <artifactId>javax.annotation-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.tests</groupId>
       <artifactId>jetty-home-tester</artifactId>