Update expected dependencies.

5 files changed, 32 insertions, 2 deletions

diff --git a/bundle-plugin/pom.xml b/bundle-plugin/pom.xml
index 8869386eef6..85759273bf1 100644
--- a/bundle-plugin/pom.xml
+++ b/bundle-plugin/pom.xml
@@ -87,6 +87,11 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-xml-impl</artifactId>
+            <scope>provided</scope> <!-- maven complains if not provided scope. Reason unknown.-->
+        </dependency>
     </dependencies>
     <build>
         <finalName>${project.artifactId}</finalName>
diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml
index e05ea725907..7dfc94adab9 100644
--- a/dependency-versions/pom.xml
+++ b/dependency-versions/pom.xml
@@ -122,6 +122,7 @@
         <lucene.vespa.version>9.10.0</lucene.vespa.version>
         <maven-archiver.vespa.version>3.6.2</maven-archiver.vespa.version>
         <maven-wagon.vespa.version>3.5.3</maven-wagon.vespa.version>
+        <maven-xml-impl.vespa.version>4.0.0-alpha-13</maven-xml-impl.vespa.version>
         <mimepull.vespa.version>1.10.0</mimepull.vespa.version>
         <mockito.vespa.version>5.11.0</mockito.vespa.version>
         <mojo-executor.vespa.version>2.4.0</mojo-executor.vespa.version>
@@ -136,7 +137,7 @@
         <plexus-archiver.vespa.version>4.9.2</plexus-archiver.vespa.version>
         <plexus-interpolation.vespa.version>1.27</plexus-interpolation.vespa.version>
         <plexus-io.vespa.version>3.4.2</plexus-io.vespa.version>
-        <plexus-utils.vespa.version>3.5.1</plexus-utils.vespa.version>
+        <plexus-utils.vespa.version>4.0.0</plexus-utils.vespa.version>
         <plexus-xml.vespa.version>4.0.3</plexus-xml.vespa.version>
         <protobuf.vespa.version>3.25.3</protobuf.vespa.version>
         <questdb.vespa.version>7.3.10</questdb.vespa.version>
@@ -147,6 +148,8 @@
         <velocity.vespa.version>2.3</velocity.vespa.version>
         <velocity.tools.vespa.version>3.1</velocity.tools.vespa.version>
         <wiremock.vespa.version>3.5.2</wiremock.vespa.version>
+        <woodstox.vespa.version>6.6.2</woodstox.vespa.version>
+        <stax2-api.vespa.version>4.2.2</stax2-api.vespa.version>
         <xerces.vespa.version>2.12.2</xerces.vespa.version>
         <zero-allocation-hashing.vespa.version>0.16</zero-allocation-hashing.vespa.version>
         <zookeeper.client.vespa.version>3.9.2</zookeeper.client.vespa.version>
diff --git a/document/src/main/java/com/yahoo/document/datatypes/Array.java b/document/src/main/java/com/yahoo/document/datatypes/Array.java
index 98a682bb14b..4e8e83f6951 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/Array.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/Array.java
@@ -516,7 +516,7 @@ public final class Array<T extends FieldValue> extends CollectionFieldValue<T> i
         }
 
         @Override
-        @SuppressWarnings("deprecation, unchecked")
+        @SuppressWarnings("unchecked")
         public boolean equals(Object o) {
             return this == o || o instanceof ListWrapper && myvalues.equals(((ListWrapper) o).myvalues);
         }
diff --git a/maven-plugins/allowed-maven-dependencies.txt b/maven-plugins/allowed-maven-dependencies.txt
index bef72f582e4..60cf163a8b4 100644
--- a/maven-plugins/allowed-maven-dependencies.txt
+++ b/maven-plugins/allowed-maven-dependencies.txt
@@ -4,6 +4,7 @@ aopalliance:aopalliance:${aopalliance.vespa.version}
 com.fasterxml.jackson.core:jackson-annotations:${jackson2.vespa.version}
 com.fasterxml.jackson.core:jackson-core:${jackson2.vespa.version}
 com.fasterxml.jackson.core:jackson-databind:${jackson-databind.vespa.version}
