Skip to content

Commit 024276e

Browse files
authored
Merge pull request eXist-db#5394 from dizzzz/bugfix/6xx_remove_double_jdom1
[bugfix] 6xx Make sure the latest jdom(1) jar is used
2 parents 919dcaf + cca8f8d commit 024276e

File tree

3 files changed

+32
-0
lines changed

3 files changed

+32
-0
lines changed

exist-parent/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@
112112
<jansi.version>2.4.1</jansi.version>
113113
<jaxb.api.version>3.0.1</jaxb.api.version>
114114
<jaxb.impl.version>3.0.2</jaxb.impl.version>
115+
<jdom1.version>1.1.3</jdom1.version>
115116
<jetty.version>9.4.54.v20240208</jetty.version>
116117
<log4j.version>2.22.1</log4j.version>
117118
<lucene.version>4.10.4</lucene.version>

extensions/indexes/spatial/pom.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,22 @@
7575
<groupId>org.geotools</groupId>
7676
<artifactId>gt2-main</artifactId>
7777
<version>${geotools.version}</version>
78+
<exclusions>
79+
<exclusion>
80+
<groupId>jdom</groupId>
81+
<artifactId>jdom</artifactId>
82+
</exclusion>
83+
<exclusion>
84+
<groupId>commons-beanutils</groupId>
85+
<artifactId>commons-beanutils</artifactId>
86+
</exclusion>
87+
</exclusions>
88+
</dependency>
89+
<dependency>
90+
<groupId>org.jdom</groupId>
91+
<artifactId>jdom</artifactId>
92+
<version>${jdom1.version}</version>
93+
<scope>runtime</scope>
7894
</dependency>
7995
<dependency>
8096
<groupId>org.geotools</groupId>
@@ -177,6 +193,7 @@
177193
<ignoredUnusedDeclaredDependency>java3d:vecmath:jar:1.3.1</ignoredUnusedDeclaredDependency>
178194
<ignoredUnusedDeclaredDependency>javax.media:jai_core:jar:1.1.3</ignoredUnusedDeclaredDependency>
179195
<ignoredUnusedDeclaredDependency>org.junit.vintage:junit-vintage-engine:jar</ignoredUnusedDeclaredDependency>
196+
<ignoredUnusedDeclaredDependency>org.jdom:jdom:jar:${jdom1.version}</ignoredUnusedDeclaredDependency>
180197
</ignoredUnusedDeclaredDependencies>
181198
</configuration>
182199
</execution>

extensions/webdav/pom.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,19 @@
6060
<groupId>org.exist-db.thirdparty.com.ettrema</groupId>
6161
<artifactId>milton-api</artifactId>
6262
<version>${milton.version}</version>
63+
<exclusions>
64+
<exclusion>
65+
<groupId>jdom</groupId>
66+
<artifactId>jdom</artifactId>
67+
</exclusion>
68+
</exclusions>
69+
</dependency>
70+
71+
<dependency>
72+
<groupId>org.jdom</groupId>
73+
<artifactId>jdom</artifactId>
74+
<version>${jdom1.version}</version>
75+
<scope>runtime</scope>
6376
</dependency>
6477

6578
<dependency>
@@ -180,6 +193,7 @@
180193
<failOnWarning>true</failOnWarning>
181194
<ignoredUnusedDeclaredDependencies>
182195
<ignoredUnusedDeclaredDependency>org.junit.vintage:junit-vintage-engine:jar</ignoredUnusedDeclaredDependency>
196+
<ignoredUnusedDeclaredDependency>org.jdom:jdom:jar:${jdom1.version}</ignoredUnusedDeclaredDependency>
183197

184198
<!-- needed for running tests that depend on eXist-db Jetty server -->
185199
<ignoredUnusedDeclaredDependency>${project.groupId}:exist-jetty-config:jar:${project.version}</ignoredUnusedDeclaredDependency>

0 commit comments

Comments
 (0)