diff --git a/build.bat b/build.bat
index 4c1c77a032..d050956a4d 100644
--- a/build.bat
+++ b/build.bat
@@ -68,6 +68,8 @@ if /I "%~1"=="--debug" (
     set "TARGET=dependency-check"
 ) else if /I "%~1"=="dependency-security-check" (
     set "TARGET=dependency-security-check"
+) else if /I "%~1"=="format-poms" (
+    set "TARGET=format-poms"
 )
 shift
 goto parse_args
@@ -115,6 +117,18 @@ if "%TARGET%"=="clean" (
     set "CMD=%BASE_CMD% dependency:analyze"
 ) else if "%TARGET%"=="dependency-security-check" (
     set "CMD=%BASE_CMD% dependency-check:check"
+) else if "%TARGET%"=="format-poms" (
+    set "SAXON=%USERPROFILE%\.m2\repository\net\sf\saxon\Saxon-HE\9.9.1-8\Saxon-HE-9.9.1-8.jar"
+    for /r %%POM in (pom.xml) do (
+        echo | set /p dummyName="Formatting %%POM ..."
+        java -jar "%SAXON%" -s:%%POM -xsl:format-pom.xslt -o:%%POM
+        echo OK
+
+        echo | set /p dummyName="Checking for duplicate license entries in %%POM ... "
+        java -cp "%SAXON%" net.sf.saxon.Query -q:check-pom-license-uniqueness.xq pom-file-uri=file:%%POM
+        echo OK
+    )
+    goto end
 ) else (
     echo Invalid target: %TARGET%
     goto show_useage
diff --git a/build.sh b/build.sh
index ffaad3fa9a..37673a114d 100755
--- a/build.sh
+++ b/build.sh
@@ -38,7 +38,7 @@ do
 key="$1"
 
 case $key in
-    clean|quick|quick-archives|quick-docker|quick-archives-docker|quick-install|test|site|license-check|license-format|dependency-check|dependency-security-check)
+    clean|quick|quick-archives|quick-docker|quick-archives-docker|quick-install|test|site|license-check|license-format|dependency-check|dependency-security-check|format-poms)
     TARGET="$1"
     shift
     ;;
@@ -75,6 +75,7 @@ function print-useage() {
   echo -e "\tlicence-format - Adds the correct license header to any source files that are missing it"
   echo -e "\tdependency-check - Checks that all modules have correctly declared their dependencies"
   echo -e "\tdependency-security-check - Checks that all dependencies have no unexpected CVE security issues"
+  echo -e "\tformat-poms - Format the pom.xml files"
   echo -e "\tclean - Remove all built artifacts"
   echo -e "\n--offline - attempts to run the Maven build in offline mode"
 }
@@ -170,5 +171,24 @@ if [ "${TARGET}" == "dependency-security-check" ]; then
   exit 0;
 fi
 
+if [ "${TARGET}" == "format-poms" ]; then
+  SAXON="${HOME}/.m2/repository/net/sf/saxon/Saxon-HE/9.9.1-8/Saxon-HE-9.9.1-8.jar"
+  POMS="$(find . -name pom.xml)"
+  for pom in $POMS; do
+
+    echo -n "Formatting ${pom} ... "
+    CMD="java -jar ${SAXON} -s:${pom} -xsl:format-pom.xslt -o:${pom}"
+    $CMD
+    echo "OK"
+
+    echo -n "Checking for duplicate license entries in ${pom} ... "
+    CMD="java -cp ${SAXON} net.sf.saxon.Query -q:check-pom-license-uniqueness.xq pom-file-uri=file:${pom}"
+    $CMD
+    echo "OK"
+
+  done
+  exit 0;
+fi
+
 print-useage
 exit 0;
diff --git a/check-pom-license-uniqueness.xq b/check-pom-license-uniqueness.xq
new file mode 100644
index 0000000000..6407294d9d
--- /dev/null
+++ b/check-pom-license-uniqueness.xq
@@ -0,0 +1,79 @@
+(:
+ : Elemental
+ : Copyright (C) 2024, Evolved Binary Ltd
+ :
+ : admin@evolvedbinary.com
+ : https://www.evolvedbinary.com | https://www.elemental.xyz
+ :
+ : This library is free software; you can redistribute it and/or
+ : modify it under the terms of the GNU Lesser General Public
+ : License as published by the Free Software Foundation; version 2.1.
+ :
+ : This library is distributed in the hope that it will be useful,
+ : but WITHOUT ANY WARRANTY; without even the implied warranty of
+ : MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ : Lesser General Public License for more details.
+ :
+ : You should have received a copy of the GNU Lesser General Public
+ : License along with this library; if not, write to the Free Software
+ : Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ :)
+ xquery version "3.1";
+
+(:~
+ : Checks within the <excludes> and <includes> of each <licenseSet> with a pom.xml
+ : file to make sure there are no duplicate entries.
+ :)
+
+declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
+declare namespace pom = "http://maven.apache.org/POM/4.0.0";
+
+declare option output:omit-xml-declaration "yes";
+
+
+(: Must be set externally with the URI to the pom.xml file :)
+declare variable $pom-file-uri as xs:string external;
+
+let $pom := doc($pom-file-uri)
+return
+(
+
+  let $includes-elements := $pom//pom:includes
+  for $includes-element in $includes-elements
+  let $total-includes := count($includes-element/pom:include/string(.))
+  let $distinct-includes := count(distinct-values($includes-element/pom:include/string(.)))
+  return
+    if ($total-includes ne $distinct-includes)
+    then
+      let $duplicates :=
+          distinct-values(
+              for $include in $includes-element/pom:include/string(.)
+              where count($includes-element/pom:include[. eq $include]) gt 1
+              return $include
+          )
+      return
+        error(xs:QName("duplicate-include"), "There are duplicate 'include' license entries within a 'licenseSet' in: " || $pom-file-uri || " at: " || path($includes-element) || " duplicates: " || string-join($duplicates, ", "))
+    else
+      ()
+      
+,
+
+  let $excludes-elements := $pom//pom:excludes[parent::pom:licenseSet]
+  for $excludes-element in $excludes-elements
+  let $total-excludes := count($excludes-element/pom:exclude/string(.))
+  let $distinct-excludes := count(distinct-values($excludes-element/pom:exclude/string(.)))
+  return
+    if ($total-excludes ne $distinct-excludes)
+    then
+      let $duplicates :=
+          distinct-values(
+              for $exclude in $excludes-element/pom:exclude/string(.)
+              where count($excludes-element/pom:exclude[. eq $exclude]) gt 1
+              return $exclude
+          )
+      return
+      error(xs:QName("duplicate-exclude"), "There are duplicate 'exclude' license entries within a 'licenseSet' in: " || $pom-file-uri || " at: " || path($excludes-element) || " duplicates: " || string-join($duplicates, ", "))
+    else
+      ()
+
+)
\ No newline at end of file
diff --git a/elemental-parent/pom.xml b/elemental-parent/pom.xml
index 42f2313e7d..889c198ad8 100644
--- a/elemental-parent/pom.xml
+++ b/elemental-parent/pom.xml
@@ -402,7 +402,7 @@
                         </dependency>
                     </dependencies>
                     <configuration>
-                        <forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory" />
+                        <forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"/>
                         <forkCount>${surefire.forkCount}</forkCount>
                         <reuseForks>${surefire.reuseForks}</reuseForks>
                         <argLine>@{jacocoArgLine} -XX:+IgnoreUnrecognizedVMOptions --illegal-access=debug --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.ref=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED -Dfile.encoding=${project.build.sourceEncoding}</argLine>
@@ -719,4 +719,4 @@
         </repository>
     </distributionManagement>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/exist-ant/pom.xml b/exist-ant/pom.xml
index 7270c7fc99..66070e015a 100644
--- a/exist-ant/pom.xml
+++ b/exist-ant/pom.xml
@@ -172,8 +172,8 @@
                             </multi>
                             <includes>
                                 <include>pom.xml</include>
-                                <include>src/test/resources/log4j2.xml</include>
                                 <include>src/test/resources-filtered/conf.xml</include>
+                                <include>src/test/resources/log4j2.xml</include>
                             </includes>
                         </licenseSet>
 
@@ -183,14 +183,14 @@
                             -->
                             <header>${project.parent.relativePath}/../exist-parent/existdb-LGPL-21-license.template.txt</header>
                             <excludes>
-                                <exclude>**.txt</exclude>
                                 <exclude>**.md</exclude>
-                                <exclude>**LICENSE</exclude>
+                                <exclude>**.txt</exclude>
                                 <exclude>**.xar</exclude>
-                                <exclude>xquery-license-style.xml</exclude>
+                                <exclude>**LICENSE</exclude>
                                 <exclude>pom.xml</exclude>
-                                <exclude>src/test/resources/log4j2.xml</exclude>
+                                <exclude>xquery-license-style.xml</exclude>
                                 <exclude>src/test/resources-filtered/conf.xml</exclude>
+                                <exclude>src/test/resources/log4j2.xml</exclude>
                             </excludes>
                         </licenseSet>
                     </licenseSets>
@@ -200,4 +200,4 @@
 
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/exist-core-jcstress/pom.xml b/exist-core-jcstress/pom.xml
index 8d8b012c33..383346b54c 100644
--- a/exist-core-jcstress/pom.xml
+++ b/exist-core-jcstress/pom.xml
@@ -167,4 +167,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/exist-core-jmh/pom.xml b/exist-core-jmh/pom.xml
index 3ebc5f61b6..186df9f1b0 100644
--- a/exist-core-jmh/pom.xml
+++ b/exist-core-jmh/pom.xml
@@ -218,4 +218,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/exist-core/pom.xml b/exist-core/pom.xml
index af30839b96..c66d1f5ab9 100644
--- a/exist-core/pom.xml
+++ b/exist-core/pom.xml
@@ -765,8 +765,8 @@
                             </multi>
                             <includes>
                                 <include>pom.xml</include>
-                                <include>src/test/resources/log4j2.xml</include>
                                 <include>src/test/resources-filtered/conf.xml</include>
+                                <include>src/test/resources/log4j2.xml</include>
                                 <include>src/test/resources/standalone-webapp/WEB-INF/web.xml</include>
                                 <include>src/test/xquery/tail-recursion.xml</include>
                                 <include>src/test/xquery/maps/maps.xqm</include>
@@ -778,8 +778,8 @@
                                 <include>src/test/java/org/exist/Indexer3Test.java</include>
                                 <include>src/test/java/org/exist/IndexerTest.java</include>
                                 <include>src/main/java/org/exist/Namespaces.java</include>
-                                <include>src/test/java/org/exist/TestDataGenerator</include>
                                 <include>src/main/resources-filtered/org/exist/system.properties</include>
+                                <include>src/test/java/org/exist/TestDataGenerator</include>
                                 <include>src/main/java/org/exist/backup/SystemExport.java</include>
                                 <include>src/main/java/org/exist/backup/ZipWriter.java</include>
                                 <include>src/main/java/org/exist/backup/restore/AppRestoreUtils.java</include>
@@ -837,8 +837,8 @@
                                 <include>src/test/java/org/exist/dom/memtree/DOMIndexerTest.java</include>
                                 <include>src/test/java/org/exist/dom/memtree/DOMTest.java</include>
                                 <include>src/main/java/org/exist/dom/memtree/ElementImpl.java</include>
-                                <include>src/test/java/org/exist/dom/memtree/MemtreeInXQueryTest.java</include>
                                 <include>src/main/java/org/exist/dom/memtree/MemTreeBuilder.java</include>
+                                <include>src/test/java/org/exist/dom/memtree/MemtreeInXQueryTest.java</include>
                                 <include>src/main/java/org/exist/dom/memtree/NamespaceNode.java</include>
                                 <include>src/main/java/org/exist/dom/memtree/NodeImpl.java</include>
                                 <include>src/main/java/org/exist/dom/memtree/ProcessingInstructionImpl.java</include>
@@ -850,15 +850,15 @@
                                 <include>src/test/java/org/exist/dom/persistent/DefaultDocumentSetTest.java</include>
                                 <include>src/main/java/org/exist/dom/persistent/DocumentImpl.java</include>
                                 <include>src/main/java/org/exist/dom/persistent/DocumentMetadata.java</include>
-                                <include>src/main/java/org/exist/dom/persistent/DocumentTypeImpl.java</include>
                                 <include>src/main/java/org/exist/dom/persistent/DocumentSet.java</include>
+                                <include>src/main/java/org/exist/dom/persistent/DocumentTypeImpl.java</include>
                                 <include>src/main/java/org/exist/dom/persistent/ElementImpl.java</include>
