Skip to content

Commit 4a3d954

Browse files
adamretteradamretter
authored
Merge pull request #119 from evolvedbinary/7.x.x/feature/upgrade-deps
[7.x.x] Update dependency and plugin versions
2 parents a05f5c8 + 4473efc commit 4a3d954

File tree

11 files changed

+54
-69
lines changed

11 files changed

+54
-69
lines changed

‎elemental-parent/pom.xml‎

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

9797
<!-- Dependencies -->
98-
<eclipse.angus-activation.version>2.0.2</eclipse.angus-activation.version>
99-
<junit.platform.version>1.13.3</junit.platform.version>
100-
<junit.jupiter.version>5.13.3</junit.jupiter.version>
98+
<eclipse.angus-activation.version>2.0.3</eclipse.angus-activation.version>
99+
<junit.platform.version>6.0.0</junit.platform.version>
100+
<junit.jupiter.version>6.0.0</junit.jupiter.version>
101101
<objenesis.version>3.4</objenesis.version>
102-
<jaxb.api.version>4.0.2</jaxb.api.version>
103-
<jaxb.impl.version>4.0.5</jaxb.impl.version>
102+
<jaxb.api.version>4.0.4</jaxb.api.version>
103+
<jaxb.impl.version>4.0.6</jaxb.impl.version>
104104

