Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions elemental-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,12 @@
<sonar.moduleKey>${project.groupId}:${project.artifactId}</sonar.moduleKey>

<!-- Dependencies -->
<eclipse.angus-activation.version>2.0.2</eclipse.angus-activation.version>
<junit.platform.version>1.13.3</junit.platform.version>
<junit.jupiter.version>5.13.3</junit.jupiter.version>
<eclipse.angus-activation.version>2.0.3</eclipse.angus-activation.version>
<junit.platform.version>6.0.0</junit.platform.version>
<junit.jupiter.version>6.0.0</junit.jupiter.version>
<objenesis.version>3.4</objenesis.version>
<jaxb.api.version>4.0.2</jaxb.api.version>
<jaxb.impl.version>4.0.5</jaxb.impl.version>
<jaxb.api.version>4.0.4</jaxb.api.version>
<jaxb.impl.version>4.0.6</jaxb.impl.version>

<!-- Surefire parallel configuration -->
<surefire.forkCount>1C</surefire.forkCount>
Expand Down Expand Up @@ -128,7 +128,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.14.0</version>
<version>3.14.1</version>
<configuration>
<source>${project.build.source}</source>
<target>${project.build.target}</target>
Expand Down Expand Up @@ -191,7 +191,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.11.2</version>
<version>3.12.0</version>
<configuration>
<source>${project.build.source}</source>
<archive>
Expand Down Expand Up @@ -252,7 +252,7 @@
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>12.1.3</version>
<version>12.1.8</version>
<configuration>
<nvdApiKeyEnvironmentVariable>NVD_API_KEY</nvdApiKeyEnvironmentVariable>
<nvdApiServerId>nvd-api</nvdApiServerId>
Expand Down Expand Up @@ -293,7 +293,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.8.1</version>
<version>3.9.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -331,13 +331,13 @@
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.8.0</version>
<version>0.9.0</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-plugin</artifactId>
<version>2.1.0</version>
<version>2.2.1</version>
<configuration>
<sign>true</sign>
</configuration>
Expand All @@ -350,7 +350,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.13</version>
<version>0.8.14</version>
<configuration>
<propertyName>jacocoArgLine</propertyName>
<excludes>
Expand All @@ -368,7 +368,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.18.0</version>
<version>2.19.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -429,12 +429,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>3.5.3</version>
<version>3.5.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.5.3</version>
<version>3.5.4</version>
<configuration>
<includes>
<include>**/*IT.java</include>
Expand All @@ -444,15 +444,15 @@
<plugin>
<groupId>com.github.hazendaz.maven</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>4.7.0</version>
<version>5.0.0</version>
<configuration>
<repoToken>${env.COVERALLS_TOKEN}</repoToken>
</configuration>
</plugin>
<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId>
<version>5.1.0.4751</version>
<version>5.2.0.4988</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down
8 changes: 4 additions & 4 deletions exist-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.19.1</version>
<version>2.20.0</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -210,7 +210,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
<version>1.81</version>
<version>1.82</version>
</dependency>

<dependency>
Expand All @@ -233,7 +233,7 @@
<dependency>
<groupId>com.fasterxml.uuid</groupId>
<artifactId>java-uuid-generator</artifactId>
<version>5.1.0</version>
<version>5.1.1</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -502,7 +502,7 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
<version>2.5.0</version>
<version>2.5.1</version>
<!-- exclude Quartz SQL connectivity options -->
<exclusions>
<exclusion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@
import org.exist.xquery.value.Type;
import org.exist.xquery.value.ValueSequence;

import org.exist.xslt.TransformerFactoryAllocator;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
Expand Down Expand Up @@ -460,7 +461,7 @@ private Path preparseDTD(StreamSource instance, String systemId)

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

final TransformerFactory tf = TransformerFactory.newInstance();
final TransformerFactory tf = TransformerFactoryAllocator.getTransformerFactory(context.getBroker().getBrokerPool());

final Transformer transformer = tf.newTransformer();

Expand Down
2 changes: 1 addition & 1 deletion exist-distribution/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
<executions>
<execution>
<id>unzip-dashboard</id>
Expand Down
27 changes: 13 additions & 14 deletions exist-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -97,20 +97,19 @@
<exquery.distribution.version>0.2.1</exquery.distribution.version>
<icu.version>59.1</icu.version>
<izpack.version>5.2.4</izpack.version>
<jline.version>3.30.4</jline.version>
<jline.version>3.30.6</jline.version>
<lz4-java.version>1.8.0</lz4-java.version>
<jdom1.version>1.1.3</jdom1.version>
<jetty.version>11.0.25</jetty.version>
<log4j.version>2.25.1</log4j.version>
<jetty.version>11.0.26</jetty.version>
<log4j.version>2.25.2</log4j.version>
<lucene.version>4.10.4</lucene.version>
<nekohtml.version>2.1.3</nekohtml.version>
<saxon.version>9.9.1-8</saxon.version>
<xerces.version>2.12.2.2</xerces.version>
<xmlresolver.version>6.0.19</xmlresolver.version>
<xmlunit.version>2.10.3</xmlunit.version>
<xmlunit.version>2.11.0</xmlunit.version>
<junit.version>4.13.2</junit.version>
<easymock.version>5.6.0</easymock.version>
<assertj.version>3.27.3</assertj.version>
<assertj.version>3.27.6</assertj.version>
<awaitility.version>4.3.0</awaitility.version>
<junit.toolbox.version>2.4</junit.toolbox.version>
<hamcrest.version>3.0</hamcrest.version>
Expand Down Expand Up @@ -161,7 +160,7 @@
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
<version>3.2.2</version>
<version>3.2.3</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -202,13 +201,13 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.18.0</version>
<version>1.19.0</version>
</dependency>

<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.19.0</version>
<version>2.20.0</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -417,7 +416,7 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.17.6</version>
<version>1.17.8</version>
</dependency>

<dependency>
Expand All @@ -429,7 +428,7 @@
<dependency>
<groupId>it.unimi.dsi</groupId>
<artifactId>fastutil</artifactId>
<version>8.5.16</version>
<version>8.5.18</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -562,7 +561,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
<version>1.1.0</version>
<version>1.2.0</version>
<configuration>
<transformerFactory>net.sf.saxon.TransformerFactoryImpl</transformerFactory>
</configuration>
Expand Down Expand Up @@ -601,12 +600,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.6.0</version>
<version>3.6.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.5.1</version>
<version>3.6.2</version>
</plugin>
<plugin>
<groupId>de.jutzig</groupId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/contentextraction/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
</scm>

<properties>
<tika.version>3.2.1</tika.version>
<tika.version>3.2.3</tika.version>
</properties>

<dependencies>
Expand Down
20 changes: 1 addition & 19 deletions extensions/indexes/spatial/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
</scm>

<properties>
<geotools.version>33.2</geotools.version>
<geotools.version>34.0</geotools.version>
</properties>

<dependencies>
Expand All @@ -94,24 +94,6 @@
<artifactId>gt-main</artifactId>
<version>${geotools.version}</version>
</dependency>
<!-- dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.1.3</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
<version>${jaxen.version}</version>
<scope>runtime</scope>
</dependency -->
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-referencing</artifactId>
Expand Down
8 changes: 4 additions & 4 deletions extensions/modules/mail/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@
</scm>

<properties>
<jakarta.mail-api.version>2.1.3</jakarta.mail-api.version>
<eclipse.angus-mail.version>2.0.3</eclipse.angus-mail.version>
<jakarta.activation-api.version>2.1.3</jakarta.activation-api.version>
<greenmail.version>2.1.4</greenmail.version>
<jakarta.mail-api.version>2.1.5</jakarta.mail-api.version>
<eclipse.angus-mail.version>2.0.5</eclipse.angus-mail.version>
<jakarta.activation-api.version>2.1.4</jakarta.activation-api.version>
<greenmail.version>2.1.7</greenmail.version>
</properties>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
import org.exist.util.MimeTable;
import org.exist.xquery.*;
import org.exist.xquery.value.*;
import org.exist.xslt.TransformerFactoryAllocator;
import org.w3c.dom.Element;
import org.w3c.dom.Node;

Expand All @@ -65,8 +66,8 @@
import javax.annotation.Nullable;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.sax.SAXTransformerFactory;
import javax.xml.transform.stream.StreamResult;
import java.io.*;
import java.net.InetAddress;
Expand All @@ -90,7 +91,6 @@
public class SendEmailFunction extends BasicFunction {

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

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

Expand Down Expand Up @@ -700,7 +700,8 @@ private Mail[] parseMailElement(final Element[] mailElements) throws Transformer
mail.setText(bodyPart.getFirstChild().getNodeValue());
} else if ("xhtml".equals(bodyPart.getLocalName())) {
//Convert everything inside <xhtml></xhtml> to text
final Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
final SAXTransformerFactory factory = TransformerFactoryAllocator.getTransformerFactory(context.getBroker().getBrokerPool());
final Transformer transformer = factory.newTransformer();
final DOMSource source = new DOMSource(bodyPart.getFirstChild());
try (final StringBuilderWriter strWriter = new StringBuilderWriter()) {
final StreamResult result = new StreamResult(strWriter);
Expand Down Expand Up @@ -839,7 +840,8 @@ private Message[] parseMessageElement(final Session session, final Element[] mai
break;
case "xhtml":
//Convert everything inside <xhtml></xhtml> to text
final Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
final SAXTransformerFactory factory = TransformerFactoryAllocator.getTransformerFactory(context.getBroker().getBrokerPool());
final Transformer transformer = factory.newTransformer();
final DOMSource source = new DOMSource(bodyPart.getFirstChild());
try (final StringBuilderWriter strWriter = new StringBuilderWriter()) {
final StreamResult result = new StreamResult(strWriter);
Expand Down Expand Up @@ -906,7 +908,8 @@ private Message[] parseMessageElement(final Session session, final Element[] mai
Node attachChild = attachment.getFirstChild();
while (attachChild != null) {
if (Node.ELEMENT_NODE == attachChild.getNodeType()) {
final Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
final SAXTransformerFactory factory = TransformerFactoryAllocator.getTransformerFactory(context.getBroker().getBrokerPool());
final Transformer transformer = factory.newTransformer();
final DOMSource source = new DOMSource(attachChild);
try (final StringBuilderWriter strWriter = new StringBuilderWriter()) {
final StreamResult result = new StreamResult(strWriter);
Expand Down
Loading
Loading