+                                <include>src/main/java/org/exist/dom/persistent/LockToken.java</include>
                                 <include>src/main/java/org/exist/dom/persistent/Match.java</include>
                                 <include>src/main/java/org/exist/dom/persistent/NewArrayNodeSet.java</include>
                                 <include>src/main/java/org/exist/dom/persistent/NodeProxy.java</include>
                                 <include>src/main/java/org/exist/dom/persistent/NodeSet.java</include>
                                 <include>src/test/java/org/exist/dom/persistent/NodeTest.java</include>
-                                <include>src/main/java/org/exist/dom/persistent/LockToken.java</include>
                                 <include>src/test/java/org/exist/dom/persistent/PersistentDomTest.java</include>
                                 <include>src/main/java/org/exist/dom/persistent/ProcessingInstructionImpl.java</include>
                                 <include>src/main/java/org/exist/dom/persistent/SortedNodeSet.java</include>
@@ -951,8 +951,8 @@
                                 <include>src/test/java/org/exist/storage/NodePathTest.java</include>
                                 <include>src/main/java/org/exist/storage/ProcessMonitor.java</include>
                                 <include>src/test/java/org/exist/storage/RecoverBinary2Test.java</include>
-                                <include>src/test/java/org/exist/storage/RecoveryTest.java</include>
                                 <include>src/test/java/org/exist/storage/Recovery2Test.java</include>
+                                <include>src/test/java/org/exist/storage/RecoveryTest.java</include>
                                 <include>src/test/java/org/exist/storage/RemoveCollectionTest.java</include>
                                 <include>src/main/java/org/exist/storage/StorageAddress.java</include>
                                 <include>src/test/java/org/exist/storage/XIncludeSerializerTest.java</include>
@@ -1119,7 +1119,6 @@
                                 <include>src/test/java/org/exist/xquery/functions/fn/DocTest.java</include>
                                 <include>src/main/java/org/exist/xquery/functions/fn/ExtCollection.java</include>
                                 <include>src/main/java/org/exist/xquery/functions/fn/FnDefaultLanguage.java</include>
-                                <include>src/main/java/org/exist/xquery/functions/fn/FnDefaultLanguage.java</include>
                                 <include>src/main/java/org/exist/xquery/functions/fn/FnFormatDates.java</include>
                                 <include>src/main/java/org/exist/xquery/functions/fn/FnHasChildren.java</include>
                                 <include>src/main/java/org/exist/xquery/functions/fn/FnInnerMost.java</include>
@@ -1162,13 +1161,13 @@
                                 <include>src/main/java/org/exist/xquery/functions/fn/FunGetDurationComponent.java</include>
                                 <include>src/main/java/org/exist/xquery/functions/fn/FunHeadTail.java</include>
                                 <include>src/main/java/org/exist/xquery/functions/fn/FunHigherOrderFun.java</include>
-                                <include>src/main/java/org/exist/xquery/functions/fn/FunIRIToURI.java</include>
                                 <include>src/main/java/org/exist/xquery/functions/fn/FunId.java</include>
                                 <include>src/main/java/org/exist/xquery/functions/fn/FunIdRef.java</include>
                                 <include>src/main/java/org/exist/xquery/functions/fn/FunImplicitTimezone.java</include>
-                                <include>src/main/java/org/exist/xquery/functions/fn/FunInScopePrefixes.java</include>
                                 <include>src/main/java/org/exist/xquery/functions/fn/FunIndexOf.java</include>
+                                <include>src/main/java/org/exist/xquery/functions/fn/FunInScopePrefixes.java</include>
                                 <include>src/main/java/org/exist/xquery/functions/fn/FunInsertBefore.java</include>
+                                <include>src/main/java/org/exist/xquery/functions/fn/FunIRIToURI.java</include>
                                 <include>src/main/java/org/exist/xquery/functions/fn/FunLang.java</include>
                                 <include>src/main/java/org/exist/xquery/functions/fn/FunLast.java</include>
                                 <include>src/main/java/org/exist/xquery/functions/fn/FunLocalName.java</include>
@@ -1182,8 +1181,8 @@
                                 <include>src/main/java/org/exist/xquery/functions/fn/FunNormalizeUnicode.java</include>
                                 <include>src/main/java/org/exist/xquery/functions/fn/FunNot.java</include>
                                 <include>src/main/java/org/exist/xquery/functions/fn/FunNumber.java</include>
-                                <include>src/main/java/org/exist/xquery/functions/fn/FunOnFunctions.java</include>
                                 <include>src/main/java/org/exist/xquery/functions/fn/FunOneOrMore.java</include>
+                                <include>src/main/java/org/exist/xquery/functions/fn/FunOnFunctions.java</include>
                                 <include>src/main/java/org/exist/xquery/functions/fn/FunParseIetfDate.java</include>
                                 <include>src/main/java/org/exist/xquery/functions/fn/FunPath.java</include>
                                 <include>src/main/java/org/exist/xquery/functions/fn/FunPosition.java</include>
@@ -1197,10 +1196,10 @@
                                 <include>src/main/java/org/exist/xquery/functions/fn/FunSerialize.java</include>
                                 <include>src/main/java/org/exist/xquery/functions/fn/FunSort.java</include>
                                 <include>src/main/java/org/exist/xquery/functions/fn/FunStartsWith.java</include>
-                                <include>src/main/java/org/exist/xquery/functions/fn/FunStrLength.java</include>
                                 <include>src/main/java/org/exist/xquery/functions/fn/FunString.java</include>
                                 <include>src/main/java/org/exist/xquery/functions/fn/FunStringJoin.java</include>
                                 <include>src/main/java/org/exist/xquery/functions/fn/FunStringToCodepoints.java</include>
+                                <include>src/main/java/org/exist/xquery/functions/fn/FunStrLength.java</include>
                                 <include>src/main/java/org/exist/xquery/functions/fn/FunSubSequence.java</include>
                                 <include>src/main/java/org/exist/xquery/functions/fn/FunSubstring.java</include>
                                 <include>src/main/java/org/exist/xquery/functions/fn/FunSubstringAfter.java</include>
@@ -1296,14 +1295,14 @@
                                 <include>src/main/java/org/exist/xquery/value/GYearValue.java</include>
                                 <include>src/main/java/org/exist/xquery/value/IntegerValue.java</include>
                                 <include>src/main/java/org/exist/xquery/value/QNameValue.java</include>
+                                <include>src/main/java/org/exist/xquery/value/SequenceType.java</include>
                                 <include>src/main/java/org/exist/xquery/value/StringValue.java</include>
                                 <include>src/test/java/org/exist/xquery/value/TimeTest.java</include>
+                                <include>src/main/java/org/exist/xquery/value/TimeUtils.java</include>
                                 <include>src/main/java/org/exist/xquery/value/TimeValue.java</include>
+                                <include>src/main/java/org/exist/xquery/value/Type.java</include>
                                 <include>src/test/java/org/exist/xquery/value/YearMonthDurationTest.java</include>
                                 <include>src/main/java/org/exist/xquery/value/YearMonthDurationValue.java</include>
-                                <include>src/main/java/org/exist/xquery/value/SequenceType.java</include>
-                                <include>src/main/java/org/exist/xquery/value/TimeUtils.java</include>
-                                <include>src/main/java/org/exist/xquery/value/Type.java</include>
                                 <include>src/main/java/org/exist/xslt/EXistURIResolver.java</include>
                                 <include>src/main/java/org/exist/xslt/XsltURIResolverHelper.java</include>
                                 <include>src/main/java/org/exist/xupdate/Append.java</include>
@@ -1326,11 +1325,11 @@
                             -->
                             <header>${project.parent.relativePath}/existdb-LGPL-21-license.template.txt</header>
                             <excludes>
+                                <exclude>**/README</exclude>
                                 <exclude>ARC-BSD-3-license.template.txt</exclude>
                                 <exclude>BX-BSD-3-license.template.txt</exclude>
                                 <exclude>DBXML-10-license.template.txt</exclude>
                                 <exclude>FDB-backport-BSD-3-license.template.txt</exclude>
-                                <exclude>**/README</exclude>
                                 <exclude>src/test/resources/uk-towns.txt</exclude>
                                 <exclude>src/test/resources/**/*.bin</exclude>
                                 <exclude>src/test/resources/**/*.xar</exclude>
