diff --git a/elemental-parent/pom.xml b/elemental-parent/pom.xml index 9ba713270f..3bd2af9aa8 100644 --- a/elemental-parent/pom.xml +++ b/elemental-parent/pom.xml @@ -95,12 +95,12 @@ ${project.groupId}:${project.artifactId} - 2.0.2 - 1.13.3 - 5.13.3 + 2.0.3 + 6.0.0 + 6.0.0 3.4 - 4.0.2 - 4.0.5 + 4.0.4 + 4.0.6 1C @@ -128,7 +128,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 ${project.build.source} ${project.build.target} @@ -191,7 +191,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.11.2 + 3.12.0 ${project.build.source} @@ -252,7 +252,7 @@ org.owasp dependency-check-maven - 12.1.3 + 12.1.8 NVD_API_KEY nvd-api @@ -293,7 +293,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.8.1 + 3.9.0 org.apache.maven.plugins @@ -331,13 +331,13 @@ org.sonatype.central central-publishing-maven-plugin - 0.8.0 + 0.9.0 true org.apache.maven.plugins maven-scm-plugin - 2.1.0 + 2.2.1 true @@ -350,7 +350,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 jacocoArgLine @@ -368,7 +368,7 @@ org.codehaus.mojo versions-maven-plugin - 2.18.0 + 2.19.1 org.apache.maven.plugins @@ -429,12 +429,12 @@ org.apache.maven.plugins maven-surefire-report-plugin - 3.5.3 + 3.5.4 org.apache.maven.plugins maven-failsafe-plugin - 3.5.3 + 3.5.4 **/*IT.java @@ -444,7 +444,7 @@ com.github.hazendaz.maven coveralls-maven-plugin - 4.7.0 + 5.0.0 ${env.COVERALLS_TOKEN} @@ -452,7 +452,7 @@ org.sonarsource.scanner.maven sonar-maven-plugin - 5.1.0.4751 + 5.2.0.4988 diff --git a/exist-core/pom.xml b/exist-core/pom.xml index d6fbff2693..e844c9ad4b 100644 --- a/exist-core/pom.xml +++ b/exist-core/pom.xml @@ -92,7 +92,7 @@ com.fasterxml.jackson.core jackson-core - 2.19.1 + 2.20.0 @@ -210,7 +210,7 @@ org.bouncycastle bcprov-jdk18on - 1.81 + 1.82 @@ -233,7 +233,7 @@ com.fasterxml.uuid java-uuid-generator - 5.1.0 + 5.1.1 @@ -502,7 +502,7 @@ org.quartz-scheduler quartz - 2.5.0 + 2.5.1 diff --git a/exist-core/src/main/java/org/exist/xquery/functions/validation/Jaxp.java b/exist-core/src/main/java/org/exist/xquery/functions/validation/Jaxp.java index 3cc8551cad..933e840eca 100644 --- a/exist-core/src/main/java/org/exist/xquery/functions/validation/Jaxp.java +++ b/exist-core/src/main/java/org/exist/xquery/functions/validation/Jaxp.java @@ -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; @@ -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(); diff --git a/exist-distribution/pom.xml b/exist-distribution/pom.xml index b0aa5d0b00..d074d52ccf 100644 --- a/exist-distribution/pom.xml +++ b/exist-distribution/pom.xml @@ -762,7 +762,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 unzip-dashboard diff --git a/exist-parent/pom.xml b/exist-parent/pom.xml index eb0cc9afc1..8909e82a8b 100644 --- a/exist-parent/pom.xml +++ b/exist-parent/pom.xml @@ -97,20 +97,19 @@ 0.2.1 59.1 5.2.4 - 3.30.4 + 3.30.6 1.8.0 - 1.1.3 - 11.0.25 - 2.25.1 + 11.0.26 + 2.25.2 4.10.4 2.1.3 9.9.1-8 2.12.2.2 6.0.19 - 2.10.3 + 2.11.0 4.13.2 5.6.0 - 3.27.3 + 3.27.6 4.3.0 2.4 3.0 @@ -161,7 +160,7 @@ com.github.ben-manes.caffeine caffeine - 3.2.2 + 3.2.3 @@ -202,13 +201,13 @@ commons-codec commons-codec - 1.18.0 + 1.19.0 commons-io commons-io - 2.19.0 + 2.20.0 @@ -417,7 +416,7 @@ net.bytebuddy byte-buddy - 1.17.6 + 1.17.8 @@ -429,7 +428,7 @@ it.unimi.dsi fastutil - 8.5.16 + 8.5.18 @@ -562,7 +561,7 @@ org.codehaus.mojo xml-maven-plugin - 1.1.0 + 1.2.0 net.sf.saxon.TransformerFactoryImpl @@ -601,12 +600,12 @@ org.apache.maven.plugins maven-shade-plugin - 3.6.0 + 3.6.1 org.codehaus.mojo exec-maven-plugin - 3.5.1 + 3.6.2 de.jutzig diff --git a/extensions/contentextraction/pom.xml b/extensions/contentextraction/pom.xml index 108ab5664c..87ab965b39 100644 --- a/extensions/contentextraction/pom.xml +++ b/extensions/contentextraction/pom.xml @@ -70,7 +70,7 @@ - 3.2.1 + 3.2.3 diff --git a/extensions/indexes/spatial/pom.xml b/extensions/indexes/spatial/pom.xml index 574ed23afe..96e1858942 100644 --- a/extensions/indexes/spatial/pom.xml +++ b/extensions/indexes/spatial/pom.xml @@ -70,7 +70,7 @@ - 33.2 + 34.0 @@ -94,24 +94,6 @@ gt-main ${geotools.version} - org.geotools gt-referencing diff --git a/extensions/modules/mail/pom.xml b/extensions/modules/mail/pom.xml index b6903695ef..7e97565da6 100644 --- a/extensions/modules/mail/pom.xml +++ b/extensions/modules/mail/pom.xml @@ -70,10 +70,10 @@ - 2.1.3 - 2.0.3 - 2.1.3 - 2.1.4 + 2.1.5 + 2.0.5 + 2.1.4 + 2.1.7 diff --git a/extensions/modules/mail/src/main/java/org/exist/xquery/modules/mail/SendEmailFunction.java b/extensions/modules/mail/src/main/java/org/exist/xquery/modules/mail/SendEmailFunction.java index 4e611c3aca..d6336cccd0 100644 --- a/extensions/modules/mail/src/main/java/org/exist/xquery/modules/mail/SendEmailFunction.java +++ b/extensions/modules/mail/src/main/java/org/exist/xquery/modules/mail/SendEmailFunction.java @@ -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; @@ -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; @@ -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 @@ -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 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); @@ -839,7 +840,8 @@ private Message[] parseMessageElement(final Session session, final Element[] mai break; case "xhtml": //Convert everything inside 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); @@ -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); diff --git a/extensions/modules/sql-oracle/pom.xml b/extensions/modules/sql-oracle/pom.xml index c83ad29135..b6a40c0f30 100644 --- a/extensions/modules/sql-oracle/pom.xml +++ b/extensions/modules/sql-oracle/pom.xml @@ -133,9 +133,9 @@ - com.oracle.jdbc + com.oracle.database.jdbc ojdbc17 - 23.8.0.25.04 + 23.26.0.0.0 diff --git a/extensions/modules/sql/pom.xml b/extensions/modules/sql/pom.xml index a9269fb465..32c61aaf2c 100644 --- a/extensions/modules/sql/pom.xml +++ b/extensions/modules/sql/pom.xml @@ -99,7 +99,7 @@ com.zaxxer HikariCP - 6.3.0 + 7.0.2