105105
<!-- Surefire parallel configuration -->
106106
<surefire.forkCount>1C</surefire.forkCount>
@@ -128,7 +128,7 @@
128128
<plugin>
129129
<groupId>org.apache.maven.plugins</groupId>
130130
<artifactId>maven-compiler-plugin</artifactId>
131-
<version>3.14.0</version>
131+
<version>3.14.1</version>
132132
<configuration>
133133
<source>${project.build.source}</source>
134134
<target>${project.build.target}</target>
@@ -191,7 +191,7 @@
191191
<plugin>
192192
<groupId>org.apache.maven.plugins</groupId>
193193
<artifactId>maven-javadoc-plugin</artifactId>
194-
<version>3.11.2</version>
194+
<version>3.12.0</version>
195195
<configuration>
196196
<source>${project.build.source}</source>
197197
<archive>
@@ -252,7 +252,7 @@
252252
<plugin>
253253
<groupId>org.owasp</groupId>
254254
<artifactId>dependency-check-maven</artifactId>
255-
<version>12.1.3</version>
255+
<version>12.1.8</version>
256256
<configuration>
257257
<nvdApiKeyEnvironmentVariable>NVD_API_KEY</nvdApiKeyEnvironmentVariable>
258258
<nvdApiServerId>nvd-api</nvdApiServerId>
@@ -293,7 +293,7 @@
293293
<plugin>
294294
<groupId>org.apache.maven.plugins</groupId>
295295
<artifactId>maven-dependency-plugin</artifactId>
296-
<version>3.8.1</version>
296+
<version>3.9.0</version>
297297
</plugin>
298298
<plugin>
299299
<groupId>org.apache.maven.plugins</groupId>
@@ -331,13 +331,13 @@
331331
<plugin>
332332
<groupId>org.sonatype.central</groupId>
333333
<artifactId>central-publishing-maven-plugin</artifactId>
334-
<version>0.8.0</version>
334+
<version>0.9.0</version>
335335
<extensions>true</extensions>
336336
</plugin>
337337
<plugin>
338338
<groupId>org.apache.maven.plugins</groupId>
339339
<artifactId>maven-scm-plugin</artifactId>
340-
<version>2.1.0</version>
340+
<version>2.2.1</version>
341341
<configuration>
342342
<sign>true</sign>
343343
</configuration>
@@ -350,7 +350,7 @@
350350
<plugin>
351351
<groupId>org.jacoco</groupId>
352352
<artifactId>jacoco-maven-plugin</artifactId>
353-
<version>0.8.13</version>
353+
<version>0.8.14</version>
354354
<configuration>
355355
<propertyName>jacocoArgLine</propertyName>
356356
<excludes>
@@ -368,7 +368,7 @@
368368
<plugin>
369369
<groupId>org.codehaus.mojo</groupId>
370370
<artifactId>versions-maven-plugin</artifactId>
371-
<version>2.18.0</version>
371+
<version>2.19.1</version>
372372
</plugin>
373373
<plugin>
374374
<groupId>org.apache.maven.plugins</groupId>
@@ -429,12 +429,12 @@
429429
<plugin>
430430
<groupId>org.apache.maven.plugins</groupId>
431431
<artifactId>maven-surefire-report-plugin</artifactId>
432-
<version>3.5.3</version>
432+
<version>3.5.4</version>
433433
</plugin>
434434
<plugin>
435435
<groupId>org.apache.maven.plugins</groupId>
436436
<artifactId>maven-failsafe-plugin</artifactId>
437-
<version>3.5.3</version>
437+
<version>3.5.4</version>
438438
<configuration>
439439
<includes>
440440
<include>**/*IT.java</include>
@@ -444,15 +444,15 @@
444444
<plugin>
445445
<groupId>com.github.hazendaz.maven</groupId>
446446
<artifactId>coveralls-maven-plugin</artifactId>
447-
<version>4.7.0</version>
447+
<version>5.0.0</version>
448448
<configuration>
449449
<repoToken>${env.COVERALLS_TOKEN}</repoToken>
450450
</configuration>
451451
</plugin>
452452
<plugin>
453453
<groupId>org.sonarsource.scanner.maven</groupId>
454454
<artifactId>sonar-maven-plugin</artifactId>
455-
<version>5.1.0.4751</version>
455+
<version>5.2.0.4988</version>
456456
</plugin>
457457
</plugins>
458458
</pluginManagement>

‎exist-core/pom.xml‎

Lines changed: 4 additions & 4 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>
@@ -210,7 +210,7 @@
210210
<dependency>
211211
<groupId>org.bouncycastle</groupId>
212212
<artifactId>bcprov-jdk18on</artifactId>
213-
<version>1.81</version>
213+
<version>1.82</version>
214214
</dependency>
215215

216216
<dependency>
@@ -233,7 +233,7 @@
233233
<dependency>
234234
<groupId>com.fasterxml.uuid</groupId>
235235
<artifactId>java-uuid-generator</artifactId>
236-
<version>5.1.0</version>
236+
<version>5.1.1</version>
237237
</dependency>
238238

239239
<dependency>
@@ -502,7 +502,7 @@
502502
<dependency>
503503
<groupId>org.quartz-scheduler</groupId>
504504
<artifactId>quartz</artifactId>
505-
<version>2.5.0</version>
505+
<version>2.5.1</version>
506506
<!-- exclude Quartz SQL connectivity options -->
507507
<exclusions>
508508
<exclusion>

‎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: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -97,20 +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-
<jdom1.version>1.1.3</jdom1.version>
103-
<jetty.version>11.0.25</jetty.version>
104-
<log4j.version>2.25.1</log4j.version>
102+
<jetty.version>11.0.26</jetty.version>
103+
<log4j.version>2.25.2</log4j.version>
105104
<lucene.version>4.10.4</lucene.version>
106105
<nekohtml.version>2.1.3</nekohtml.version>
107106
<saxon.version>9.9.1-8</saxon.version>
108107
<xerces.version>2.12.2.2</xerces.version>
109108
<xmlresolver.version>6.0.19</xmlresolver.version>
110-
<xmlunit.version>2.10.3</xmlunit.version>
109+
<xmlunit.version>2.11.0</xmlunit.version>
111110
<junit.version>4.13.2</junit.version>
112111
<easymock.version>5.6.0</easymock.version>
113-
<assertj.version>3.27.3</assertj.version>
112+
<assertj.version>3.27.6</assertj.version>
114113
<awaitility.version>4.3.0</awaitility.version>
115114
<junit.toolbox.version>2.4</junit.toolbox.version>
116115
<hamcrest.version>3.0</hamcrest.version>
@@ -161,7 +160,7 @@
161160
<dependency>
162161
<groupId>com.github.ben-manes.caffeine</groupId>
163162
<artifactId>caffeine</artifactId>
164-
<version>3.2.2</version>
163+
<version>3.2.3</version>
165164
</dependency>
166165

167166
<dependency>
@@ -202,13 +201,13 @@
202201
<dependency>
203202
<groupId>commons-codec</groupId>
204203
<artifactId>commons-codec</artifactId>
205-
<version>1.18.0</version>
204+
<version>1.19.0</version>
206205
</dependency>
207206

208207
<dependency>
209208
<groupId>commons-io</groupId>
210209
<artifactId>commons-io</artifactId>
211-
<version>2.19.0</version>
210+
<version>2.20.0</version>
212211
</dependency>
213212

214213
<dependency>
@@ -417,7 +416,7 @@
417416
<dependency>
418417
<groupId>net.bytebuddy</groupId>
419418
<artifactId>byte-buddy</artifactId>
420-
<version>1.17.6</version>
419+
<version>1.17.8</version>
421420
</dependency>
422421

423422
<dependency>
@@ -429,7 +428,7 @@
429428
<dependency>
430429
<groupId>it.unimi.dsi</groupId>
431430
<artifactId>fastutil</artifactId>
432-
<version>8.5.16</version>
431+
<version>8.5.18</version>
433432
</dependency>
434433

435434
<dependency>
@@ -562,7 +561,7 @@
562561
<plugin>
563562
<groupId>org.codehaus.mojo</groupId>
564563
<artifactId>xml-maven-plugin</artifactId>
565-
<version>1.1.0</version>
564+
<version>1.2.0</version>
566565
<configuration>
567566
<transformerFactory>net.sf.saxon.TransformerFactoryImpl</transformerFactory>
568567
</configuration>
@@ -601,12 +600,12 @@
601600
<plugin>
602601
<groupId>org.apache.maven.plugins</groupId>
603602
<artifactId>maven-shade-plugin</artifactId>
604-
<version>3.6.0</version>
603+
<version>3.6.1</version>
605604
</plugin>
606605
<plugin>
607606
<groupId>org.codehaus.mojo</groupId>
608607
<artifactId>exec-maven-plugin</artifactId>
609-
<version>3.5.1</version>
608+
<version>3.6.2</version>
610609
</plugin>
611610
<plugin>
612611
<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>3.2.1</tika.version>
73+
<tika.version>3.2.3</tika.version>
7474
</properties>
7575

7676
<dependencies>

‎extensions/indexes/spatial/pom.xml‎

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

7272
<properties>
73-
<geotools.version>33.2</geotools.version>
73+
<geotools.version>34.0</geotools.version>
7474
</properties>
7575

7676
<dependencies>
@@ -94,24 +94,6 @@
9494
<artifactId>gt-main</artifactId>
9595
<version>${geotools.version}</version>
9696
</dependency>
97-
<!-- dependency>
98-
<groupId>org.jdom</groupId>
99-
<artifactId>jdom</artifactId>
100-
<version>1.1.3</version>
101-
<scope>runtime</scope>
102-
<exclusions>
103-
<exclusion>
104-
<groupId>jaxen</groupId>
105-
<artifactId>jaxen</artifactId>
106-
</exclusion>
107-
</exclusions>
108-
</dependency>
109-
<dependency>
110-
<groupId>jaxen</groupId>
111-
<artifactId>jaxen</artifactId>
112-
<version>${jaxen.version}</version>
113-
<scope>runtime</scope>
114-
</dependency -->
11597
<dependency>
11698
<groupId>org.geotools</groupId>
11799
<artifactId>gt-referencing</artifactId>

‎extensions/modules/mail/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@
7070
</scm>
7171

7272
<properties>
73-
<jakarta.mail-api.version>2.1.3</jakarta.mail-api.version>
74-
<eclipse.angus-mail.version>2.0.3</eclipse.angus-mail.version>
75-
<jakarta.activation-api.version>2.1.3</jakarta.activation-api.version>
76-
<greenmail.version>2.1.4</greenmail.version>
73+
<jakarta.mail-api.version>2.1.5</jakarta.mail-api.version>
74+
<eclipse.angus-mail.version>2.0.5</eclipse.angus-mail.version>
75+
<jakarta.activation-api.version>2.1.4</jakarta.activation-api.version>
76+
<greenmail.version>2.1.7</greenmail.version>
7777
</properties>
7878

7979
<dependencies>

‎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);

0 commit comments

Comments
 (0)