Merge pull request eXist-db#5394 from dizzzz/bugfix/6xx_remove_double…

…_jdom1 [bugfix] 6xx Make sure the latest jdom(1) jar is used
evolvedbinary · Aug 18, 2024 · 024276e · 024276e
2 parents 919dcaf + cca8f8d
commit 024276e
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 0 deletions.
diff --git a/exist-parent/pom.xml b/exist-parent/pom.xml
@@ -112,6 +112,7 @@
         <jansi.version>2.4.1</jansi.version>
         <jaxb.api.version>3.0.1</jaxb.api.version>
         <jaxb.impl.version>3.0.2</jaxb.impl.version>
+        <jdom1.version>1.1.3</jdom1.version>
         <jetty.version>9.4.54.v20240208</jetty.version>
         <log4j.version>2.22.1</log4j.version>
         <lucene.version>4.10.4</lucene.version>

diff --git a/extensions/indexes/spatial/pom.xml b/extensions/indexes/spatial/pom.xml
@@ -75,6 +75,22 @@
             <groupId>org.geotools</groupId>
             <artifactId>gt2-main</artifactId>
             <version>${geotools.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>jdom</groupId>
+                    <artifactId>jdom</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-beanutils</groupId>
+                    <artifactId>commons-beanutils</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.jdom</groupId>
+            <artifactId>jdom</artifactId>
+            <version>${jdom1.version}</version>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.geotools</groupId>
@@ -177,6 +193,7 @@
                                 <ignoredUnusedDeclaredDependency>java3d:vecmath:jar:1.3.1</ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>javax.media:jai_core:jar:1.1.3</ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>org.junit.vintage:junit-vintage-engine:jar</ignoredUnusedDeclaredDependency>
+                                <ignoredUnusedDeclaredDependency>org.jdom:jdom:jar:${jdom1.version}</ignoredUnusedDeclaredDependency>
                             </ignoredUnusedDeclaredDependencies>
                         </configuration>
                     </execution>

diff --git a/extensions/webdav/pom.xml b/extensions/webdav/pom.xml
@@ -60,6 +60,19 @@
             <groupId>org.exist-db.thirdparty.com.ettrema</groupId>
             <artifactId>milton-api</artifactId>
             <version>${milton.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>jdom</groupId>
+                    <artifactId>jdom</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jdom</groupId>
+            <artifactId>jdom</artifactId>
+            <version>${jdom1.version}</version>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
@@ -180,6 +193,7 @@
                             <failOnWarning>true</failOnWarning>
                             <ignoredUnusedDeclaredDependencies>
                                 <ignoredUnusedDeclaredDependency>org.junit.vintage:junit-vintage-engine:jar</ignoredUnusedDeclaredDependency>
+                                <ignoredUnusedDeclaredDependency>org.jdom:jdom:jar:${jdom1.version}</ignoredUnusedDeclaredDependency>
 
                                 <!-- needed for running tests that depend on eXist-db Jetty server -->
                                 <ignoredUnusedDeclaredDependency>${project.groupId}:exist-jetty-config:jar:${project.version}</ignoredUnusedDeclaredDependency>