Clean up plexus-utils and plexus-xml dependencies (#661)

jenkinsci · Sep 10, 2024 · a4a2ab4 · a4a2ab4
1 parent d935db1
commit a4a2ab4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -10,10 +10,9 @@ updates:
       # Maven core artifacts are provided by the running Maven, so do not update
       # to prevent consuming something unavailable.
       - dependency-name: "org.apache.maven:*"
-      # https://lists.apache.org/thread/ltd1g1dbv0lqqdw5q941gmrkfyn6m87m
-      - dependency-name: "org.apache.maven.shared:maven-filtering"
-        versions: [">=3.3.2"]
-      - dependency-name: "org.codehaus.plexus:plexus-utils"
+      # Per https://codehaus-plexus.github.io/plexus-utils/ pin plexus-xml to 3
+      # for Maven 3 compatibility, as plexus-xml 4 works only in Maven 4.
+      - dependency-name: "org.codehaus.plexus:plexus-xml"
         versions: [">=4.0.0"]
   - package-ecosystem: "github-actions"
     directory: "/"

diff --git a/pom.xml b/pom.xml
@@ -168,7 +168,12 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.5.1</version>
+      <version>4.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-xml</artifactId>
+      <version>3.0.1</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
@@ -177,7 +182,7 @@
       <exclusions>
         <exclusion>
           <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-utils</artifactId>
+          <artifactId>plexus-xml</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -192,7 +197,7 @@
       <exclusions>
         <exclusion>
           <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-utils</artifactId>
+          <artifactId>plexus-xml</artifactId>
         </exclusion>
       </exclusions>
     </dependency>