From 0af39547cf0279cc8bd97fe8ca406cbf643b355b Mon Sep 17 00:00:00 2001
From: Adam Retter <adam.retter@googlemail.com>
Date: Thu, 30 Oct 2025 11:21:10 +0100
Subject: [PATCH 1/2] [bugfix] Add missing non-transitive build dependencies

---
 exist-core/pom.xml                    | 14 +++++++++++++-
 extensions/indexes/ngram/pom.xml      | 12 ++++++++++++
 extensions/modules/expathrepo/pom.xml |  5 +++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/exist-core/pom.xml b/exist-core/pom.xml
index 0e9080847e..4c50d1821f 100644
--- a/exist-core/pom.xml
+++ b/exist-core/pom.xml
@@ -156,7 +156,8 @@
             <artifactId>jing</artifactId>
             <version>20241231</version>
             <exclusions>
-                <exclusion> <!-- conflicts with Xerces dependency on xml-apis -->
+                <exclusion>
+                    <!-- NOTE(AR): conflicts with com.evolvedbinary.thirdparty.xml-apis:xml-apis -->
                     <groupId>xml-apis</groupId>
                     <artifactId>xml-apis</artifactId>
                 </exclusion>
@@ -321,6 +322,7 @@
             <groupId>com.evolvedbinary.thirdparty.xml-apis</groupId>
             <artifactId>xml-apis</artifactId>
         </dependency>
+
         <dependency>
             <groupId>com.evolvedbinary.thirdparty.org.apache.ws.commons.util</groupId>
             <artifactId>ws-commons-util</artifactId>
@@ -341,6 +343,11 @@
             <artifactId>xmlresolver</artifactId>
             <version>${xmlresolver.version}</version>
             <exclusions>
+                <exclusion>
+                    <!-- NOTE(AR): conflicts with com.evolvedbinary.thirdparty.xml-apis:xml-apis -->
+                    <groupId>xml-apis</groupId>
+                    <artifactId>xml-apis</artifactId>
+                </exclusion>
                 <exclusion>
                     <!-- NOTE(AR): conflicts with com.evolvedbinary.thirdparty.xerces:xercesImpl -->
                     <groupId>xerces</groupId>
@@ -356,6 +363,11 @@
             <classifier>data</classifier>
             <scope>runtime</scope>
             <exclusions>
+                <exclusion>
+                    <!-- NOTE(AR): conflicts with com.evolvedbinary.thirdparty.xml-apis:xml-apis -->
+                    <groupId>xml-apis</groupId>
+                    <artifactId>xml-apis</artifactId>
+                </exclusion>
                 <exclusion>
                     <!-- NOTE(AR): conflicts with com.evolvedbinary.thirdparty.xerces:xercesImpl -->
                     <groupId>xerces</groupId>
diff --git a/extensions/indexes/ngram/pom.xml b/extensions/indexes/ngram/pom.xml
index 3ef141a177..c3bd6425f2 100644
--- a/extensions/indexes/ngram/pom.xml
+++ b/extensions/indexes/ngram/pom.xml
@@ -86,6 +86,12 @@
             <artifactId>xml-apis</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.evolvedbinary.j8fu</groupId>
+            <artifactId>j8fu</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
@@ -104,6 +110,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.xmlunit</groupId>
+            <artifactId>xmlunit-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.xmlunit</groupId>
             <artifactId>xmlunit-matchers</artifactId>
diff --git a/extensions/modules/expathrepo/pom.xml b/extensions/modules/expathrepo/pom.xml
index bde173b814..4f5b2cf9bc 100644
--- a/extensions/modules/expathrepo/pom.xml
+++ b/extensions/modules/expathrepo/pom.xml
@@ -92,6 +92,11 @@
             <artifactId>xml-apis</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+        </dependency>
+
         <!-- test -->
         <dependency>
             <groupId>junit</groupId>

From 11805e21bc0df509d0dc20244c49e3b6ead6a663 Mon Sep 17 00:00:00 2001
From: Adam Retter <adam.retter@googlemail.com>
Date: Thu, 30 Oct 2025 11:21:48 +0100
Subject: [PATCH 2/2] [bugfix] Ensure that the Maven javadoc plugin can find
 the generated sources

---
 exist-core/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exist-core/pom.xml b/exist-core/pom.xml
index 4c50d1821f..c22524cb6b 100644
--- a/exist-core/pom.xml
+++ b/exist-core/pom.xml
@@ -2279,7 +2279,7 @@ The BaseX Team. The original license statement is also included below.]]></pream
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
-                    <excludePackageNames>org.exist.xquery.parser:org.exist.xquery.xqdoc.parser</excludePackageNames>
+                    <sourcepath>${project.build.sourceDirectory}:${project.build.directory}/generated-sources/annotations:${project.build.directory}/generated-sources/antlr</sourcepath>
                 </configuration>
             </plugin>