Skip to content

Commit 459b6ea

Browse files
adamretteradamretter
authored
Merge pull request #120 from evolvedbinary/6.x.x/feature/upgrade-deps
[6.x.x] Update dependency and plugin versions
2 parents d1aed46 + 3efe748 commit 459b6ea

File tree

10 files changed

+42
-77
lines changed

10 files changed

+42
-77
lines changed

‎elemental-parent/pom.xml‎

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

9797
<!-- Dependencies -->
98-
<junit.platform.version>1.13.3</junit.platform.version>
99-
<junit.jupiter.version>5.13.3</junit.jupiter.version>
98+
<junit.platform.version>1.14.0</junit.platform.version>
99+
<junit.jupiter.version>5.14.0</junit.jupiter.version>
100100
<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>
@@ -127,7 +127,7 @@
127127
<plugin>
128128
<groupId>org.apache.maven.plugins</groupId>
129129
<artifactId>maven-compiler-plugin</artifactId>
130-
<version>3.14.0</version>
130+
<version>3.14.1</version>
131131
<configuration>
132132
<source>${project.build.source}</source>
133133
<target>${project.build.target}</target>
@@ -190,7 +190,7 @@
190190
<plugin>
191191
<groupId>org.apache.maven.plugins</groupId>
192192
<artifactId>maven-javadoc-plugin</artifactId>
193-
<version>3.11.2</version>
193+
<version>3.12.0</version>
194194
<configuration>
195195
<source>${project.build.source}</source>
196196
<archive>
@@ -292,7 +292,7 @@
292292
<plugin>
293293
<groupId>org.apache.maven.plugins</groupId>
294294
<artifactId>maven-dependency-plugin</artifactId>
295-
<version>3.8.1</version>
295+
<version>3.9.0</version>
296296
</plugin>
297297
<plugin>
298298
<groupId>org.apache.maven.plugins</groupId>
@@ -330,13 +330,13 @@
330330
<plugin>
331331
<groupId>org.sonatype.central</groupId>
332332
<artifactId>central-publishing-maven-plugin</artifactId>
333-
<version>0.8.0</version>
333+
<version>0.9.0</version>
334334
<extensions>true</extensions>
335335
</plugin>
336336
<plugin>
337337
<groupId>org.apache.maven.plugins</groupId>
338338
<artifactId>maven-scm-plugin</artifactId>
339-
<version>2.1.0</version>
339+
<version>2.2.1</version>
340340
<configuration>
341341
<sign>true</sign>
342342
</configuration>
@@ -349,7 +349,7 @@
349349
<plugin>
350350
<groupId>org.jacoco</groupId>
351351
<artifactId>jacoco-maven-plugin</artifactId>
352-
<version>0.8.13</version>
352+
<version>0.8.14</version>
353353
<configuration>
354354
<propertyName>jacocoArgLine</propertyName>
355355
<excludes>
@@ -367,7 +367,7 @@
367367
<plugin>
368368
<groupId>org.codehaus.mojo</groupId>
369369
<artifactId>versions-maven-plugin</artifactId>
370-
<version>2.18.0</version>
370+
<version>2.19.1</version>
371371
</plugin>
372372
<plugin>
373373
<groupId>org.apache.maven.plugins</groupId>
@@ -422,12 +422,12 @@
422422
<plugin>
423423
<groupId>org.apache.maven.plugins</groupId>
424424
<artifactId>maven-surefire-report-plugin</artifactId>
425-
<version>3.5.3</version>
425+
<version>3.5.4</version>
426426
</plugin>
427427
<plugin>
428428
<groupId>org.apache.maven.plugins</groupId>
429429
<artifactId>maven-failsafe-plugin</artifactId>
430-
<version>3.5.3</version>
430+
<version>3.5.4</version>
431431
<configuration>
432432
<includes>
433433
<include>**/*IT.java</include>

‎exist-core/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<dependency>
9393
<groupId>com.fasterxml.jackson.core</groupId>
9494
<artifactId>jackson-core</artifactId>
95-
<version>2.19.1</version>
95+
<version>2.20.0</version>
9696
</dependency>
9797

9898
<dependency>
@@ -186,7 +186,7 @@
186186
<dependency>
187187
<groupId>org.bouncycastle</groupId>
188188
<artifactId>bcprov-jdk18on</artifactId>
189-
<version>1.81</version>
189+
<version>1.82</version>
190190
</dependency>
191191

192192
<dependency>
@@ -209,7 +209,7 @@
209209
<dependency>
210210
<groupId>com.fasterxml.uuid</groupId>
211211
<artifactId>java-uuid-generator</artifactId>
212-
<version>5.1.0</version>
212+
<version>5.1.1</version>
213213
</dependency>
214214

215215
<dependency>
@@ -482,7 +482,7 @@
482482
<dependency>
483483
<groupId>org.quartz-scheduler</groupId>
484484
<artifactId>quartz</artifactId>
485-
<version>2.4.0</version>
485+
<version>2.4.1</version>
486486
<!-- exclude Quartz SQL connectivity options -->
487487
<exclusions>
488488
<exclusion>
@@ -615,7 +615,7 @@
615615
<dependency>
616616
<groupId>commons-fileupload</groupId>
617617
<artifactId>commons-fileupload</artifactId>
618-
<version>1.5</version>
618+
<version>1.6.0</version>
619619
</dependency>
620620
<dependency>
621621
<!--

‎exist-core/src/main/java/org/exist/xquery/functions/validation/Jaxp.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@
106106
import org.exist.xquery.value.Type;
107107
import org.exist.xquery.value.ValueSequence;
108108

109+
import org.exist.xslt.TransformerFactoryAllocator;
109110
import org.xml.sax.ContentHandler;
110111
import org.xml.sax.InputSource;
111112
import org.xml.sax.SAXException;
@@ -460,7 +461,7 @@ private Path preparseDTD(StreamSource instance, String systemId)
460461

461462
final StreamResult result = new StreamResult(tmp.toFile());
462463

463-
final TransformerFactory tf = TransformerFactory.newInstance();
464+
final TransformerFactory tf = TransformerFactoryAllocator.getTransformerFactory(context.getBroker().getBrokerPool());
464465

465466
final Transformer transformer = tf.newTransformer();
466467

‎exist-distribution/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -762,7 +762,7 @@
762762
<plugin>
763763
<groupId>org.apache.maven.plugins</groupId>
764764
<artifactId>maven-antrun-plugin</artifactId>
765-
<version>3.1.0</version>
765+
<version>3.2.0</version>
766766
<executions>
767767
<execution>
768768
<id>unzip-dashboard</id>

‎exist-parent/pom.xml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -97,19 +97,19 @@
9797
<exquery.distribution.version>0.2.1</exquery.distribution.version>
9898
<icu.version>59.1</icu.version>
9999
<izpack.version>5.2.4</izpack.version>
100-
<jline.version>3.30.4</jline.version>
100+
<jline.version>3.30.6</jline.version>
101101
<lz4-java.version>1.8.0</lz4-java.version>
102-
<jetty.version>9.4.57.v20241219</jetty.version>
103-
<log4j.version>2.25.1</log4j.version>
102+
<jetty.version>9.4.58.v20250814</jetty.version>
103+
<log4j.version>2.25.2</log4j.version>
104104
<lucene.version>4.10.4</lucene.version>
105105
<milton.version>1.8.1.3</milton.version>
106106
<saxon.version>9.9.1-8</saxon.version>
107107
<xerces.version>2.12.2.2</xerces.version>
108108
<xmlresolver.version>6.0.19</xmlresolver.version>
109-
<xmlunit.version>2.10.3</xmlunit.version>
109+
<xmlunit.version>2.11.0</xmlunit.version>
110110
<junit.version>4.13.2</junit.version>
111111
<easymock.version>5.6.0</easymock.version>
112-
<assertj.version>3.27.3</assertj.version>
112+
<assertj.version>3.27.6</assertj.version>
113113
<awaitility.version>4.3.0</awaitility.version>
114114
<junit.toolbox.version>2.4</junit.toolbox.version>
115115
<hamcrest.version>2.2</hamcrest.version>
@@ -187,13 +187,13 @@
187187
<dependency>
188188
<groupId>commons-codec</groupId>
189189
<artifactId>commons-codec</artifactId>
190-
<version>1.18.0</version>
190+
<version>1.19.0</version>
191191
</dependency>
192192

193193
<dependency>
194194
<groupId>commons-io</groupId>
195195
<artifactId>commons-io</artifactId>
196-
<version>2.19.0</version>
196+
<version>2.20.0</version>
197197
</dependency>
198198

199199
<dependency>
@@ -396,7 +396,7 @@
396396
<dependency>
397397
<groupId>it.unimi.dsi</groupId>
398398
<artifactId>fastutil</artifactId>
399-
<version>8.5.16</version>
399+
<version>8.5.18</version>
400400
</dependency>
401401

402402
<dependency>
@@ -524,7 +524,7 @@
524524
<plugin>
525525
<groupId>org.codehaus.mojo</groupId>
526526
<artifactId>xml-maven-plugin</artifactId>
527-
<version>1.1.0</version>
527+
<version>1.2.0</version>
528528
<configuration>
529529
<transformerFactory>net.sf.saxon.TransformerFactoryImpl</transformerFactory>
530530
</configuration>
@@ -563,12 +563,12 @@
563563
<plugin>
564564
<groupId>org.apache.maven.plugins</groupId>
565565
<artifactId>maven-shade-plugin</artifactId>
566-
<version>3.6.0</version>
566+
<version>3.6.1</version>
567567
</plugin>
568568
<plugin>
569569
<groupId>org.codehaus.mojo</groupId>
570570
<artifactId>exec-maven-plugin</artifactId>
571-
<version>3.5.1</version>
571+
<version>3.6.2</version>
572572
</plugin>
573573
<plugin>
574574
<groupId>de.jutzig</groupId>

‎extensions/contentextraction/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
</scm>
7171

7272
<properties>
73-
<tika.version>2.9.3</tika.version>
73+
<tika.version>2.9.4</tika.version>
7474
</properties>
7575

7676
<dependencies>

‎extensions/indexes/spatial/pom.xml‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@
7171

7272
<properties>
7373
<geotools.version>2.4.5</geotools.version>
74-
<!-- <jdom1.version>1.1.3</jdom1.version>-->
75-
<!-- <jaxen.version>1.1.4</jaxen.version>-->
7674
</properties>
7775

7876
<dependencies>
@@ -112,46 +110,11 @@
112110
</exclusion>
113111
</exclusions>
114112
</dependency>
115-
<!-- dependency>
116-
<groupId>org.jdom</groupId>
117-
<artifactId>jdom</artifactId>
118-
<version>${jdom1.version}</version>
119-
<scope>runtime</scope>
120-
<exclusions>
121-
<exclusion>
122-
<groupId>jaxen</groupId>
123-
<artifactId>jaxen</artifactId>
124-
</exclusion>
125-
</exclusions>
126-
</dependency>
127-
<dependency>
128-
<groupId>jaxen</groupId>
129-
<artifactId>jaxen</artifactId>
130-
<version>${jaxen.version}</version>
131-
<scope>runtime</scope>
132-
</dependency -->
133113
<dependency>
134114
<groupId>org.geotools</groupId>
135115
<artifactId>gt2-referencing</artifactId>
136116
<version>${geotools.version}</version>
137117
</dependency>
138-
<!--
139-
<dependency>
140-
<groupId>org.geotools</groupId>
141-
<artifactId>gt2-epsg-extension</artifactId>
142-
<version>${geotools.version}</version>
143-
</dependency>
144-
<dependency>
145-
<groupId>org.geotools</groupId>
146-
<artifactId>gt2-metadata</artifactId>
147-
<version>${geotools.version}</version>
148-
</dependency>
149-
<dependency>
150-
<groupId>org.geotools</groupId>
151-
<artifactId>gt2-xml</artifactId>
152-
<version>${geotools.version}</version>
153-
</dependency>
154-
-->
155118
<dependency>
156119
<groupId>com.vividsolutions</groupId>
157120
<artifactId>jts</artifactId>
@@ -296,8 +259,6 @@
296259
<ignoredUnusedDeclaredDependency>java3d:vecmath:jar:1.3.1</ignoredUnusedDeclaredDependency>
297260
<ignoredUnusedDeclaredDependency>javax.media:jai_core:jar:1.1.3</ignoredUnusedDeclaredDependency>
298261
<ignoredUnusedDeclaredDependency>org.junit.vintage:junit-vintage-engine:jar</ignoredUnusedDeclaredDependency>
299-
<!-- <ignoredUnusedDeclaredDependency>org.jdom:jdom:jar:${jdom1.version}</ignoredUnusedDeclaredDependency>-->
300-
<!-- <ignoredUnusedDeclaredDependency>jaxen:jaxen:jar:${jaxen.version}</ignoredUnusedDeclaredDependency>-->
301262
</ignoredUnusedDeclaredDependencies>
302263
</configuration>
303264
</execution>

‎extensions/modules/mail/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171

7272
<properties>
7373
<jakarta.activation.version>2.0.1</jakarta.activation.version>
74-
<jakarta.mail.version>2.0.1</jakarta.mail.version>
74+
<jakarta.mail.version>2.0.2</jakarta.mail.version>
7575
<greenmail.version>2.0.1</greenmail.version>
7676
</properties>
7777

‎extensions/modules/mail/src/main/java/org/exist/xquery/modules/mail/SendEmailFunction.java‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
import org.exist.util.MimeTable;
5555
import org.exist.xquery.*;
5656
import org.exist.xquery.value.*;
57+
import org.exist.xslt.TransformerFactoryAllocator;
5758
import org.w3c.dom.Element;
5859
import org.w3c.dom.Node;
5960

@@ -65,8 +66,8 @@
6566
import javax.annotation.Nullable;
6667
import javax.xml.transform.Transformer;
6768
import javax.xml.transform.TransformerException;
68-
import javax.xml.transform.TransformerFactory;
6969
import javax.xml.transform.dom.DOMSource;
70+
import javax.xml.transform.sax.SAXTransformerFactory;
7071
import javax.xml.transform.stream.StreamResult;
7172
import java.io.*;
7273
import java.net.InetAddress;
@@ -90,7 +91,6 @@
9091
public class SendEmailFunction extends BasicFunction {
9192

9293
private static final Logger LOGGER = LogManager.getLogger(SendEmailFunction.class);
93-
private static final TransformerFactory TRANSFORMER_FACTORY = TransformerFactory.newInstance();
9494

9595
private final static int MIME_BASE64_MAX_LINE_LENGTH = 76; //RFC 2045, page 24
9696

@@ -700,7 +700,8 @@ private Mail[] parseMailElement(final Element[] mailElements) throws Transformer
700700
mail.setText(bodyPart.getFirstChild().getNodeValue());
701701
} else if ("xhtml".equals(bodyPart.getLocalName())) {
702702
//Convert everything inside <xhtml></xhtml> to text
703-
final Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
703+
final SAXTransformerFactory factory = TransformerFactoryAllocator.getTransformerFactory(context.getBroker().getBrokerPool());
704+
final Transformer transformer = factory.newTransformer();
704705
final DOMSource source = new DOMSource(bodyPart.getFirstChild());
705706
try (final StringBuilderWriter strWriter = new StringBuilderWriter()) {
706707
final StreamResult result = new StreamResult(strWriter);
@@ -839,7 +840,8 @@ private Message[] parseMessageElement(final Session session, final Element[] mai
839840
break;
840841
case "xhtml":
841842
//Convert everything inside <xhtml></xhtml> to text
842-
final Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
843+
final SAXTransformerFactory factory = TransformerFactoryAllocator.getTransformerFactory(context.getBroker().getBrokerPool());
844+
final Transformer transformer = factory.newTransformer();
843845
final DOMSource source = new DOMSource(bodyPart.getFirstChild());
844846
try (final StringBuilderWriter strWriter = new StringBuilderWriter()) {
845847
final StreamResult result = new StreamResult(strWriter);
@@ -906,7 +908,8 @@ private Message[] parseMessageElement(final Session session, final Element[] mai
906908
Node attachChild = attachment.getFirstChild();
907909
while (attachChild != null) {
908910
if (Node.ELEMENT_NODE == attachChild.getNodeType()) {
909-
final Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
911+
final SAXTransformerFactory factory = TransformerFactoryAllocator.getTransformerFactory(context.getBroker().getBrokerPool());
912+
final Transformer transformer = factory.newTransformer();
910913
final DOMSource source = new DOMSource(attachChild);
911914
try (final StringBuilderWriter strWriter = new StringBuilderWriter()) {
912915
final StreamResult result = new StreamResult(strWriter);

‎extensions/modules/sql-oracle/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,9 @@
133133
</dependency>
134134

135135
<dependency>
136-
<groupId>com.oracle.jdbc</groupId>
136+
<groupId>com.oracle.database.jdbc</groupId>
137137
<artifactId>ojdbc8</artifactId>
138-
<version>23.8.0.25.04</version>
138+
<version>23.26.0.0.0</version>
139139
</dependency>
140140

141141
<dependency>

0 commit comments

Comments
 (0)