From a1872237f3274786f199a414113f025b42020425 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Tue, 7 Jan 2025 13:43:49 -0800
Subject: [PATCH] Consistent Jelly version for `commons-jelly-tags-xml`

---
 bom/pom.xml             | 17 +++++++++------
 core/pom.xml            | 48 ++++++++++++-----------------------------
 licenseCompleter.groovy |  4 ++--
 war/pom.xml             |  1 +
 4 files changed, 28 insertions(+), 42 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 62f5c08fc0cf..3bdbd6926aff 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -40,7 +40,7 @@ THE SOFTWARE.
   <properties>
     <commons-fileupload2.version>2.0.0-M2</commons-fileupload2.version>
     <groovy.version>2.4.21</groovy.version>
-    <jelly.version>1.1-jenkins-20250107</jelly.version>
+    <jelly.version>1.1-jenkins-20250108</jelly.version>
     <stapler.version>1940.v41211a_a_b_b_d8b_</stapler.version>
   </properties>
 
@@ -132,11 +132,6 @@ THE SOFTWARE.
         <artifactId>commons-io</artifactId>
         <version>2.18.0</version>
       </dependency>
-      <dependency>
-        <groupId>commons-jelly</groupId>
-        <artifactId>commons-jelly-tags-xml</artifactId>
-        <version>1.1</version>
-      </dependency>
       <dependency>
         <groupId>commons-lang</groupId>
         <artifactId>commons-lang</artifactId>
@@ -243,11 +238,21 @@ THE SOFTWARE.
         <artifactId>annotation-indexer</artifactId>
         <version>1.18</version>
       </dependency>
+      <dependency>
+        <groupId>org.jenkins-ci</groupId>
+        <artifactId>commons-jelly</artifactId>
+        <version>${jelly.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.jenkins-ci</groupId>
         <artifactId>commons-jelly-tags-fmt</artifactId>
         <version>${jelly.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.jenkins-ci</groupId>
+        <artifactId>commons-jelly-tags-xml</artifactId>
+        <version>${jelly.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.jenkins-ci</groupId>
         <artifactId>commons-jexl</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 6821b4c99bf7..2f5745023595 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -166,40 +166,6 @@ THE SOFTWARE.
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-jelly</groupId>
-      <artifactId>commons-jelly-tags-xml</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-jelly</groupId>
-          <artifactId>commons-jelly</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>commons-jelly</groupId>
-          <artifactId>commons-jelly-tags-junit</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>commons-jexl</groupId>
-          <artifactId>commons-jexl</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>dom4j</groupId>
-          <artifactId>dom4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>xalan</groupId>
-          <artifactId>xalan</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>xerces</groupId>
-          <artifactId>xercesImpl</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>xml-apis</groupId>
-          <artifactId>xml-apis</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <!-- Jenkins doesn't use this directly, but some plugins wanted to use the latest -->
       <groupId>commons-lang</groupId>
@@ -310,6 +276,20 @@ THE SOFTWARE.
       <groupId>org.jenkins-ci</groupId>
       <artifactId>commons-jelly-tags-fmt</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci</groupId>
+      <artifactId>commons-jelly-tags-xml</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>jaxen</groupId>
+          <artifactId>jaxen</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.dom4j</groupId>
+          <artifactId>dom4j</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.jenkins-ci</groupId>
       <artifactId>commons-jexl</artifactId>
diff --git a/licenseCompleter.groovy b/licenseCompleter.groovy
index 9614f228667a..e74f2958e3fe 100644
--- a/licenseCompleter.groovy
+++ b/licenseCompleter.groovy
@@ -21,7 +21,6 @@ complete {
   // logkit is a part of Avalon
   match([
     "org.apache.ant:*",
-    "commons-jelly:*",
     "log4j:*",
     "avalon-framework:*",
     "logkit:logkit",
@@ -30,8 +29,9 @@ complete {
     "commons-beanutils:*",
     "commons-net:*",
     "commons-cli:*",
-    "*:commons-jelly",
+    "org.jenkins-ci:commons-jelly",
     "org.jenkins-ci:commons-jelly-tags-fmt",
+    "org.jenkins-ci:commons-jelly-tags-xml",
     "org.jvnet.hudson:commons-jelly-tags-define",
     "slide:slide-webdavlib"
   ]) {
diff --git a/war/pom.xml b/war/pom.xml
index ae8ce2916bf1..d5124c7e0508 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -152,6 +152,7 @@ THE SOFTWARE.
                     <exclude>org.jenkins-ci:annotation-indexer</exclude>
                     <exclude>org.jenkins-ci:commons-jelly</exclude>
                     <exclude>org.jenkins-ci:commons-jelly-tags-fmt</exclude>
+                    <exclude>org.jenkins-ci:commons-jelly-tags-xml</exclude>
                     <exclude>org.jenkins-ci:crypto-util</exclude>
                     <exclude>org.jenkins-ci.main:cli</exclude>
                     <exclude>org.jenkins-ci.main:jenkins-core</exclude>