Skip to content

Commit 44a3a37

Browse files
adamretteradamretter
committed
[feature] Update dependencies and plugins to latest (Java 8 compatible) versions
1 parent a4df929 commit 44a3a37

File tree

46 files changed

+243
-218
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+243
-218
lines changed

‎elemental-parent/pom.xml‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@
9595
<sonar.moduleKey>${project.groupId}:${project.artifactId}</sonar.moduleKey>
9696

9797
<!-- Dependencies -->
98-
<junit.platform.version>1.10.2</junit.platform.version>
99-
<junit.jupiter.version>5.10.2</junit.jupiter.version>
100-
<objenesis.version>3.3</objenesis.version>
98+
<junit.platform.version>1.12.2</junit.platform.version>
99+
<junit.jupiter.version>5.12.2</junit.jupiter.version>
100+
<objenesis.version>3.4</objenesis.version>
101101
<jaxb.api.version>3.0.1</jaxb.api.version>
102102
<jaxb.impl.version>3.0.2</jaxb.impl.version>
103103
</properties>
@@ -108,7 +108,7 @@
108108
<plugin>
109109
<groupId>org.apache.maven.plugins</groupId>
110110
<artifactId>maven-compiler-plugin</artifactId>
111-
<version>3.13.0</version>
111+
<version>3.14.0</version>
112112
<configuration>
113113
<source>${project.build.source}</source>
114114
<target>${project.build.target}</target>
@@ -142,12 +142,12 @@
142142
<plugin>
143143
<groupId>org.apache.maven.plugins</groupId>
144144
<artifactId>maven-jarsigner-plugin</artifactId>
145-
<version>3.0.0</version>
145+
<version>3.1.0</version>
146146
</plugin>
147147
<plugin>
148148
<groupId>org.apache.maven.plugins</groupId>
149149
<artifactId>maven-source-plugin</artifactId>
150-
<version>3.3.0</version>
150+
<version>3.3.1</version>
151151
<configuration>
152152
<archive>
153153
<manifest>
@@ -171,7 +171,7 @@
171171
<plugin>
172172
<groupId>org.apache.maven.plugins</groupId>
173173
<artifactId>maven-javadoc-plugin</artifactId>
174-
<version>3.6.3</version>
174+
<version>3.11.2</version>
175175
<configuration>
176176
<source>${project.build.source}</source>
177177
<archive>
@@ -202,7 +202,7 @@
202202
<plugin>
203203
<groupId>org.apache.maven.plugins</groupId>
204204
<artifactId>maven-clean-plugin</artifactId>
205-
<version>3.4.0</version>
205+
<version>3.4.1</version>
206206
</plugin>
207207
<plugin>
208208
<groupId>com.mycila</groupId>
@@ -232,9 +232,11 @@
232232
<plugin>
233233
<groupId>org.owasp</groupId>
234234
<artifactId>dependency-check-maven</artifactId>
235-
<version>10.0.3</version>
235+
<version>10.0.4</version>
236236
<configuration>
237-
<nvdApiKey>cb452226-8de1-4d27-9032-7c9b8741c880</nvdApiKey>
237+
<nvdApiKeyEnvironmentVariable>NVD_API_KEY</nvdApiKeyEnvironmentVariable>
238+
<nvdApiServerId>nvd-api</nvdApiServerId>
239+
238240
<!-- The OSS Index Server (https://ossindex.sonatype.org) can sometimes be flaky -->
239241
<ossIndexWarnOnlyOnRemoteErrors>true</ossIndexWarnOnlyOnRemoteErrors>
240242

@@ -271,30 +273,30 @@
271273
<plugin>
272274
<groupId>org.apache.maven.plugins</groupId>
273275
<artifactId>maven-dependency-plugin</artifactId>
274-
<version>3.7.1</version>
276+
<version>3.8.1</version>
275277
</plugin>
276278
<plugin>
277279
<groupId>org.apache.maven.plugins</groupId>
278280
<artifactId>maven-project-info-reports-plugin</artifactId>
279-
<version>3.6.2</version>
281+
<version>3.9.0</version>
280282
<configuration>
281283
<dependencyDetailsEnabled>false</dependencyDetailsEnabled> <!-- TODO(AR) disabled due to slow `mvn site` build times -->
282284
</configuration>
283285
</plugin>
284286
<plugin>
285287
<groupId>org.apache.maven.plugins</groupId>
286288
<artifactId>maven-site-plugin</artifactId>
287-
<version>3.12.1</version>
289+
<version>3.21.0</version>
288290
</plugin>
289291
<plugin>
290292
<groupId>org.apache.maven.plugins</groupId>
291293
<artifactId>maven-install-plugin</artifactId>
292-
<version>3.1.2</version>
294+
<version>3.1.4</version>
293295
</plugin>
294296
<plugin>
295297
<groupId>org.apache.maven.plugins</groupId>
296298
<artifactId>maven-deploy-plugin</artifactId>
297-
<version>3.1.2</version>
299+
<version>3.1.4</version>
298300
</plugin>
299301
<plugin>
300302
<groupId>org.apache.maven.plugins</groupId>
@@ -318,7 +320,7 @@
318320
<plugin>
319321
<groupId>org.apache.maven.plugins</groupId>
320322
<artifactId>maven-gpg-plugin</artifactId>
321-
<version>3.2.3</version>
323+
<version>3.2.7</version>
322324
</plugin>
323325
<plugin>
324326
<groupId>org.jacoco</groupId>
@@ -346,7 +348,7 @@
346348
<plugin>
347349
<groupId>org.apache.maven.plugins</groupId>
348350
<artifactId>maven-surefire-plugin</artifactId>
349-
<version>3.3.1</version>
351+
<version>3.5.3</version>
350352
<dependencies>
351353
<dependency>
352354
<groupId>org.junit.platform</groupId>

‎exist-ant/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<artifactId>ant</artifactId>
9090
</dependency>
9191
<dependency>
92-
<groupId>xml-apis</groupId>
92+
<groupId>com.evolvedbinary.thirdparty.xml-apis</groupId>
9393
<artifactId>xml-apis</artifactId>
9494
</dependency>
9595

‎exist-core-jcstress/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<dependency>
6767
<groupId>org.openjdk.jcstress</groupId>
6868
<artifactId>jcstress-core</artifactId>
69-
<version>0.15</version>
69+
<version>0.16</version>
7070
</dependency>
7171
<dependency>
7272
<groupId>xyz.elemental.fork.org.exist-db</groupId>

‎exist-core-jmh/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<description>JMH Benchmarks for exist-core</description>
6464

6565
<properties>
66-
<jmh.version>1.36</jmh.version>
66+
<jmh.version>1.37</jmh.version>
6767
<uberjar.name>benchmarks</uberjar.name>
6868
</properties>
6969

‎exist-core/pom.xml‎

Lines changed: 47 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
<dependency>
8484
<groupId>com.fasterxml.jackson.core</groupId>
8585
<artifactId>jackson-core</artifactId>
86-
<version>2.15.2</version>
86+
<version>2.18.3</version>
8787
</dependency>
8888

8989
<!-- dependency>
@@ -118,7 +118,7 @@
118118
<groupId>com.siemens.ct.exi</groupId>
119119
<artifactId>exificient</artifactId>
120120
<exclusions>
121-
<exclusion> <!-- conflicts with xerces 2.12.2 -->
121+
<exclusion> <!-- conflicts with Xerces -->
122122
<groupId>xerces</groupId>
123123
<artifactId>xercesImpl</artifactId>
124124
</exclusion>
@@ -138,17 +138,17 @@
138138
<dependency>
139139
<groupId>org.relaxng</groupId>
140140
<artifactId>jing</artifactId>
141-
<version>20220510</version>
141+
<version>20241231</version>
142142
<exclusions>
143-
<exclusion> <!-- conflicts with xerces 2.12.2 dependency on xml-apis version 1.4.01 -->
143+
<exclusion> <!-- conflicts with Xerces dependency on xml-apis -->
144144
<groupId>xml-apis</groupId>
145145
<artifactId>xml-apis</artifactId>
146146
</exclusion>
147-
<exclusion> <!-- conflicts -->
147+
<exclusion> <!-- conflicts with Saxon -->
148148
<groupId>net.sf.saxon</groupId>
149149
<artifactId>saxon</artifactId>
150150
</exclusion>
151-
<exclusion> <!-- conflicts -->
151+
<exclusion> <!-- conflicts with Xerces -->
152152
<groupId>xerces</groupId>
153153
<artifactId>xercesImpl</artifactId>
154154
</exclusion>
@@ -169,7 +169,7 @@
169169
<dependency>
170170
<groupId>org.bouncycastle</groupId>
171171
<artifactId>bcprov-jdk18on</artifactId>
172-
<version>1.78.1</version>
172+
<version>1.80</version>
173173
</dependency>
174174

175175
<dependency>
@@ -186,7 +186,7 @@
186186
<dependency>
187187
<groupId>com.fasterxml.uuid</groupId>
188188
<artifactId>java-uuid-generator</artifactId>
189-
<version>4.3.0</version>
189+
<version>5.1.0</version>
190190
</dependency>
191191

192192
<dependency>
@@ -215,7 +215,7 @@
215215
<dependency>
216216
<groupId>org.jline</groupId>
217217
<artifactId>jline</artifactId>
218-
<version>3.25.1</version>
218+
<version>3.29.0</version>
219219
</dependency>
220220

221221
<dependency>
@@ -252,13 +252,13 @@
252252
<dependency>
253253
<groupId>commons-logging</groupId>
254254
<artifactId>commons-logging</artifactId>
255-
<version>1.3.0</version>
255+
<version>1.3.5</version>
256256
</dependency>
257257

258258
<dependency>
259259
<groupId>org.apache.commons</groupId>
260260
<artifactId>commons-pool2</artifactId>
261-
<version>2.12.0</version>
261+
<version>2.12.1</version>
262262
</dependency>
263263

264264
<dependency>
@@ -287,7 +287,7 @@
287287
</dependency>
288288

289289
<dependency>
290-
<groupId>org.exist-db.thirdparty.xerces</groupId>
290+
<groupId>com.evolvedbinary.thirdparty.xerces</groupId>
291291
<artifactId>xercesImpl</artifactId>
292292
<version>${xerces.version}</version>
293293
<classifier>xml-schema-1.1</classifier>
@@ -299,21 +299,28 @@
299299
<version>1.9.22</version>
300300
<scope>runtime</scope> <!-- default for util:parse-html -->
301301
<exclusions>
302-
<exclusion> <!-- conflicts with eXist-db's xercesImpl 2.12.2 dependency -->
302+
<exclusion> <!-- conflicts with eXist-db's xercesImpl dependency -->
303303
<groupId>xerces</groupId>
304304
<artifactId>xercesImpl</artifactId>
305305
</exclusion>
306306
</exclusions>
307307
</dependency>
308308

309309
<dependency>
310-
<groupId>xml-apis</groupId>
310+
<groupId>com.evolvedbinary.thirdparty.xml-apis</groupId>
311311
<artifactId>xml-apis</artifactId>
312312
</dependency>
313313
<dependency>
314314
<groupId>org.apache.ws.commons.util</groupId>
315315
<artifactId>ws-commons-util</artifactId>
316316
<version>1.0.2</version>
317+
<exclusions>
318+
<exclusion>
319+
<!-- conflicts with Xerces dependency on xml-apis -->
320+
<groupId>xml-apis</groupId>
321+
<artifactId>xml-apis</artifactId>
322+
</exclusion>
323+
</exclusions>
317324
</dependency>
318325

319326
<!-- xml-resolver is needed at runtime because xercesImpl declares this as optional,
@@ -329,6 +336,13 @@
329336
<groupId>org.xmlresolver</groupId>
330337
<artifactId>xmlresolver</artifactId>
331338
<version>${xmlresolver.version}</version>
339+
<exclusions>
340+
<exclusion>
341+
<!-- NOTE(AR): conflicts with com.evolvedbinary.thirdparty.xerces:xercesImpl -->
342+
<groupId>xerces</groupId>
343+
<artifactId>xercesImpl</artifactId>
344+
</exclusion>
345+
</exclusions>
332346
</dependency>
333347

334348
<dependency>
@@ -337,14 +351,21 @@
337351
<version>${xmlresolver.version}</version>
338352
<classifier>data</classifier>
339353
<scope>runtime</scope>
354+
<exclusions>
355+
<exclusion>
356+
<!-- NOTE(AR): conflicts with com.evolvedbinary.thirdparty.xerces:xercesImpl -->
357+
<groupId>xerces</groupId>
358+
<artifactId>xercesImpl</artifactId>
359+
</exclusion>
360+
</exclusions>
340361
</dependency>
341362

342363
<!-- xpath2 and java-cup are needed at runtime because xercesImpl declares this as optional,
343364
but we need them to enable Schema 1.1 support -->
344365
<dependency>
345-
<groupId>org.exist-db.thirdparty.org.eclipse.wst.xml</groupId>
366+
<groupId>com.evolvedbinary.thirdparty.org.eclipse.wst.xml</groupId>
346367
<artifactId>xpath2</artifactId>
347-
<version>1.2.0</version>
368+
<version>1.2.1.1</version>
348369
<scope>runtime</scope>
349370
</dependency>
350371
<dependency>
@@ -357,7 +378,7 @@
357378
<dependency>
358379
<groupId>xalan</groupId>
359380
<artifactId>xalan</artifactId>
360-
<version>2.7.3</version> <!-- needed an compile time for various dependencies -->
381+
<version>2.7.3</version> <!-- needed at compile time for various dependencies -->
361382
</dependency>
362383

363384
<dependency>
@@ -388,9 +409,9 @@
388409
<groupId>com.evolvedbinary.thirdparty.org.apache.xmlrpc</groupId>
389410
<artifactId>xmlrpc-common</artifactId>
390411
<exclusions>
391-
<exclusion> <!-- conflicts with xerces 2.12.0 dependency on xml-apis version 1.4.01 -->
392-
<artifactId>xml-apis</artifactId>
412+
<exclusion> <!-- conflicts with Xerces dependency on xml-apis -->
393413
<groupId>xml-apis</groupId>
414+
<artifactId>xml-apis</artifactId>
394415
</exclusion>
395416
</exclusions>
396417
</dependency>
@@ -418,7 +439,7 @@
418439
<scope>runtime</scope>
419440
<exclusions>
420441
<exclusion>
421-
<!-- conflicts with antlr 2.7.7 -->
442+
<!-- conflicts with Antlr 2.7.7 -->
422443
<groupId>org.apache.servicemix.bundles</groupId>
423444
<artifactId>org.apache.servicemix.bundles.antlr</artifactId>
424445
</exclusion>
@@ -451,13 +472,13 @@
451472
<dependency>
452473
<groupId>com.fifesoft</groupId>
453474
<artifactId>rsyntaxtextarea</artifactId>
454-
<version>3.3.4</version>
475+
<version>3.6.0</version>
455476
</dependency>
456477

457478
<dependency>
458479
<groupId>org.quartz-scheduler</groupId>
459480
<artifactId>quartz</artifactId>
460-
<version>2.3.2</version> <!-- Quartz 2.3.1 has an issue on Windows, see: https://github.com/quartz-scheduler/quartz/issues/448 -->
481+
<version>2.4.0</version>
461482
<!-- exclude Quartz SQL connectivity options -->
462483
<exclusions>
463484
<exclusion>
@@ -597,7 +618,7 @@
597618
NOTE(AR) This is needed to enable loading of Servlets etc
598619
that use Java Annotations for configuration.
599620
This is less than ideal as it allows any extension to
600-
serve arbitary Web requests, and should ultimately be
621+
serve arbitrary Web requests, and should ultimately be
601622
removed. Unfortunately, at this time, it is required for
602623
Monex's Remote Console to function.
603624
-->
@@ -874,6 +895,7 @@
874895
<include>src/test/java/org/exist/xquery/functions/transform/TransformFromPkgTest.java</include>
875896
<include>src/test/java/org/exist/xquery/value/Base64BinaryValueTypeTest.java</include>
876897
<include>src/main/java/org/exist/xslt/XsltURIResolverHelper.java</include>
898+
<include>src/test/java/org/exist/validation/CollectionConfigurationValidationModeTest.java</include>
877899
<include>src/test/resources/org/exist/validation/catalog.xml</include>
878900
<include>src/test/resources/standalone-webapp/WEB-INF/web.xml</include>
879901
<include>src/test/xquery/maps/maps.xqm</include>
@@ -1086,6 +1108,7 @@
10861108
<exclude>src/test/java/org/exist/xquery/functions/transform/TransformFromPkgTest.java</exclude>
10871109
<exclude>src/test/java/org/exist/xquery/value/Base64BinaryValueTypeTest.java</exclude>
10881110
<exclude>src/main/java/org/exist/xslt/XsltURIResolverHelper.java</exclude>
1111+
<exclude>src/test/java/org/exist/validation/CollectionConfigurationValidationModeTest.java</exclude>
10891112
<exclude>src/test/resources/org/exist/validation/catalog.xml</exclude>
10901113
<exclude>src/test/resources/standalone-webapp/WEB-INF/web.xml</exclude>
10911114
<exclude>src/test/xquery/maps/maps.xqm</exclude>
@@ -1395,7 +1418,7 @@ The BaseX Team. The original license statement is also included below.]]></pream
13951418
<ignoredUnusedDeclaredDependency>xml-resolver:xml-resolver:jar:1.2</ignoredUnusedDeclaredDependency>
13961419
<ignoredUnusedDeclaredDependency>xalan:serializer:jar:2.7.3</ignoredUnusedDeclaredDependency>
13971420
<ignoredUnusedDeclaredDependency>org.xmlresolver:xmlresolver:jar:${xmlresolver.version}</ignoredUnusedDeclaredDependency>
1398-
<ignoredUnusedDeclaredDependency>org.exist-db.thirdparty.org.eclipse.wst.xml:xpath2:jar:1.2.0</ignoredUnusedDeclaredDependency>
1421+
<ignoredUnusedDeclaredDependency>com.evolvedbinary.thirdparty.org.eclipse.wst.xml:xpath2:jar:1.2.1.1</ignoredUnusedDeclaredDependency>
13991422
<ignoredUnusedDeclaredDependency>edu.princeton.cup:java-cup:jar:10k</ignoredUnusedDeclaredDependency>
14001423
<ignoredUnusedDeclaredDependency>org.eclipse.jetty:jetty-jaas:jar:${jetty.version}</ignoredUnusedDeclaredDependency>
14011424
<ignoredUnusedDeclaredDependency>org.eclipse.jetty:jetty-deploy:jar:${jetty.version}</ignoredUnusedDeclaredDependency>
@@ -1415,7 +1438,6 @@ The BaseX Team. The original license statement is also included below.]]></pream
14151438
<plugin>
14161439
<groupId>org.codehaus.mojo</groupId>
14171440
<artifactId>antlr-maven-plugin</artifactId>
1418-
<version>2.2</version>
14191441
<configuration>
14201442
<grammars>
14211443
org/exist/xquery/parser/XQuery.g,org/exist/xquery/parser/XQueryTree.g,org/exist/xquery/parser/DeclScanner.g,org/exist/xquery/xqdoc/parser/XQDocParser.g

0 commit comments

Comments
 (0)