+com.fasterxml.woodstox:woodstox-core:${woodstox.vespa.version}
 com.github.luben:zstd-jni:${luben.zstd.vespa.version}
 com.google.errorprone:error_prone_annotations:${error-prone-annotations.vespa.version}
 com.google.guava:failureaccess:${failureaccess.vespa.version}
@@ -33,6 +34,8 @@ org.apache.maven.resolver:maven-resolver-spi:${maven-resolver.vespa.version}
 org.apache.maven.resolver:maven-resolver-util:${maven-resolver.vespa.version}
 org.apache.maven.shared:maven-dependency-tree:3.2.1
 org.apache.maven.shared:maven-shared-utils:3.3.4
+org.apache.maven:maven-api-meta:${maven-xml-impl.vespa.version}
+org.apache.maven:maven-api-xml:${maven-xml-impl.vespa.version}
 org.apache.maven:maven-archiver:${maven-archiver.vespa.version}
 org.apache.maven:maven-artifact:${maven-core.vespa.version}
 org.apache.maven:maven-builder-support:${maven-core.vespa.version}
@@ -44,6 +47,7 @@ org.apache.maven:maven-repository-metadata:${maven-core.vespa.version}
 org.apache.maven:maven-resolver-provider:${maven-core.vespa.version}
 org.apache.maven:maven-settings-builder:${maven-core.vespa.version}
 org.apache.maven:maven-settings:${maven-core.vespa.version}
+org.apache.maven:maven-xml-impl:${maven-xml-impl.vespa.version}
 org.apiguardian:apiguardian-api:${apiguardian.vespa.version}
 org.codehaus.plexus:plexus-archiver:${plexus-archiver.vespa.version}
 org.codehaus.plexus:plexus-cipher:2.0
@@ -54,6 +58,7 @@ org.codehaus.plexus:plexus-io:${plexus-io.vespa.version}
 org.codehaus.plexus:plexus-sec-dispatcher:2.0
 org.codehaus.plexus:plexus-utils:${plexus-utils.vespa.version}
 org.codehaus.plexus:plexus-xml:${plexus-xml.vespa.version}
+org.codehaus.woodstox:stax2-api:${stax2-api.vespa.version}
 org.eclipse.aether:aether-api:1.0.0.v20140518
 org.eclipse.aether:aether-util:1.0.0.v20140518
 org.eclipse.sisu:org.eclipse.sisu.inject:${eclipse-sisu.vespa.version}
diff --git a/parent/pom.xml b/parent/pom.xml
index 4b64e0dceda..4988f6e1c26 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -896,6 +896,11 @@
                 <version>2.2.1</version>
             </dependency>
             <dependency>
+                <groupId>org.apache.maven</groupId>
+                <artifactId>maven-xml-impl</artifactId>
+                <version>${maven-xml-impl.vespa.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>org.apache.maven.enforcer</groupId>
                 <artifactId>enforcer-api</artifactId>
                 <version>${maven-enforcer-plugin.vespa.version}</version>
@@ -1242,6 +1247,18 @@
                 <version>${mojo-executor.vespa.version}</version>
             </dependency>
             <dependency>
+                <!-- Force fresh woodstox-core without security issue -->
+                <groupId>com.fasterxml.woodstox</groupId>
+                <artifactId>woodstox-core</artifactId>
+                <version>${woodstox.vespa.version}</version>
+            </dependency>
+            <dependency>
+                <!-- Force fresh woodstox-core without security issue -->
+                <groupId>org.codehaus.woodstox</groupId>
+                <artifactId>stax2-api</artifactId>
+                <version>${stax2-api.vespa.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>org.xerial.snappy</groupId>
                 <artifactId>snappy-java</artifactId>
                 <version>${snappy.vespa.version}</version>