@@ -1338,13 +1337,11 @@
                                 <exclude>src/test/resources/org/exist/validation/entities/**</exclude>
                                 <exclude>src/test/resources/org/exist/xmldb/allowAnyUri.xml</exclude>
 
-                                <!--
-                                    Already under LGPL 2.1, but with a different Copyright
-                                -->
+                                <?license-section start description="Already under LGPL 2.1, but with a different Copyright"?>
                                 <exclude>pom.xml</exclude>
                                 <exclude>project-suppression.xml</exclude>
-                                <exclude>src/test/resources/log4j2.xml</exclude>
                                 <exclude>src/test/resources-filtered/conf.xml</exclude>
+                                <exclude>src/test/resources/log4j2.xml</exclude>
                                 <exclude>src/test/resources/standalone-webapp/WEB-INF/web.xml</exclude>
                                 <exclude>src/test/xquery/binary-value.xqm</exclude>
                                 <exclude>src/test/xquery/pi.xqm</exclude>
@@ -1360,8 +1357,8 @@
                                 <exclude>src/test/java/org/exist/Indexer3Test.java</exclude>
                                 <exclude>src/test/java/org/exist/IndexerTest.java</exclude>
                                 <exclude>src/main/java/org/exist/Namespaces.java</exclude>
-                                <exclude>src/test/java/org/exist/TestDataGenerator</exclude>
                                 <exclude>src/main/resources-filtered/org/exist/system.properties</exclude>
+                                <exclude>src/test/java/org/exist/TestDataGenerator</exclude>
                                 <exclude>src/main/java/org/exist/backup/SystemExport.java</exclude>
                                 <exclude>src/main/java/org/exist/backup/ZipWriter.java</exclude>
                                 <exclude>src/main/java/org/exist/backup/restore/AppRestoreUtils.java</exclude>
@@ -1420,8 +1417,8 @@
                                 <exclude>src/test/java/org/exist/dom/memtree/DOMIndexerTest.java</exclude>
                                 <exclude>src/test/java/org/exist/dom/memtree/DOMTest.java</exclude>
                                 <exclude>src/main/java/org/exist/dom/memtree/ElementImpl.java</exclude>
-                                <exclude>src/test/java/org/exist/dom/memtree/MemtreeInXQueryTest.java</exclude>
                                 <exclude>src/main/java/org/exist/dom/memtree/MemTreeBuilder.java</exclude>
+                                <exclude>src/test/java/org/exist/dom/memtree/MemtreeInXQueryTest.java</exclude>
                                 <exclude>src/main/java/org/exist/dom/memtree/NamespaceNode.java</exclude>
                                 <exclude>src/main/java/org/exist/dom/memtree/NodeImpl.java</exclude>
                                 <exclude>src/main/java/org/exist/dom/memtree/ProcessingInstructionImpl.java</exclude>
@@ -1443,12 +1440,12 @@
                                 <exclude>src/main/java/org/exist/dom/persistent/DocumentSet.java</exclude>
                                 <exclude>src/main/java/org/exist/dom/persistent/DocumentTypeImpl.java</exclude>
                                 <exclude>src/main/java/org/exist/dom/persistent/ElementImpl.java</exclude>
+                                <exclude>src/main/java/org/exist/dom/persistent/LockToken.java</exclude>
                                 <exclude>src/main/java/org/exist/dom/persistent/Match.java</exclude>
                                 <exclude>src/main/java/org/exist/dom/persistent/NewArrayNodeSet.java</exclude>
                                 <exclude>src/main/java/org/exist/dom/persistent/NodeProxy.java</exclude>
                                 <exclude>src/main/java/org/exist/dom/persistent/NodeSet.java</exclude>
                                 <exclude>src/test/java/org/exist/dom/persistent/NodeTest.java</exclude>
-                                <exclude>src/main/java/org/exist/dom/persistent/LockToken.java</exclude>
                                 <exclude>src/test/java/org/exist/dom/persistent/PersistentDomTest.java</exclude>
                                 <exclude>src/main/java/org/exist/dom/persistent/ProcessingInstructionImpl.java</exclude>
                                 <exclude>src/main/java/org/exist/dom/persistent/SortedNodeSet.java</exclude>
@@ -1553,11 +1550,11 @@
                                 <exclude>src/main/java/org/exist/storage/NodePath.java</exclude>
                                 <exclude>src/test/java/org/exist/storage/NodePathTest.java</exclude>
                                 <exclude>src/main/java/org/exist/storage/ProcessMonitor.java</exclude>
-                                <exclude>src/test/java/org/exist/storage/RecoverBinaryTest.java</exclude>
                                 <exclude>src/test/java/org/exist/storage/RecoverBinary2Test.java</exclude>
+                                <exclude>src/test/java/org/exist/storage/RecoverBinaryTest.java</exclude>
                                 <exclude>src/test/java/org/exist/storage/RecoverXmlTest.java</exclude>
-                                <exclude>src/test/java/org/exist/storage/RecoveryTest.java</exclude>
                                 <exclude>src/test/java/org/exist/storage/Recovery2Test.java</exclude>
+                                <exclude>src/test/java/org/exist/storage/RecoveryTest.java</exclude>
                                 <exclude>src/test/java/org/exist/storage/RemoveCollectionTest.java</exclude>
                                 <exclude>src/main/java/org/exist/storage/StorageAddress.java</exclude>
                                 <exclude>src/test/java/org/exist/storage/XIncludeSerializerTest.java</exclude>
@@ -1614,13 +1611,13 @@
                                 <exclude>src/main/java/org/exist/storage/serializers/XIncludeFilter.java</exclude>
                                 <exclude>src/test/resources-filtered/org/exist/storage/statistics/conf.xml</exclude>
                                 <exclude>src/main/java/org/exist/storage/sync/SyncTask.java</exclude>
-                                <exclude>src/test/java/org/exist/storage/util/PauseFunction.java</exclude>
                                 <exclude>src/test/java/org/exist/storage/txn/ConcurrentTransactionsTest.java</exclude>
                                 <exclude>src/test/java/org/exist/storage/txn/CountingTxnListener.java</exclude>
                                 <exclude>src/test/java/org/exist/storage/txn/ReusableTxnTest.java</exclude>
                                 <exclude>src/main/java/org/exist/storage/txn/TransactionManager.java</exclude>
                                 <exclude>src/test/java/org/exist/storage/txn/TransactionManagerTestHelper.java</exclude>
                                 <exclude>src/test/java/org/exist/storage/txn/TxnTest.java</exclude>
+                                <exclude>src/test/java/org/exist/storage/util/PauseFunction.java</exclude>
                                 <exclude>src/main/java/org/exist/test/DiffMatcher.java</exclude>
                                 <exclude>src/main/java/org/exist/test/ExistXmldbEmbeddedServer.java</exclude>
                                 <exclude>src/test/java/org/exist/test/Util.java</exclude>
@@ -1755,7 +1752,6 @@
                                 <exclude>src/test/java/org/exist/xquery/ForwardReferenceTest.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/Function.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/FunctionFactory.java</exclude>
-                                <exclude>src/main/java/org/exist/xquery/LocationStep.java</exclude>
                                 <exclude>src/test/resources-filtered/org/exist/xquery/import-from-pkg-test.conf.xml</exclude>
                                 <exclude>src/test/java/org/exist/xquery/ImportFromPkgTest.java</exclude>
                                 <exclude>src/test/java/org/exist/xquery/ImportModuleTest.java</exclude>
@@ -1794,9 +1790,8 @@
                                 <exclude>src/test/java/org/exist/xquery/XQueryTest.java</exclude>
                                 <exclude>src/test/java/org/exist/xquery/XQueryUpdateTest.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/functions/array/ArrayType.java</exclude>
-                                <exclude>src/main/java/org/exist/xquery/functions/fn/ExtCollection.java</exclude>
                                 <exclude>src/test/java/org/exist/xquery/functions/fn/DocTest.java</exclude>
-                                <exclude>src/main/java/org/exist/xquery/functions/fn/FnDefaultLanguage.java</exclude>
+                                <exclude>src/main/java/org/exist/xquery/functions/fn/ExtCollection.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/functions/fn/FnDefaultLanguage.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/functions/fn/FnFormatDates.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/functions/fn/FnHasChildren.java</exclude>
@@ -1841,13 +1836,13 @@
                                 <exclude>src/main/java/org/exist/xquery/functions/fn/FunGetDurationComponent.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/functions/fn/FunHeadTail.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/functions/fn/FunHigherOrderFun.java</exclude>
-                                <exclude>src/main/java/org/exist/xquery/functions/fn/FunIRIToURI.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/functions/fn/FunId.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/functions/fn/FunIdRef.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/functions/fn/FunImplicitTimezone.java</exclude>
-                                <exclude>src/main/java/org/exist/xquery/functions/fn/FunInScopePrefixes.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/functions/fn/FunIndexOf.java</exclude>
+                                <exclude>src/main/java/org/exist/xquery/functions/fn/FunInScopePrefixes.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/functions/fn/FunInsertBefore.java</exclude>
+                                <exclude>src/main/java/org/exist/xquery/functions/fn/FunIRIToURI.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/functions/fn/FunLang.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/functions/fn/FunLast.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/functions/fn/FunLocalName.java</exclude>
@@ -1861,8 +1856,8 @@
                                 <exclude>src/main/java/org/exist/xquery/functions/fn/FunNormalizeUnicode.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/functions/fn/FunNot.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/functions/fn/FunNumber.java</exclude>
-                                <exclude>src/main/java/org/exist/xquery/functions/fn/FunOnFunctions.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/functions/fn/FunOneOrMore.java</exclude>
+                                <exclude>src/main/java/org/exist/xquery/functions/fn/FunOnFunctions.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/functions/fn/FunParseIetfDate.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/functions/fn/FunPath.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/functions/fn/FunPosition.java</exclude>
@@ -1876,10 +1871,10 @@
                                 <exclude>src/main/java/org/exist/xquery/functions/fn/FunSerialize.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/functions/fn/FunSort.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/functions/fn/FunStartsWith.java</exclude>
-                                <exclude>src/main/java/org/exist/xquery/functions/fn/FunStrLength.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/functions/fn/FunString.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/functions/fn/FunStringJoin.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/functions/fn/FunStringToCodepoints.java</exclude>
+                                <exclude>src/main/java/org/exist/xquery/functions/fn/FunStrLength.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/functions/fn/FunSubSequence.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/functions/fn/FunSubstring.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/functions/fn/FunSubstringAfter.java</exclude>
@@ -2005,8 +2000,8 @@
                                 <exclude>src/test/java/org/exist/xquery/value/SubSequenceRangeTest.java</exclude>
                                 <exclude>src/test/java/org/exist/xquery/value/SubSequenceTest.java</exclude>
                                 <exclude>src/test/java/org/exist/xquery/value/TimeTest.java</exclude>
-                                <exclude>src/main/java/org/exist/xquery/value/TimeValue.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/value/TimeUtils.java</exclude>
+                                <exclude>src/main/java/org/exist/xquery/value/TimeValue.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/value/Type.java</exclude>
                                 <exclude>src/test/java/org/exist/xquery/value/YearMonthDurationTest.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/value/YearMonthDurationValue.java</exclude>
@@ -2023,10 +2018,9 @@
                                 <exclude>src/main/java/org/exist/xupdate/Update.java</exclude>
                                 <exclude>src/main/java/org/exist/xupdate/XUpdateProcessor.java</exclude>
                                 <exclude>src/test/java/org/exist/xupdate/XUpdateTest.java</exclude>
+                                <?license-section end?>
 
-                                <!--
-                                    Derivative work licensed under dbXML 1.0 and LGPL 2.1
-                                -->
+                                <?license-section start description="Derivative work licensed under dbXML 1.0 and LGPL 2.1"?>
                                 <exclude>src/main/java/org/exist/storage/btree/BTree.java</exclude>
                                 <exclude>src/main/java/org/exist/storage/btree/BTreeCallback.java</exclude>
                                 <exclude>src/main/java/org/exist/storage/btree/BTreeException.java</exclude>
@@ -2034,10 +2028,9 @@
                                 <exclude>src/main/java/org/exist/storage/btree/IndexQuery.java</exclude>
                                 <exclude>src/main/java/org/exist/storage/btree/Paged.java</exclude>
                                 <exclude>src/main/java/org/exist/storage/btree/Value.java</exclude>
+                                <?license-section end?>
 
-                                <!--
-                                   Licensed under BSD 3
-                                -->
+                                <?license-section start description="Licensed under BSD 3"?>
                                 <exclude>src/main/java/org/exist/util/CodePointString.java</exclude>
                                 <exclude>src/test/java/org/exist/util/CodePointStringTest.java</exclude>
                                 <exclude>src/main/java/org/exist/util/io/ByteBufferAccessor.java</exclude>
@@ -2051,6 +2044,7 @@
                                 <exclude>src/main/java/org/exist/util/io/MemoryMappedFileFilterInputStreamCache.java</exclude>
                                 <exclude>src/main/java/org/exist/util/io/TemporaryFileManager.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/functions/fn/FnFormatNumbers.java</exclude>
+                                <?license-section end?>
                             </excludes>
                         </licenseSet>
 
@@ -2081,7 +2075,6 @@ The original license statement is also included below.]]></preamble>
                             -->
                             <header>ARC-BSD-3-license.template.txt</header>
                             <includes>
-
                                 <!-- TODO(AR) Consider upstreaming to Apache Commons IO project -->
                                 <include>src/main/java/org/exist/util/io/ByteBufferAccessor.java</include>
                                 <include>src/main/java/org/exist/util/io/ByteBufferInputStream.java</include>
@@ -2465,4 +2458,4 @@ The BaseX Team. The original license statement is also included below.]]></pream
         </profile>
     </profiles>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/exist-distribution/pom.xml b/exist-distribution/pom.xml
index 3fdc218f22..7c5c6551ce 100644
--- a/exist-distribution/pom.xml
+++ b/exist-distribution/pom.xml
@@ -386,7 +386,8 @@
                                 <include>src/main/scripts/create-dmg-mac.sh</include>
                             </includes>
                             <excludes>
-                                <exclude>src/main/config/**</exclude>  <!-- config files in the distribution don't need copyright headers -->
+                                <!-- Config files in the distribution don't need copyright headers -->
+                                <exclude>src/main/config/**</exclude>
                             </excludes>
                         </licenseSet>
                         <licenseSet>
@@ -406,7 +407,8 @@
                                 <include>src/main/xslt/**</include>
                             </includes>
                             <excludes>
-                                <exclude>src/main/config/**</exclude>  <!-- config files in the distribution don't need copyright headers -->
+                                <!-- Config files in the distribution don't need copyright headers -->
+                                <exclude>src/main/config/**</exclude>
                                 <exclude>src/main/xslt/configure_9_3.dtd</exclude>
                                 <exclude>src/main/xslt/javaee_7.xsd</exclude>
                                 <exclude>src/main/xslt/javaee_web_services_client_1_4.xsd</exclude>
@@ -772,13 +774,13 @@
                         </goals>
                         <configuration>
                             <target>
-                                <fileset id="dashboard-fileset" dir="${expath.pkg.dir}" includes="dashboard-*.xar" />
-                                <pathconvert property="dashboard-xar-path" refid="dashboard-fileset" />
+                                <fileset id="dashboard-fileset" dir="${expath.pkg.dir}" includes="dashboard-*.xar"/>
+                                <pathconvert property="dashboard-xar-path" refid="dashboard-fileset"/>
                                 <unzip src="${dashboard-xar-path}" dest="${expath.pkg.dir}-dashboard-staging/">
                                     <patternset>
-                                        <exclude name="resources/images/existdb.png" />
-                                        <exclude name="resources/images/existdb-web.svg" />
-                                        <exclude name="resources/images/x.svg" />
+                                        <exclude name="resources/images/existdb.png"/>
+                                        <exclude name="resources/images/existdb-web.svg"/>
+                                        <exclude name="resources/images/x.svg"/>
                                     </patternset>
                                 </unzip>
                             </target>
@@ -792,14 +794,14 @@
                         </goals>
                         <configuration>
                             <target>
-                                <replace file="${expath.pkg.dir}-dashboard-staging/admin.xql" token="title&gt;existdb-dashboard&lt;" value="title&gt;Dashboard :: Elemental&lt;" />
-                                <replace file="${expath.pkg.dir}-dashboard-staging/build.html" token="title&gt;existdb-dashboard&lt;" value="title&gt;Dashboard :: Elemental&lt;" />
-                                <replace file="${expath.pkg.dir}-dashboard-staging/doc.html" token="title&gt;existdb-dashboard&lt;" value="title&gt;Dashboard :: Elemental&lt;" />
-                                <replace file="${expath.pkg.dir}-dashboard-staging/guest.html" token="title&gt;existdb-dashboard&lt;" value="title&gt;Dashboard :: Elemental&lt;" />
-                                <replace file="${expath.pkg.dir}-dashboard-staging/index.html" token="title&gt;existdb-dashboard&lt;" value="title&gt;Dashboard :: Elemental&lt;" />
-                                <replace file="${expath.pkg.dir}-dashboard-staging/existdb-dashboard.html" token="existdb-web.svg" value="elemental-web.svg" />
-                                <loadfile property="elemental-web-svg" srcFile="${project.build.outputDirectory}/elemental-web.svg" />
-                                <replaceregexp file="${expath.pkg.dir}-dashboard-staging/bower_components/existdb-launcher/existdb-branding.html" match="&lt;svg.+&lt;/svg&gt;" replace="${elemental-web-svg}" />
+                                <replace file="${expath.pkg.dir}-dashboard-staging/admin.xql" token="title&gt;existdb-dashboard&lt;" value="title&gt;Dashboard :: Elemental&lt;"/>
+                                <replace file="${expath.pkg.dir}-dashboard-staging/build.html" token="title&gt;existdb-dashboard&lt;" value="title&gt;Dashboard :: Elemental&lt;"/>
+                                <replace file="${expath.pkg.dir}-dashboard-staging/doc.html" token="title&gt;existdb-dashboard&lt;" value="title&gt;Dashboard :: Elemental&lt;"/>
+                                <replace file="${expath.pkg.dir}-dashboard-staging/guest.html" token="title&gt;existdb-dashboard&lt;" value="title&gt;Dashboard :: Elemental&lt;"/>
+                                <replace file="${expath.pkg.dir}-dashboard-staging/index.html" token="title&gt;existdb-dashboard&lt;" value="title&gt;Dashboard :: Elemental&lt;"/>
+                                <replace file="${expath.pkg.dir}-dashboard-staging/existdb-dashboard.html" token="existdb-web.svg" value="elemental-web.svg"/>
+                                <loadfile property="elemental-web-svg" srcFile="${project.build.outputDirectory}/elemental-web.svg"/>
+                                <replaceregexp file="${expath.pkg.dir}-dashboard-staging/bower_components/existdb-launcher/existdb-branding.html" match="&lt;svg.+&lt;/svg&gt;" replace="${elemental-web-svg}"/>
                             </target>
                         </configuration>
                     </execution>
@@ -811,11 +813,11 @@
                         </goals>
                         <configuration>
                             <target>
-                                <fileset id="dashboard-fileset" dir="${expath.pkg.dir}" includes="dashboard-*.xar" />
-                                <pathconvert property="dashboard-xar-path" refid="dashboard-fileset" />
+                                <fileset id="dashboard-fileset" dir="${expath.pkg.dir}" includes="dashboard-*.xar"/>
+                                <pathconvert property="dashboard-xar-path" refid="dashboard-fileset"/>
                                 <zip destfile="${dashboard-xar-path}">
-                                    <fileset dir="${expath.pkg.dir}-dashboard-staging" />
-                                    <zipfileset dir="${project.build.outputDirectory}" includes="elemental-web.svg" fullpath="resources/images/elemental-web.svg" />
+                                    <fileset dir="${expath.pkg.dir}-dashboard-staging"/>
+                                    <zipfileset dir="${project.build.outputDirectory}" includes="elemental-web.svg" fullpath="resources/images/elemental-web.svg"/>
                                 </zip>
                             </target>
                         </configuration>
@@ -828,13 +830,13 @@
                         </goals>
                         <configuration>
                             <target>
-                                <fileset id="monex-fileset" dir="${expath.pkg.dir}" includes="monex-*.xar" />
-                                <pathconvert property="monex-xar-path" refid="monex-fileset" />
+                                <fileset id="monex-fileset" dir="${expath.pkg.dir}" includes="monex-*.xar"/>
+                                <pathconvert property="monex-xar-path" refid="monex-fileset"/>
                                 <unzip src="${monex-xar-path}" dest="${expath.pkg.dir}-monex-staging/">
                                     <patternset>
-                                        <exclude name="resources/img/exist_icon_16x16.ico" />
-                                        <exclude name="resources/img/existdb-logo.png" />
-                                        <exclude name="resources/img/powered-by-whiteglass.svg" />
+                                        <exclude name="resources/img/exist_icon_16x16.ico"/>
+                                        <exclude name="resources/img/existdb-logo.png"/>
+                                        <exclude name="resources/img/powered-by-whiteglass.svg"/>
                                     </patternset>
                                 </unzip>
                             </target>
@@ -848,17 +850,17 @@
                         </goals>
                         <configuration>
                             <target>
-                                <replace file="${expath.pkg.dir}-monex-staging/console.html" token="eXist once" value="" />
-                                <replace file="${expath.pkg.dir}-monex-staging/login.html" token="exist_icon_16x16.ico" value="elemental-favicon.ico" />
-                                <replace file="${expath.pkg.dir}-monex-staging/login.html" token="existdb-logo.png" value="elemental-web.svg" />
-                                <replace file="${expath.pkg.dir}-monex-staging/profiling.html" token="any eXist interface" value="any interface" />
-                                <replace file="${expath.pkg.dir}-monex-staging/remotes.html" token="eXist's scheduler" value="the scheduler" />
-                                <replace file="${expath.pkg.dir}-monex-staging/remotes.html" token="remote eXist-db instances" value="remote instances" />
-                                <replace file="${expath.pkg.dir}-monex-staging/remotes.html" token="the eXist instance" value="the instance" />
-                                <replace file="${expath.pkg.dir}-monex-staging/remotes.html" token="eXist versions before" value="eXist-db versions before" />
-                                <replace file="${expath.pkg.dir}-monex-staging/templates/page.html" token="exist_icon_16x16.ico" value="elemental-favicon.ico" />
-                                <replace file="${expath.pkg.dir}-monex-staging/templates/page.html" token="existdb-logo.png" value="elemental-web.svg" />
-                                <replace file="${expath.pkg.dir}-monex-staging/templates/page.html" token="powered-by-whiteglass.svg" value="elemental-web.svg" />
+                                <replace file="${expath.pkg.dir}-monex-staging/console.html" token="eXist once" value=""/>
+                                <replace file="${expath.pkg.dir}-monex-staging/login.html" token="exist_icon_16x16.ico" value="elemental-favicon.ico"/>
+                                <replace file="${expath.pkg.dir}-monex-staging/login.html" token="existdb-logo.png" value="elemental-web.svg"/>
+                                <replace file="${expath.pkg.dir}-monex-staging/profiling.html" token="any eXist interface" value="any interface"/>
+                                <replace file="${expath.pkg.dir}-monex-staging/remotes.html" token="eXist's scheduler" value="the scheduler"/>
+                                <replace file="${expath.pkg.dir}-monex-staging/remotes.html" token="remote eXist-db instances" value="remote instances"/>
+                                <replace file="${expath.pkg.dir}-monex-staging/remotes.html" token="the eXist instance" value="the instance"/>
+                                <replace file="${expath.pkg.dir}-monex-staging/remotes.html" token="eXist versions before" value="eXist-db versions before"/>
+                                <replace file="${expath.pkg.dir}-monex-staging/templates/page.html" token="exist_icon_16x16.ico" value="elemental-favicon.ico"/>
+                                <replace file="${expath.pkg.dir}-monex-staging/templates/page.html" token="existdb-logo.png" value="elemental-web.svg"/>
+                                <replace file="${expath.pkg.dir}-monex-staging/templates/page.html" token="powered-by-whiteglass.svg" value="elemental-web.svg"/>
                             </target>
                         </configuration>
                     </execution>
@@ -870,12 +872,12 @@
                         </goals>
                         <configuration>
                             <target>
-                                <fileset id="monex-fileset" dir="${expath.pkg.dir}" includes="monex-*.xar" />
-                                <pathconvert property="monex-xar-path" refid="monex-fileset" />
+                                <fileset id="monex-fileset" dir="${expath.pkg.dir}" includes="monex-*.xar"/>
+                                <pathconvert property="monex-xar-path" refid="monex-fileset"/>
                                 <zip destfile="${monex-xar-path}">
-                                    <fileset dir="${expath.pkg.dir}-monex-staging" />
-                                    <zipfileset dir="${project.build.outputDirectory}" includes="elemental-favicon.ico" fullpath="resources/img/elemental-favicon.ico" />
-                                    <zipfileset dir="${project.build.outputDirectory}" includes="elemental-web.svg" fullpath="resources/img/elemental-web.svg" />
+                                    <fileset dir="${expath.pkg.dir}-monex-staging"/>
+                                    <zipfileset dir="${project.build.outputDirectory}" includes="elemental-favicon.ico" fullpath="resources/img/elemental-favicon.ico"/>
+                                    <zipfileset dir="${project.build.outputDirectory}" includes="elemental-web.svg" fullpath="resources/img/elemental-web.svg"/>
                                 </zip>
                             </target>
                         </configuration>
@@ -921,7 +923,7 @@
                             <goal>copy</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory />  <!-- NOTE: this must be empty -->
+                            <outputDirectory/>  <!-- NOTE: this must be empty -->
                             <resources>
                                 <resource>
                                     <workOnFullPath>true</workOnFullPath>
@@ -980,7 +982,7 @@
                         </goals>
                         <configuration>
                             <assembleDirectory>${assemble.dir}</assembleDirectory>
-                            <programs />
+                            <programs/>
                             <configurationDirectory>etc</configurationDirectory>
                             <copyConfigurationDirectory>true</copyConfigurationDirectory>
                             <logsDirectory>logs</logsDirectory>
@@ -1584,4 +1586,4 @@
         </profile>
     </profiles>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/exist-docker/pom.xml b/exist-docker/pom.xml
index 35c3b5190f..a58ce6445c 100644
--- a/exist-docker/pom.xml
+++ b/exist-docker/pom.xml
@@ -106,11 +106,11 @@
                             -->
                             <header>${project.parent.relativePath}/../elemental-parent/elemental-LGPL-21-ONLY-license.template.txt</header>
                             <excludes>
+                                <exclude>**.md</exclude>
                                 <exclude>pom.xml</exclude>
                                 <exclude>src/assembly/**</exclude>
-                                <exclude>src/main/xslt/**</exclude>
                                 <exclude>src/test/**</exclude>
-                                <exclude>**.md</exclude>
+                                <exclude>src/main/xslt/**</exclude>
                             </excludes>
                         </licenseSet>
 
@@ -248,7 +248,7 @@
                                 </filter>
                             </filters>
                             <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
                                     <addHeader>false</addHeader>
                                 </transformer>
@@ -258,7 +258,7 @@
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                                     <resource>META-INF/mailcap.default</resource>
                                 </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
                             </transformers>
                         </configuration>
                     </execution>
@@ -332,4 +332,4 @@
 
         </plugins>
     </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/exist-installer/pom.xml b/exist-installer/pom.xml
index 953c9c4e76..4dfb1e0ef5 100644
--- a/exist-installer/pom.xml
+++ b/exist-installer/pom.xml
@@ -129,8 +129,8 @@
                                 <include>src/main/izpack/readme.html</include>
                                 <include>src/main/izpack/shortcutSpec.xml</include>
                                 <include>src/main/izpack/start.html</include>
-                                <include>src/main/izpack/userInput.xml</include>
                                 <include>src/main/izpack/UnixShortcutSpec.xml</include>
+                                <include>src/main/izpack/userInput.xml</include>
                             </includes>
                         </licenseSet>
 
@@ -147,8 +147,8 @@
                                 <exclude>src/main/izpack/readme.html</exclude>
                                 <exclude>src/main/izpack/shortcutSpec.xml</exclude>
                                 <exclude>src/main/izpack/start.html</exclude>
-                                <exclude>src/main/izpack/userInput.xml</exclude>
                                 <exclude>src/main/izpack/UnixShortcutSpec.xml</exclude>
+                                <exclude>src/main/izpack/userInput.xml</exclude>
                             </excludes>
                         </licenseSet>
                     </licenseSets>
@@ -322,4 +322,4 @@
         </profile>
     </profiles>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/exist-jetty-config/pom.xml b/exist-jetty-config/pom.xml
index 797c91d591..e714287e1b 100644
--- a/exist-jetty-config/pom.xml
+++ b/exist-jetty-config/pom.xml
@@ -103,9 +103,9 @@
                             </multi>
                             <includes>
                                 <include>pom.xml</include>
-                                <include>src/main/resources/org/exist/jetty/etc/webapps/portal/index.html</include>
-                                <include>src/main/resources/webapp/controller.xq</include>
                                 <include>src/main/resources/webapp/404.html</include>
+                                <include>src/main/resources/webapp/controller.xq</include>
+                                <include>src/main/resources/org/exist/jetty/etc/webapps/portal/index.html</include>
                             </includes>
                         </licenseSet>
 
@@ -125,4 +125,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/exist-parent/pom.xml b/exist-parent/pom.xml
index d03079f7bc..1f6b0bcf58 100644
--- a/exist-parent/pom.xml
+++ b/exist-parent/pom.xml
@@ -586,12 +586,12 @@
                             -->
                             <header>${project.parent.relativePath}/../elemental-parent/elemental-LGPL-21-ONLY-license.template.txt</header>
                             <excludes>
-                                <exclude>**.txt</exclude>
                                 <exclude>**.md</exclude>
-                                <exclude>**LICENSE</exclude>
+                                <exclude>**.txt</exclude>
                                 <exclude>**.xar</exclude>
-                                <exclude>xquery-license-style.xml</exclude>
+                                <exclude>**LICENSE</exclude>
                                 <exclude>pom.xml</exclude>
+                                <exclude>xquery-license-style.xml</exclude>
                             </excludes>
                         </licenseSet>
 
@@ -612,10 +612,10 @@
                                 <include>pom.xml</include>
                             </includes>
                             <excludes>
-                                <exclude>**.txt</exclude>
                                 <exclude>**.md</exclude>
-                                <exclude>**LICENSE</exclude>
+                                <exclude>**.txt</exclude>
                                 <exclude>**.xar</exclude>
+                                <exclude>**LICENSE</exclude>
                                 <exclude>xquery-license-style.xml</exclude>
                             </excludes>
                         </licenseSet>
@@ -626,12 +626,12 @@
                             -->
                             <header>${project.parent.relativePath}/../exist-parent/existdb-LGPL-21-license.template.txt</header>
                             <excludes>
-                                <exclude>**.txt</exclude>
                                 <exclude>**.md</exclude>
-                                <exclude>**LICENSE</exclude>
+                                <exclude>**.txt</exclude>
                                 <exclude>**.xar</exclude>
-                                <exclude>xquery-license-style.xml</exclude>
+                                <exclude>**LICENSE</exclude>
                                 <exclude>pom.xml</exclude>
+                                <exclude>xquery-license-style.xml</exclude>
                             </excludes>
                         </licenseSet>
                     </licenseSets>
@@ -722,4 +722,4 @@
         </snapshotRepository>
     </distributionManagement>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/exist-samples/pom.xml b/exist-samples/pom.xml
index a05d202d5b..f4bf9be34b 100644
--- a/exist-samples/pom.xml
+++ b/exist-samples/pom.xml
@@ -135,11 +135,11 @@
                                 <exclude>src/main/resources/org/exist/samples/shakespeare/shakes.xsl</exclude>
                                 <exclude>src/main/resources/org/exist/samples/validation/dtd/**</exclude>
                                 <exclude>src/main/resources/org/exist/samples/validation/personal/**</exclude>
+                                <exclude>src/main/resources/org/exist/samples/validation/tournament/**</exclude>
                                 <exclude>src/main/resources/org/exist/samples/xinclude/db2html.xsl</exclude>
                                 <exclude>src/main/resources/org/exist/samples/xinclude/xinclude.xml</exclude>
                                 <exclude>src/main/resources/org/exist/samples/xinclude/scripts/syntax/**</exclude>
                                 <exclude>src/main/resources/org/exist/samples/xinclude/styles/**</exclude>
-                                <exclude>src/main/resources/org/exist/samples/validation/tournament/**</exclude>
                             </excludes>
                         </licenseSet>
                     </licenseSets>
@@ -148,4 +148,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/exist-service/pom.xml b/exist-service/pom.xml
index 5ebd04d039..fbd6020264 100644
--- a/exist-service/pom.xml
+++ b/exist-service/pom.xml
@@ -97,8 +97,8 @@
                             <header>${project.parent.relativePath}/../elemental-parent/elemental-LGPL-21-ONLY-license.template.txt</header>
                             <excludes>
                                 <exclude>pom.xml</exclude>
-                                <exclude>src/**</exclude>
                                 <exclude>bin/**</exclude>
+                                <exclude>src/**</exclude>
                             </excludes>
                         </licenseSet>
 
@@ -157,4 +157,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/exist-start/pom.xml b/exist-start/pom.xml
index c4161f8808..f190034808 100644
--- a/exist-start/pom.xml
+++ b/exist-start/pom.xml
@@ -90,8 +90,8 @@
                             -->
                             <header>${project.parent.relativePath}/../elemental-parent/elemental-LGPL-21-ONLY-license.template.txt</header>
                             <excludes>
-                                <exclude>pom.xml</exclude>
                                 <exclude>Mortbay-APACHE-2-license.template.txt</exclude>
+                                <exclude>pom.xml</exclude>
                                 <exclude>src/**</exclude>
                             </excludes>
                         </licenseSet>
@@ -122,8 +122,8 @@
                             -->
                             <header>${project.parent.relativePath}/existdb-LGPL-21-license.template.txt</header>
                             <excludes>
-                                <exclude>pom.xml</exclude>
                                 <exclude>Mortbay-APACHE-2-license.template.txt</exclude>
+                                <exclude>pom.xml</exclude>
                                 <exclude>src/main/java/org/exist/start/Classpath.java</exclude>
                                 <exclude>src/main/java/org/exist/start/CompatibleJavaVersionCheck.java</exclude>
                                 <exclude>src/test/java/org/exist/start/CompatibleJavaVersionCheckTest.java</exclude>
@@ -179,4 +179,4 @@ The original license statement is also included below.]]></preamble>
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/exist-xqts/pom.xml b/exist-xqts/pom.xml
index d4512b45be..3767f16fd1 100644
--- a/exist-xqts/pom.xml
+++ b/exist-xqts/pom.xml
@@ -119,8 +119,8 @@
                             -->
                             <header>${project.parent.relativePath}/../elemental-parent/elemental-LGPL-21-ONLY-license.template.txt</header>
                             <excludes>
-                                <exclude>pom.xml</exclude>
                                 <exclude>existdb-LGPL-21-license.txt</exclude>
+                                <exclude>pom.xml</exclude>
                                 <exclude>src/**</exclude>
                             </excludes>
                         </licenseSet>
@@ -149,8 +149,8 @@
                             -->
                             <header>${project.parent.relativePath}/../exist-parent/existdb-LGPL-21-license.template.txt</header>
                             <excludes>
-                                <exclude>pom.xml</exclude>
                                 <exclude>existdb-LGPL-21-license.txt</exclude>
+                                <exclude>pom.xml</exclude>
                             </excludes>
                         </licenseSet>
                     </licenseSets>
@@ -178,7 +178,7 @@
                         </goals>
                         <configuration>
                             <assembleDirectory>${assemble.dir}</assembleDirectory>
-                            <programs />
+                            <programs/>
                             <configurationDirectory>etc</configurationDirectory>
                             <copyConfigurationDirectory>true</copyConfigurationDirectory>
                             <logsDirectory>logs</logsDirectory>
diff --git a/extensions/contentextraction/pom.xml b/extensions/contentextraction/pom.xml
index 0954b0cdb5..3ac50cde2f 100644
--- a/extensions/contentextraction/pom.xml
+++ b/extensions/contentextraction/pom.xml
@@ -238,4 +238,4 @@
         </plugins>
     </build>
     
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/debuggee/pom.xml b/extensions/debuggee/pom.xml
index 0670d02002..7ac8255441 100644
--- a/extensions/debuggee/pom.xml
+++ b/extensions/debuggee/pom.xml
@@ -46,8 +46,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -153,8 +152,8 @@
                             </multi>
                             <includes>
                                 <include>pom.xml</include>
-                                <include>src/test/resources/log4j2.xml</include>
                                 <include>src/test/resources-filtered/conf.xml</include>
+                                <include>src/test/resources/log4j2.xml</include>
                                 <include>src/test/resources/standalone-webapp/WEB-INF/web.xml</include>
                                 <include>src/main/java/org/exist/debuggee/DebuggeeJointImpl.java</include>
                                 <include>src/test/java/org/exist/debugger/DebuggerTest.java</include>
@@ -168,8 +167,8 @@
                             <header>${project.parent.relativePath}/../exist-parent/existdb-LGPL-21-license.template.txt</header>
                             <excludes>
                                 <exclude>pom.xml</exclude>
-                                <exclude>src/test/resources/log4j2.xml</exclude>
                                 <exclude>src/test/resources-filtered/conf.xml</exclude>
+                                <exclude>src/test/resources/log4j2.xml</exclude>
                                 <exclude>src/test/resources/standalone-webapp/WEB-INF/web.xml</exclude>
                                 <exclude>src/main/java/org/exist/debuggee/DebuggeeJointImpl.java</exclude>
                                 <exclude>src/test/java/org/exist/debugger/DebuggerTest.java</exclude>
@@ -195,4 +194,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/exiftool/pom.xml b/extensions/exiftool/pom.xml
index 4d2476b70a..4a1bf52717 100644
--- a/extensions/exiftool/pom.xml
+++ b/extensions/exiftool/pom.xml
@@ -151,4 +151,4 @@
 
     </dependencies>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/expath/pom.xml b/extensions/expath/pom.xml
index 703ab02d9e..c54c011909 100644
--- a/extensions/expath/pom.xml
+++ b/extensions/expath/pom.xml
@@ -192,4 +192,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/exquery/modules/pom.xml b/extensions/exquery/modules/pom.xml
index c5c5412ca3..958472f528 100644
--- a/extensions/exquery/modules/pom.xml
+++ b/extensions/exquery/modules/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Copyright © 2001, Adam Retter
@@ -131,4 +132,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/exquery/modules/request/pom.xml b/extensions/exquery/modules/request/pom.xml
index e322d95648..afaa914bd7 100644
--- a/extensions/exquery/modules/request/pom.xml
+++ b/extensions/exquery/modules/request/pom.xml
@@ -146,4 +146,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/exquery/pom.xml b/extensions/exquery/pom.xml
index 40467151ab..9cfac61fe3 100644
--- a/extensions/exquery/pom.xml
+++ b/extensions/exquery/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Copyright © 2001, Adam Retter
@@ -127,4 +128,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/exquery/restxq/pom.xml b/extensions/exquery/restxq/pom.xml
index a8f977dcd2..dec719ef30 100644
--- a/extensions/exquery/restxq/pom.xml
+++ b/extensions/exquery/restxq/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Copyright © 2001, Adam Retter
@@ -305,4 +306,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/images/pom.xml b/extensions/images/pom.xml
index 29d77e660a..33783fccc5 100644
--- a/extensions/images/pom.xml
+++ b/extensions/images/pom.xml
@@ -46,8 +46,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -99,4 +98,4 @@
         </repository>
     </repositories>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/indexes/lucene/pom.xml b/extensions/indexes/lucene/pom.xml
index c8e6d68bcc..3e41f836a4 100644
--- a/extensions/indexes/lucene/pom.xml
+++ b/extensions/indexes/lucene/pom.xml
@@ -282,8 +282,8 @@
                                 <exclude>src/main/java/org/exist/indexing/lucene/LuceneFieldConfig.java</exclude>
                                 <exclude>src/main/java/org/exist/indexing/lucene/LuceneIndex.java</exclude>
                                 <exclude>src/main/java/org/exist/indexing/lucene/LuceneIndexConfig.java</exclude>
-                                <exclude>src/main/java/org/exist/indexing/lucene/LuceneIndexWorker.java</exclude>
                                 <exclude>src/test/java/org/exist/indexing/lucene/LuceneIndexTest.java</exclude>
+                                <exclude>src/main/java/org/exist/indexing/lucene/LuceneIndexWorker.java</exclude>
                                 <exclude>src/main/java/org/exist/indexing/lucene/LuceneMatch.java</exclude>
                                 <exclude>src/main/java/org/exist/indexing/lucene/LuceneMatchListener.java</exclude>
                                 <exclude>src/test/java/org/exist/indexing/lucene/LuceneMatchListenerTest.java</exclude>
@@ -338,4 +338,4 @@
         </plugins>
     </build>
     
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/indexes/ngram/pom.xml b/extensions/indexes/ngram/pom.xml
index 6c8098027f..9f5902d361 100644
--- a/extensions/indexes/ngram/pom.xml
+++ b/extensions/indexes/ngram/pom.xml
@@ -172,9 +172,9 @@
                                 <include>src/test/resources-filtered/conf.xml</include>
                                 <include>src/test/resources/log4j2.xml</include>
                                 <include>src/test/java/org/exist/indexing/ngram/CustomIndexTest.java</include>
+                                <include>src/test/java/org/exist/indexing/ngram/MatchListenerTest.java</include>
                                 <include>src/main/java/org/exist/indexing/ngram/NGramIndexWorker.java</include>
                                 <include>src/main/java/org/exist/indexing/ngram/NGramMatch.java</include>
-                                <include>src/test/java/org/exist/indexing/ngram/MatchListenerTest.java</include>
                             </includes>
                         </licenseSet>
 
@@ -188,9 +188,9 @@
                                 <exclude>src/test/resources-filtered/conf.xml</exclude>
                                 <exclude>src/test/resources/log4j2.xml</exclude>
                                 <exclude>src/test/java/org/exist/indexing/ngram/CustomIndexTest.java</exclude>
+                                <exclude>src/test/java/org/exist/indexing/ngram/MatchListenerTest.java</exclude>
                                 <exclude>src/main/java/org/exist/indexing/ngram/NGramIndexWorker.java</exclude>
                                 <exclude>src/main/java/org/exist/indexing/ngram/NGramMatch.java</exclude>
-                                <exclude>src/test/java/org/exist/indexing/ngram/MatchListenerTest.java</exclude>
                             </excludes>
                         </licenseSet>
                     </licenseSets>
@@ -204,4 +204,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/indexes/pom.xml b/extensions/indexes/pom.xml
index 9422784499..9cdd7d9a9a 100644
--- a/extensions/indexes/pom.xml
+++ b/extensions/indexes/pom.xml
@@ -128,4 +128,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/indexes/range/pom.xml b/extensions/indexes/range/pom.xml
index 784c30fbff..6ddf68fa74 100644
--- a/extensions/indexes/range/pom.xml
+++ b/extensions/indexes/range/pom.xml
@@ -248,4 +248,4 @@
 
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/indexes/sort/pom.xml b/extensions/indexes/sort/pom.xml
index 66ec80fde4..f2cb00d5de 100644
--- a/extensions/indexes/sort/pom.xml
+++ b/extensions/indexes/sort/pom.xml
@@ -168,4 +168,4 @@
         </plugins>
     </build>
     
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/indexes/spatial/pom.xml b/extensions/indexes/spatial/pom.xml
index abc5a1fb93..c60f77037e 100644
--- a/extensions/indexes/spatial/pom.xml
+++ b/extensions/indexes/spatial/pom.xml
@@ -190,11 +190,11 @@
                             -->
                             <header>${project.parent.relativePath}/../../elemental-parent/elemental-LGPL-21-ONLY-license.template.txt</header>
                             <excludes>
-                                <exclude>pom.xml</exclude>
-                                <exclude>src/**</exclude>
                                 <exclude>hsql.bat</exclude>
                                 <exclude>hsql.sh</exclude>
                                 <exclude>ivysettings.xml</exclude>
+                                <exclude>pom.xml</exclude>
+                                <exclude>src/**</exclude>
                             </excludes>
                         </licenseSet>
 
@@ -339,4 +339,4 @@
         </repository>
     </repositories>
     
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/modules/cache/pom.xml b/extensions/modules/cache/pom.xml
index 432ea7190b..b479cf1676 100644
--- a/extensions/modules/cache/pom.xml
+++ b/extensions/modules/cache/pom.xml
@@ -149,14 +149,14 @@
                             </multi>
                             <includes>
                                 <include>pom.xml</include>
+                                <include>src/test/resources-filtered/conf.xml</include>
+                                <include>src/test/resources-filtered/lazy-cache-conf.xml</include>
+                                <include>src/test/resources/log4j2.xml</include>
+                                <include>src/test/resources-filtered/non-lazy-cache-conf.xml</include>
                                 <include>src/main/java/org/exist/xquery/modules/cache/CacheFunctions.java</include>
                                 <include>src/main/java/org/exist/xquery/modules/cache/CacheModule.java</include>
                                 <include>src/test/java/org/exist/xquery/modules/cache/LazyCacheTest.java</include>
                                 <include>src/test/java/org/exist/xquery/modules/cache/NonLazyCacheTest.java</include>
-                                <include>src/test/resources-filtered/conf.xml</include>
-                                <include>src/test/resources/log4j2.xml</include>
-                                <include>src/test/resources-filtered/lazy-cache-conf.xml</include>
-                                <include>src/test/resources-filtered/non-lazy-cache-conf.xml</include>
                             </includes>
                         </licenseSet>
 
@@ -167,14 +167,14 @@
                             <header>${project.parent.relativePath}/../../exist-parent/existdb-LGPL-21-license.template.txt</header>
                             <excludes>
                                 <exclude>pom.xml</exclude>
+                                <exclude>src/test/resources-filtered/conf.xml</exclude>
+                                <exclude>src/test/resources-filtered/lazy-cache-conf.xml</exclude>
+                                <exclude>src/test/resources/log4j2.xml</exclude>
+                                <exclude>src/test/resources-filtered/non-lazy-cache-conf.xml</exclude>
                                 <exclude>src/main/java/org/exist/xquery/modules/cache/CacheFunctions.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/modules/cache/CacheModule.java</exclude>
                                 <exclude>src/test/java/org/exist/xquery/modules/cache/LazyCacheTest.java</exclude>
                                 <exclude>src/test/java/org/exist/xquery/modules/cache/NonLazyCacheTest.java</exclude>
-                                <exclude>src/test/resources-filtered/conf.xml</exclude>
-                                <exclude>src/test/resources/log4j2.xml</exclude>
-                                <exclude>src/test/resources-filtered/lazy-cache-conf.xml</exclude>
-                                <exclude>src/test/resources-filtered/non-lazy-cache-conf.xml</exclude>
                             </excludes>
                         </licenseSet>
                     </licenseSets>
@@ -189,4 +189,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/modules/compression/pom.xml b/extensions/modules/compression/pom.xml
index d3981068c5..0eab95204b 100644
--- a/extensions/modules/compression/pom.xml
+++ b/extensions/modules/compression/pom.xml
@@ -139,9 +139,9 @@
                             -->
                             <header>${project.parent.relativePath}/../../elemental-parent/elemental-LGPL-21-ONLY-license.template.txt</header>
                             <excludes>
+                                <exclude>example-*.xql</exclude>
                                 <exclude>pom.xml</exclude>
                                 <exclude>src/**</exclude>
-                                <exclude>example-*.xql</exclude>
                             </excludes>
                         </licenseSet>
 
@@ -169,7 +169,6 @@
                                 <include>src/main/java/org/exist/xquery/modules/compression/EntryFunctions.java</include>
                                 <include>src/main/java/org/exist/xquery/modules/compression/UnTarFunction.java</include>
                                 <include>src/main/java/org/exist/xquery/modules/compression/UnZipFunction.java</include>
-
                             </includes>
                         </licenseSet>
 
@@ -205,4 +204,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/modules/counter/pom.xml b/extensions/modules/counter/pom.xml
index 64215926d3..ca072ba0d0 100644
--- a/extensions/modules/counter/pom.xml
+++ b/extensions/modules/counter/pom.xml
@@ -187,4 +187,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/modules/cqlparser/pom.xml b/extensions/modules/cqlparser/pom.xml
index f068ce93c0..d6764a1950 100644
--- a/extensions/modules/cqlparser/pom.xml
+++ b/extensions/modules/cqlparser/pom.xml
@@ -158,4 +158,4 @@
         </repository>
     </repositories>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/modules/example/pom.xml b/extensions/modules/example/pom.xml
index ac95ce78dc..363a9a5bd3 100644
--- a/extensions/modules/example/pom.xml
+++ b/extensions/modules/example/pom.xml
@@ -96,9 +96,9 @@
                             -->
                             <header>${project.parent.relativePath}/../../elemental-parent/elemental-LGPL-21-ONLY-license.template.txt</header>
                             <excludes>
+                                <exclude>echo.xq</exclude>
                                 <exclude>pom.xml</exclude>
                                 <exclude>src/**</exclude>
-                                <exclude>echo.xq</exclude>
                             </excludes>
                         </licenseSet>
 
@@ -141,4 +141,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/modules/exi/pom.xml b/extensions/modules/exi/pom.xml
index 2897d4ec21..277184eac0 100644
--- a/extensions/modules/exi/pom.xml
+++ b/extensions/modules/exi/pom.xml
@@ -166,4 +166,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/modules/expathrepo/expathrepo-trigger-test/pom.xml b/extensions/modules/expathrepo/expathrepo-trigger-test/pom.xml
index a421122709..8d65d5c4d6 100644
--- a/extensions/modules/expathrepo/expathrepo-trigger-test/pom.xml
+++ b/extensions/modules/expathrepo/expathrepo-trigger-test/pom.xml
@@ -157,8 +157,8 @@
                             <header>${project.parent.relativePath}/../../elemental-parent/elemental-LGPL-21-ONLY-license.template.txt</header>
                             <excludes>
                                 <exclude>pom.xml</exclude>
-                                <exclude>src/**</exclude>
                                 <exclude>xar-assembly.xml</exclude>
+                                <exclude>src/**</exclude>
                             </excludes>
                         </licenseSet>
 
@@ -177,10 +177,10 @@
                             </multi>
                             <includes>
                                 <include>pom.xml</include>
-                                <include>src/main/java/org/exist/repo/ExampleModule.java</include>
+                                <include>xar-assembly.xml</include>
                                 <include>src/test/resources/conf.xml</include>
                                 <include>src/main/xar-resources/controller.xq</include>
-                                <include>xar-assembly.xml</include>
+                                <include>src/main/java/org/exist/repo/ExampleModule.java</include>
                             </includes>
                         </licenseSet>
 
@@ -191,10 +191,10 @@
                             <header>${project.parent.relativePath}/../../exist-parent/existdb-LGPL-21-license.template.txt</header>
                             <excludes>
                                 <exclude>pom.xml</exclude>
-                                <exclude>src/main/java/org/exist/repo/ExampleModule.java</exclude>
+                                <exclude>xar-assembly.xml</exclude>
                                 <exclude>src/test/resources/conf.xml</exclude>
                                 <exclude>src/main/xar-resources/controller.xq</exclude>
-                                <exclude>xar-assembly.xml</exclude>
+                                <exclude>src/main/java/org/exist/repo/ExampleModule.java</exclude>
                             </excludes>
                         </licenseSet>
 
@@ -227,4 +227,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/modules/expathrepo/pom.xml b/extensions/modules/expathrepo/pom.xml
index 2b348db9c5..6204c39c04 100644
--- a/extensions/modules/expathrepo/pom.xml
+++ b/extensions/modules/expathrepo/pom.xml
@@ -142,8 +142,8 @@
                             <header>${project.parent.relativePath}/../../elemental-parent/elemental-LGPL-21-ONLY-license.template.txt</header>
                             <excludes>
                                 <exclude>pom.xml</exclude>
-                                <exclude>src/**</exclude>
                                 <exclude>expathrepo-trigger-test/**</exclude>
+                                <exclude>src/**</exclude>
                             </excludes>
                         </licenseSet>
 
@@ -163,12 +163,12 @@
                             <includes>
                                 <include>pom.xml</include>
                                 <include>src/test/resources-filtered/conf.xml</include>
-                                <include>extensions/modules/expathrepo/src/test/resources/log4j2.xml</include>
+                                <include>src/test/resources/log4j2.xml</include>
+                                <include>src/test/java/org/exist/repo/PackageTriggerTest.java</include>
                                 <include>src/main/java/org/exist/xquery/modules/expathrepo/EXPathErrorCode.java</include>
                                 <include>src/main/java/org/exist/xquery/modules/expathrepo/InstallFunction.java</include>
                                 <include>src/main/java/org/exist/xquery/modules/expathrepo/RemoveFunction.java</include>
                                 <include>src/main/resources/org/exist/xquery/modules/expathrepo/repair.xql</include>
-                                <include>src/test/java/org/exist/repo/PackageTriggerTest.java</include>
                             </includes>
                         </licenseSet>
 
@@ -179,16 +179,15 @@
                             <header>${project.parent.relativePath}/../../exist-parent/existdb-LGPL-21-license.template.txt</header>
                             <excludes>
                                 <exclude>pom.xml</exclude>
+                                <exclude>expathrepo-trigger-test/**</exclude>
                                 <exclude>src/test/resources-filtered/conf.xml</exclude>
-                                <exclude>extensions/modules/expathrepo/src/test/resources/log4j2.xml</exclude>
+                                <exclude>src/test/resources/exist-expathrepo-trigger-test.xar</exclude>
+                                <exclude>src/test/resources/log4j2.xml</exclude>
+                                <exclude>src/test/java/org/exist/repo/PackageTriggerTest.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/modules/expathrepo/EXPathErrorCode.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/modules/expathrepo/InstallFunction.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/modules/expathrepo/RemoveFunction.java</exclude>
                                 <exclude>src/main/resources/org/exist/xquery/modules/expathrepo/repair.xql</exclude>
-                                <exclude>src/test/java/org/exist/repo/PackageTriggerTest.java</exclude>
-                                <exclude>src/test/resources/exist-expathrepo-trigger-test.xar</exclude>
-
-                                <exclude>expathrepo-trigger-test/**</exclude>
                             </excludes>
                         </licenseSet>
 
@@ -222,4 +221,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/modules/expathrepo/src/test/resources/log4j2.xml b/extensions/modules/expathrepo/src/test/resources/log4j2.xml
index dacf8bcbd0..d609ef40e6 100644
--- a/extensions/modules/expathrepo/src/test/resources/log4j2.xml
+++ b/extensions/modules/expathrepo/src/test/resources/log4j2.xml
@@ -1,6 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
+    Elemental
+    Copyright (C) 2024, Evolved Binary Ltd
+
+    admin@evolvedbinary.com
+    https://www.evolvedbinary.com | https://www.elemental.xyz
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; version 2.1.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+    NOTE: Parts of this file contain code from 'The eXist-db Authors'.
+          The original license header is included below.
+
+    =====================================================================
+
     eXist-db Open Source Native XML Database
     Copyright (C) 2001 The eXist-db Authors
 
diff --git a/extensions/modules/file/pom.xml b/extensions/modules/file/pom.xml
index 5f5e5b52c3..22752d226f 100644
--- a/extensions/modules/file/pom.xml
+++ b/extensions/modules/file/pom.xml
@@ -294,4 +294,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/modules/image/pom.xml b/extensions/modules/image/pom.xml
index 60275addb9..7fa36e689c 100644
--- a/extensions/modules/image/pom.xml
+++ b/extensions/modules/image/pom.xml
@@ -150,4 +150,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/modules/jndi/pom.xml b/extensions/modules/jndi/pom.xml
index 99c063f4d5..f160dadafd 100644
--- a/extensions/modules/jndi/pom.xml
+++ b/extensions/modules/jndi/pom.xml
@@ -101,9 +101,9 @@
                             -->
                             <header>${project.parent.relativePath}/../../elemental-parent/elemental-LGPL-21-ONLY-license.template.txt</header>
                             <excludes>
+                                <exclude>jndiExample.xql</exclude>
                                 <exclude>pom.xml</exclude>
                                 <exclude>src/**</exclude>
-                                <exclude>jndiExample.xql</exclude>
                             </excludes>
                         </licenseSet>
 
@@ -148,4 +148,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/modules/mail/pom.xml b/extensions/modules/mail/pom.xml
index 587c387d0e..954331142c 100644
--- a/extensions/modules/mail/pom.xml
+++ b/extensions/modules/mail/pom.xml
@@ -219,8 +219,8 @@
                             </multi>
                             <includes>
                                 <include>pom.xml</include>
-                                <include>src/test/resources/log4j2.xml</include>
                                 <include>src/test/resources-filtered/conf.xml</include>
+                                <include>src/test/resources/log4j2.xml</include>
                                 <include>src/main/java/org/exist/xquery/modules/mail/MailSessionFunctions.java</include>
                                 <include>src/main/java/org/exist/xquery/modules/mail/MessageListFunctions.java</include>
                                 <include>src/main/java/org/exist/xquery/modules/mail/SendEmailFunction.java</include>
@@ -234,8 +234,8 @@
                             <header>${project.parent.relativePath}/../../exist-parent/existdb-LGPL-21-license.template.txt</header>
                             <excludes>
                                 <exclude>pom.xml</exclude>
-                                <exclude>src/test/resources/log4j2.xml</exclude>
                                 <exclude>src/test/resources-filtered/conf.xml</exclude>
+                                <exclude>src/test/resources/log4j2.xml</exclude>
                                 <exclude>src/main/java/org/exist/xquery/modules/mail/MailSessionFunctions.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/modules/mail/MessageListFunctions.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/modules/mail/SendEmailFunction.java</exclude>
@@ -252,8 +252,8 @@
                             <header>${project.parent.relativePath}/../../exist-parent/FDB-backport-LGPL-21-ONLY-license.template.txt</header>
                             <includes>
                                 <include>src/test/java/org/exist/xquery/modules/mail/SendEmailIT.java</include>
-                                <include>src/test/java/org/exist/xquery/modules/mail/WriteMessageTest.java</include>
                                 <include>src/test/java/org/exist/xquery/modules/mail/Util.java</include>
+                                <include>src/test/java/org/exist/xquery/modules/mail/WriteMessageTest.java</include>
                             </includes>
 
                         </licenseSet>
@@ -269,4 +269,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/modules/persistentlogin/pom.xml b/extensions/modules/persistentlogin/pom.xml
index 02a6af1bda..0de8f6c62d 100644
--- a/extensions/modules/persistentlogin/pom.xml
+++ b/extensions/modules/persistentlogin/pom.xml
@@ -251,4 +251,4 @@
 
     </dependencies>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/modules/pom.xml b/extensions/modules/pom.xml
index abdf0b2ad7..da70ea1dde 100644
--- a/extensions/modules/pom.xml
+++ b/extensions/modules/pom.xml
@@ -145,4 +145,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/modules/process/pom.xml b/extensions/modules/process/pom.xml
index ddcd0332ee..49c8af7e99 100644
--- a/extensions/modules/process/pom.xml
+++ b/extensions/modules/process/pom.xml
@@ -145,4 +145,4 @@
 
     </dependencies>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/modules/scheduler/pom.xml b/extensions/modules/scheduler/pom.xml
index 4a296139b4..5f27fdde0e 100644
--- a/extensions/modules/scheduler/pom.xml
+++ b/extensions/modules/scheduler/pom.xml
@@ -147,4 +147,4 @@
 
     </dependencies>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/modules/simpleql/pom.xml b/extensions/modules/simpleql/pom.xml
index aaea7999ff..51680fca11 100644
--- a/extensions/modules/simpleql/pom.xml
+++ b/extensions/modules/simpleql/pom.xml
@@ -160,4 +160,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/modules/sql-oracle/pom.xml b/extensions/modules/sql-oracle/pom.xml
index 35d25893c5..fdfda4b264 100644
--- a/extensions/modules/sql-oracle/pom.xml
+++ b/extensions/modules/sql-oracle/pom.xml
@@ -158,4 +158,4 @@
         </repository>
     </repositories>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/modules/sql/pom.xml b/extensions/modules/sql/pom.xml
index fa2a5a275e..d9407ba20e 100644
--- a/extensions/modules/sql/pom.xml
+++ b/extensions/modules/sql/pom.xml
@@ -194,17 +194,17 @@
                             <excludes>
                                 <exclude>pom.xml</exclude>
                                 <exclude>src/test/resources-filtered/conf.xml</exclude>
+                                <exclude>src/test/resources/jndi.properties</exclude>
                                 <exclude>src/test/resources/log4j2.xml</exclude>
-                                <exclude>src/main/java/org/exist/xquery/modules/sql/ExecuteFunction.java</exclude>
-                                <exclude>src/main/java/org/exist/xquery/modules/sql/GetConnectionFunction.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/modules/sql/CloseConnectionFunction.java</exclude>
-                                <exclude>src/main/java/org/exist/xquery/modules/sql/SQLModule.java</exclude>
-                                <exclude>src/test/resources/jndi.properties</exclude>
                                 <exclude>src/test/java/org/exist/xquery/modules/sql/ConnectionIT.java</exclude>
                                 <exclude>src/test/java/org/exist/xquery/modules/sql/ConnectionPoolIT.java</exclude>
+                                <exclude>src/main/java/org/exist/xquery/modules/sql/ExecuteFunction.java</exclude>
+                                <exclude>src/main/java/org/exist/xquery/modules/sql/GetConnectionFunction.java</exclude>
                                 <exclude>src/test/java/org/exist/xquery/modules/sql/H2DatabaseResource.java</exclude>
                                 <exclude>src/test/java/org/exist/xquery/modules/sql/ImplicitConnectionCloseIT.java</exclude>
                                 <exclude>src/test/java/org/exist/xquery/modules/sql/JndiConnectionIT.java</exclude>
+                                <exclude>src/main/java/org/exist/xquery/modules/sql/SQLModule.java</exclude>
                                 <exclude>src/test/java/org/exist/xquery/modules/sql/Util.java</exclude>
                             </excludes>
                         </licenseSet>
@@ -215,15 +215,15 @@
                             -->
                             <header>${project.parent.relativePath}/../../exist-parent/FDB-backport-LGPL-21-ONLY-license.template.txt</header>
                             <includes>
-                                <include>src/main/java/org/exist/xquery/modules/sql/GetConnectionFunction.java</include>
-                                <include>src/main/java/org/exist/xquery/modules/sql/CloseConnectionFunction.java</include>
-                                <include>src/main/java/org/exist/xquery/modules/sql/SQLModule.java</include>
                                 <include>src/test/resources/jndi.properties</include>
+                                <include>src/main/java/org/exist/xquery/modules/sql/CloseConnectionFunction.java</include>
                                 <include>src/test/java/org/exist/xquery/modules/sql/ConnectionIT.java</include>
                                 <include>src/test/java/org/exist/xquery/modules/sql/ConnectionPoolIT.java</include>
+                                <include>src/main/java/org/exist/xquery/modules/sql/GetConnectionFunction.java</include>
                                 <include>src/test/java/org/exist/xquery/modules/sql/H2DatabaseResource.java</include>
                                 <include>src/test/java/org/exist/xquery/modules/sql/ImplicitConnectionCloseIT.java</include>
                                 <include>src/test/java/org/exist/xquery/modules/sql/JndiConnectionIT.java</include>
+                                <include>src/main/java/org/exist/xquery/modules/sql/SQLModule.java</include>
                                 <include>src/test/java/org/exist/xquery/modules/sql/Util.java</include>
                             </includes>
 
@@ -240,4 +240,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/modules/xmldiff/pom.xml b/extensions/modules/xmldiff/pom.xml
index 5c7de1a487..2c957c6158 100644
--- a/extensions/modules/xmldiff/pom.xml
+++ b/extensions/modules/xmldiff/pom.xml
@@ -162,11 +162,11 @@
                                 <exclude>pom.xml</exclude>
                                 <exclude>src/test/resources-filtered/conf.xml</exclude>
                                 <exclude>src/test/resources/log4j2.xml</exclude>
-                                <exclude>src/main/java/org/exist/xquery/modules/xmldiff/Compare.java</exclude>
-                                <exclude>src/main/java/org/exist/xquery/modules/xmldiff/XmlDiffModule.java</exclude>
-                                <exclude>src/test/java/xquery/modules/xmldiff/XmlDiffTests.java</exclude>
                                 <exclude>src/test/xquery/modules/xmldiff/compare.xqm</exclude>
                                 <exclude>src/test/xquery/modules/xmldiff/diff.xqm</exclude>
+                                <exclude>src/test/java/xquery/modules/xmldiff/XmlDiffTests.java</exclude>
+                                <exclude>src/main/java/org/exist/xquery/modules/xmldiff/Compare.java</exclude>
+                                <exclude>src/main/java/org/exist/xquery/modules/xmldiff/XmlDiffModule.java</exclude>
                             </excludes>
                         </licenseSet>
 
@@ -176,11 +176,11 @@
                             -->
                             <header>${project.parent.relativePath}/../../exist-parent/FDB-backport-LGPL-21-ONLY-license.template.txt</header>
                             <includes>
-                                <include>src/main/java/org/exist/xquery/modules/xmldiff/Compare.java</include>
-                                <include>src/main/java/org/exist/xquery/modules/xmldiff/XmlDiffModule.java</include>
-                                <include>src/test/java/xquery/modules/xmldiff/XmlDiffTests.java</include>
                                 <include>src/test/xquery/modules/xmldiff/compare.xqm</include>
                                 <include>src/test/xquery/modules/xmldiff/diff.xqm</include>
+                                <include>src/test/java/xquery/modules/xmldiff/XmlDiffTests.java</include>
+                                <include>src/main/java/org/exist/xquery/modules/xmldiff/Compare.java</include>
+                                <include>src/main/java/org/exist/xquery/modules/xmldiff/XmlDiffModule.java</include>
                             </includes>
 
                         </licenseSet>
@@ -217,4 +217,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/modules/xslfo/pom.xml b/extensions/modules/xslfo/pom.xml
index 32cf93fef2..ee3488cf35 100644
--- a/extensions/modules/xslfo/pom.xml
+++ b/extensions/modules/xslfo/pom.xml
@@ -251,4 +251,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 41ec757720..754531960d 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -130,10 +130,10 @@
                             <header>${project.parent.relativePath}/../exist-parent/existdb-LGPL-21-license.template.txt</header>
                             <excludes>
                                 <exclude>pom.xml</exclude>
-                                <exclude>src/test/resources-filtered/conf.xml</exclude>
-                                <exclude>src/test/resources/log4j2.xml</exclude>
                                 <exclude>debuggee/**</exclude>
                                 <exclude>images/**</exclude>
+                                <exclude>src/test/resources-filtered/conf.xml</exclude>
+                                <exclude>src/test/resources/log4j2.xml</exclude>
                             </excludes>
                         </licenseSet>
                     </licenseSets>
@@ -142,4 +142,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/security/activedirectory/pom.xml b/extensions/security/activedirectory/pom.xml
index 0df098f286..02ecfba842 100644
--- a/extensions/security/activedirectory/pom.xml
+++ b/extensions/security/activedirectory/pom.xml
@@ -160,4 +160,4 @@
         
     </dependencies>
     
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/security/iprange/pom.xml b/extensions/security/iprange/pom.xml
index 1a6843d4cf..21108b7a34 100644
--- a/extensions/security/iprange/pom.xml
+++ b/extensions/security/iprange/pom.xml
@@ -146,4 +146,4 @@
 
     </dependencies>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/security/ldap/pom.xml b/extensions/security/ldap/pom.xml
index 18a12d878b..068d2f8baa 100644
--- a/extensions/security/ldap/pom.xml
+++ b/extensions/security/ldap/pom.xml
@@ -83,9 +83,9 @@
                             -->
                             <header>${project.parent.relativePath}/../../elemental-parent/elemental-LGPL-21-ONLY-license.template.txt</header>
                             <excludes>
+                                <exclude>ldap-realm.xsd</exclude>
                                 <exclude>pom.xml</exclude>
                                 <exclude>src/**</exclude>
-                                <exclude>ldap-realm.xsd</exclude>
                             </excludes>
                         </licenseSet>
 
@@ -166,4 +166,4 @@
 
     </dependencies>
     
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/security/pom.xml b/extensions/security/pom.xml
index f3ee0229b5..00ab4f045f 100644
--- a/extensions/security/pom.xml
+++ b/extensions/security/pom.xml
@@ -126,4 +126,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/webdav/pom.xml b/extensions/webdav/pom.xml
index 5c6f79a647..06cea3605f 100644
--- a/extensions/webdav/pom.xml
+++ b/extensions/webdav/pom.xml
@@ -211,8 +211,8 @@
                             <header>${project.parent.relativePath}/../elemental-parent/elemental-LGPL-21-ONLY-license.template.txt</header>
                             <excludes>
                                 <exclude>pom.xml</exclude>
-                                <exclude>src/**</exclude>
                                 <exclude>dat/**</exclude>
+                                <exclude>src/**</exclude>
                             </excludes>
                         </licenseSet>
 
@@ -308,4 +308,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/extensions/xqdoc/pom.xml b/extensions/xqdoc/pom.xml
index 997c3bfba6..482725cd4e 100644
--- a/extensions/xqdoc/pom.xml
+++ b/extensions/xqdoc/pom.xml
@@ -145,10 +145,10 @@
                             -->
                             <header>${project.parent.relativePath}/../elemental-parent/elemental-LGPL-21-ONLY-license.template.txt</header>
                             <excludes>
-                                <exclude>pom.xml</exclude>
-                                <exclude>src/**</exclude>
                                 <exclude>ant-example.xml</exclude>
+                                <exclude>pom.xml</exclude>
                                 <exclude>xqdoc-1.0.xsd</exclude>
+                                <exclude>src/**</exclude>
                             </excludes>
                         </licenseSet>
 
@@ -180,10 +180,10 @@
                             <header>${project.parent.relativePath}/../exist-parent/existdb-LGPL-21-license.template.txt</header>
                             <excludes>
                                 <exclude>pom.xml</exclude>
+                                <exclude>xqdoc-1.0.xsd</exclude>
                                 <exclude>src/test/resources-filtered/conf.xml</exclude>
                                 <exclude>src/test/resources/log4j2.xml</exclude>
                                 <exclude>src/main/java/org/exist/xqdoc/xquery/Scan.java</exclude>
-                                <exclude>xqdoc-1.0.xsd</exclude>
                             </excludes>
                         </licenseSet>
 
@@ -193,4 +193,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/format-pom.xslt b/format-pom.xslt
new file mode 100644
index 0000000000..2e8819c43a
--- /dev/null
+++ b/format-pom.xslt
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Elemental
+    Copyright (C) 2024, Evolved Binary Ltd
+
+    admin@evolvedbinary.com
+    https://www.evolvedbinary.com | https://www.elemental.xyz
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; version 2.1.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+-->
+<!--
+    Formats a pom.xml file and makes sure
+    that any license include(s)/exclude(s) are
+    in the correct order.
+-->
+<xsl:stylesheet
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  xmlns:pom="http://maven.apache.org/POM/4.0.0"
+  xmlns:my="my-functions"
+  exclude-result-prefixes="xs pom my"
+  version="2.0">
+
+  <xsl:output method="xml" indent="no" omit-xml-declaration="no" encoding="UTF-8" cdata-section-elements="pom:preamble pom:separator"/>
+  
+  <xsl:template match="comment()[parent::document-node()][1]">
+    <xsl:text>&#xA;</xsl:text>
+    <xsl:copy/>
+    <xsl:text>&#xA;</xsl:text>
+  </xsl:template>
+  
+  <xsl:template match="pom:includes[parent::pom:licenseSet]">
+    <xsl:copy>
+      <xsl:text>&#xA;</xsl:text>
+
+      <xsl:for-each select="comment()[not(preceding-sibling::pom:include)]">
+        <xsl:text>                                </xsl:text>
+        <xsl:copy/>
+        <xsl:text>&#xA;</xsl:text>
+      </xsl:for-each>
+      
+      <xsl:call-template name="process-includes-excludes-children">
+        <xsl:with-param name="current-child" select="child::node()[. instance of element(pom:include) or . instance of processing-instruction(license-section)][1]"/>
+        <xsl:with-param name="accumulator" select="()"/>
+      </xsl:call-template>
+
+      <xsl:for-each select="comment()[not(following-sibling::pom:include)]">
+        <xsl:text>                                </xsl:text>
+        <xsl:copy/>
+        <xsl:text>&#xA;</xsl:text>
+      </xsl:for-each>
+
+      <xsl:text>                            </xsl:text>
+      
+    </xsl:copy>
+  </xsl:template>
+  
+  <xsl:template match="pom:excludes[parent::pom:licenseSet]">
+    <xsl:copy>
+      <xsl:text>&#xA;</xsl:text>
+      
+      <xsl:for-each select="comment()[not(preceding-sibling::pom:exclude)]">
+        <xsl:text>                                </xsl:text>
+        <xsl:copy/>
+        <xsl:text>&#xA;</xsl:text>
+      </xsl:for-each>
+      
+      <xsl:call-template name="process-includes-excludes-children">
+        <xsl:with-param name="current-child" select="child::node()[. instance of element(pom:exclude) or . instance of processing-instruction(license-section)][1]"/>
+        <xsl:with-param name="accumulator" select="()"/>
+      </xsl:call-template>
+      
+      <xsl:for-each select="comment()[not(following-sibling::pom:exclude)]">
+        <xsl:text>                                </xsl:text>
+        <xsl:copy/>
+        <xsl:text>&#xA;</xsl:text>
+      </xsl:for-each>
+      
+      <xsl:text>                            </xsl:text>
+      
+    </xsl:copy>
+  </xsl:template>
+  
+  <xsl:template match="node()|@*">
+    <xsl:copy>
+      <xsl:apply-templates select="node()|@*"/>
+    </xsl:copy>
+  </xsl:template>
+  
+  <xsl:template name="process-includes-excludes-children">
+    <xsl:param name="current-child" as="node()?"/>
+    <xsl:param name="accumulator" as="node()*"/>
+
+    <xsl:choose>
+      <xsl:when test="empty($current-child)">
+        <!-- NOTE(AR) no more children to process -->
+        <xsl:if test="exists($accumulator)">
+          <!-- SECTION-3 -->
+            <xsl:call-template name="sort-includes-excludes">
+              <xsl:with-param name="includes-excludes" select="$accumulator"/>
+            </xsl:call-template>
+          <!-- /SECTION-3 -->
+        </xsl:if>
+      </xsl:when>
+      
+      <xsl:when test="$current-child instance of processing-instruction(license-section)">
+        <xsl:choose>
+          <xsl:when test="starts-with(string($current-child), 'start ') or string($current-child) eq 'end'">
+            <!-- NOTE(AR) entered or exited a license-section PI -->
+            <xsl:if test="exists($accumulator)">
+              <!-- SECTION-1 -->
+                <xsl:call-template name="sort-includes-excludes">
+                  <xsl:with-param name="includes-excludes" select="$accumulator"/>
+                </xsl:call-template>
+              <!-- /SECTION-1 -->
+            </xsl:if>
+            
+            <!-- xsl:copy-of select="$current-child/preceding-sibling::text()[1]"/ -->
+            <xsl:if test="starts-with(string($current-child), 'start ')">
+              <xsl:text>&#xA;</xsl:text>
+            </xsl:if>
+            
+            <xsl:text>                                </xsl:text>
+            <xsl:copy-of select="$current-child"/>
+            <xsl:text>&#xA;</xsl:text>
+            
+            <!-- NOTE(AR) Recursive call for next child -->
+            <xsl:variable name="next-child" as="node()?" select="$current-child/following-sibling::node()[1]"/>
+            <xsl:call-template name="process-includes-excludes-children">
+              <xsl:with-param name="current-child" select="$next-child"/>
+              <xsl:with-param name="accumulator" select="()"/>
+            </xsl:call-template>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:message terminate="yes">Unrecognised license-section PI</xsl:message>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:when>
+
+      <xsl:otherwise>
+        <!-- NOTE(AR) Recursive call for next child, but note that Text and Comment nodes will not be appended to the accumulator -->
+        <xsl:variable name="item" as="node()?" select="if ($current-child instance of text() or $current-child instance of comment()) then () else $current-child"/>
+        <xsl:variable name="next-child" as="node()?" select="$current-child/following-sibling::node()[1]"/>
+        <xsl:call-template name="process-includes-excludes-children">
+          <xsl:with-param name="current-child" select="$next-child"/>
+          <xsl:with-param name="accumulator" select="($accumulator, $item)"/>
+        </xsl:call-template>
+      </xsl:otherwise>
+      
+    </xsl:choose>
+  </xsl:template>
+  
+  <xsl:template name="sort-includes-excludes">
+    <xsl:param name="includes-excludes" as="element()+"/>
+
+    <xsl:for-each-group select="$includes-excludes" group-by="my:package-group-keys(my:key-for-sort(.))">
+      <xsl:sort select="my:package-group-keys(my:key-for-sort(.))"/>
+      
+      <xsl:for-each select="current-group()">
+        <xsl:sort select="my:key-for-sort(.)"/>
+        
+        <xsl:text>                                </xsl:text>
+        <xsl:copy>
+          
+          <!-- NOTE(AR) Useful for debugging sort order issues -->
+          <!--
+          <xsl:attribute name="sort-key" select="my:key-for-sort(.)"/>
+          -->
+          
+          <xsl:apply-templates select="node()|@*"/>
+        </xsl:copy>
+        <xsl:text>&#xA;</xsl:text>
+      </xsl:for-each>
+      
+    </xsl:for-each-group>
+  </xsl:template>
+
+  <xsl:function name="my:key-for-sort" as="xs:string">
+    <xsl:param name="str" as="xs:string"/>
+    <xsl:variable name="str1" select="replace($str, 'src/((test)|(main))/', 'src/ZZ/')"/>
+    <xsl:variable name="str2" select="replace($str1, 'src/ZZ/java/xquery/', 'src/ZZ/xquery/')"/>
+    <xsl:variable name="str3" select="replace($str2, '/resources-filtered/', '/resources/')"/>
+    <xsl:variable name="str4" select="replace($str3, '/((java)|(antlr)|(resources)|(xquery)|(xjb)|(xsd)|(xslt))/org/exist/', '/ZZ/org/exist/')"/>
+    <xsl:variable name="str5" select="replace($str4, '/((java)|(antlr)|(resources)|(xquery)|(xjb)|(xsd)|(xslt))/org/expath/', '/ZZ/org/expath/')"/>
+    <xsl:variable name="str6" select="replace($str5, '/((java)|(antlr)|(resources)|(xquery)|(xjb)|(xsd)|(xslt))/xyz/elemental/', '/ZZ/xyz/elemental/')"/>
+    <xsl:variable name="str7" select="lower-case($str6)"/>
+    <xsl:sequence select="$str7"/>
+  </xsl:function>
+  
+  <xsl:function name="my:package-group-keys" as="xs:string*">
+    <xsl:param name="str" as="xs:string"/>
+    <xsl:variable name="str1" select="replace($str, '^(?:(.+)/)?[^/]+$', '$1')"/>
+    <xsl:variable name="str2" select="tokenize($str1)"/>
+    <xsl:choose>
+      <xsl:when test="empty($str2)">
+        <!-- NOTE(AR) if there is no group key, place it in group '0' -->
+        <xsl:sequence select="'0'"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:sequence select="$str2"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:function>
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index acec2c28e6..2d7d0c61fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,8 +70,10 @@
                             <header>${project.parent.relativePath}/elemental-LGPL-21-ONLY-license.template.txt</header>
                             <includes>
                                 <!-- NOTE(AR) we only check ourself as every other Maven module will be checked separately -->
-                                <include>build.sh</include>
                                 <include>build.bat</include>
+                                <include>build.sh</include>
+                                <include>check-pom-license-uniqueness.xq</include>
+                                <include>format-pom.xslt</include>
                                 <include>pom.xml</include>
                             </includes>
                         </licenseSet>
@@ -127,4 +129,4 @@
 
     </profiles>
 
-</project>
+</project>
\ No newline at end of file