[pull] develop from eXist-db:develop

.gitattributes

@@ -0,0 +1,20 @@
+* text=auto eol=lf
+
+# Windows batch scripts: keep CRLF on checkout so they run on Windows
+*.bat text eol=crlf
+*.cmd text eol=crlf
+
+# Binary files: do not normalize or diff
+*.jar binary
+*.zip binary
+*.png binary
+*.jpg binary
+*.jpeg binary
+*.ico binary
+*.gif binary
+*.exe binary
+*.pdf binary
+*.woff binary
+*.woff2 binary
+*.hprof binary
+*.zst binary

.github/ISSUE_TEMPLATE/bug_report.md

@@ -19,55 +19,74 @@ A clear and concise description of what you expected to happen.
 **To Reproduce**
 > The *best* way is to provide an [SSCCE (Short, Self Contained, Correct (Compilable), Example)](http://sscce.org/). One type of SSCCE could be a small test which reproduces the issue and can be run without dependencies. The [XQSuite - Annotation-based Test Framework for XQuery](http://exist-db.org/exist/apps/doc/xqsuite.xml) makes it very easy for you to create tests. These tests can be executed from the [eXide editor](http://exist-db.org/exist/apps/eXide/index.html) (XQuery - Run as Test)
 
-```Xquery
+```xquery
 xquery version "3.1";
 
 module namespace t="http://exist-db.org/xquery/test";
 
 declare namespace test="http://exist-db.org/xquery/xqsuite";
+declare namespace xmldb="http://exist-db.org/xquery/xmldb";
 
-<!--  replace root with your data -->
+(:~
+ : Replace with minimal data that reproduces your issue.
+ :)
 declare variable $t:XML := document {
 <root/>
 };
 
-<!--  replace index config if needed -->
+(:~
+ : Replace index config if needed for the reported bug.
+ :)
 declare variable $t:xconf :=
     <collection xmlns="http://exist-db.org/collection-config/1.0">
     <index xmlns:xs="http://www.w3.org/2001/XMLSchema">
         <fulltext default="none" attributes="false"/>
     </index>
 </collection>;
 
-<!--  collections and indexes can be configured here  -->
+(:~
+ : Use a unique collection name to avoid collisions with other test runs.
+ : Keep tests self-contained and avoid mutating shared collections.
+ :)
+declare variable $t:COLL := "/db/test-" || translate(string(current-dateTime()), "-:TZ.+", "");
+declare variable $t:CONF_COLL := "/db/system/config/db/" || substring-after($t:COLL, "/db/");
+
+(:~
+ : setUp should be idempotent and safe to run repeatedly.
+ :)
 declare
     %test:setUp
 function t:setup() {
-    let $testCol := xmldb:create-collection("/db", "test")
-    let $indexCol := xmldb:create-collection("/db/system/config/db", "test")
+    let $_ := xmldb:create-collection("/db/system", "config")
+    let $_ := xmldb:create-collection("/db/system/config", "db")
+    let $_ := xmldb:create-collection("/db", substring-after($t:COLL, "/db/"))
+    let $_ := xmldb:create-collection("/db/system/config/db", substring-after($t:COLL, "/db/"))
     return
         (
-            xmldb:store("/db/test", "test.xml", $t:XML),
-            xmldb:store("/db/system/config/db/test", "collection.xconf", $t:xconf),
-            xmldb:reindex("/db/test")
+            xmldb:store($t:COLL, "test.xml", $t:XML),
+            xmldb:store($t:CONF_COLL, "collection.xconf", $t:xconf),
+            xmldb:reindex($t:COLL)
         )
 };
 
+(:~
+ : tearDown should be idempotent: guard removals so partial setup does not fail cleanup.
+ :)
 declare
     %test:tearDown
 function t:tearDown() {
-    xmldb:remove("/db/test"),
-    xmldb:remove("/db/system/config/db/test")
+    if (xmldb:collection-available($t:COLL)) then xmldb:remove($t:COLL) else (),
+    if (xmldb:collection-available($t:CONF_COLL)) then xmldb:remove($t:CONF_COLL) else ()
 };
 
-<-- Adjust to your reported issue -->
+(:~
+ : Adjust this test body to your reported issue.
+ : Prefer exact assertions (assertEquals/assertEqualsPermutation) over broad assertTrue when possible.
+ :)
 declare
-    %test:assertTrue
+    %test:assertEquals(1)
 function t:test() {
-    let $test-data := collection('/db/test')
-    for $result in $test-data//root
-    return
-       count($result) eq 1
+    count(collection($t:COLL)//root)
 };
 ```
 
@@ -83,9 +102,9 @@ If applicable, add screenshots to help explain your problem.
 **Context (please always complete the following information)**
 One option is to use [xst](https://www.npmjs.com/package/@existdb/xst), and copy and paste the output produced by running `xst info` here:**
 
- - Build: [eXist-6.1.0]
- - Java: [1.8.0_352]
- - OS: [Mac OS X 12.6.2]
+ - Build: [eXist-6.4.1]
+ - Java: [11.0.30+7]
+ - OS: [Mac OS X 26.3.1]
 
 **Additional context**
 - How is eXist-db installed? [e.g. JAR installer, DMG, … ]

.github/actions/install-mvnd/action.yml

@@ -4,7 +4,7 @@ inputs:
   version:
     description: 'The version of the Maven Daemon to install'
     required: true
-    default: '0.9.0'
+    default: '1.0.6'
   file-version-suffix:
     description: 'A suffix to append to the version of the download file of Maven Daemon to install'
     required: false
@@ -48,7 +48,7 @@ runs:
     - name: Cache mvnd
       if: inputs.cache == 'true'
       id: cache-mvnd
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: |
           ${{ inputs.install-path }}/${{ env.MVND_NAME }}.zip
@@ -61,11 +61,14 @@ runs:
       run: |
         curl -fsSL -o ${{ inputs.install-path }}/${{ env.MVND_NAME }}.zip https://archive.apache.org/dist/maven/mvnd/${{ inputs.version }}/${{ env.MVND_NAME }}.zip
         curl -fsSL -o ${{ inputs.install-path }}/${{ env.MVND_NAME }}.zip.sha256 https://archive.apache.org/dist/maven/mvnd/${{ inputs.version }}/${{ env.MVND_NAME }}.zip.sha256
-    - name: Install sha256sum (macOS)
-      if: ${{ runner.os == 'macOS' }}
-      shell: bash
-      run: brew install coreutils
+    # see #5842
+    # brew install mvndaemon/homebrew-mvnd/mvnd@1
+    # - name: Install coreutils (macOS)
+    #   if: ${{ runner.os == 'macOS' }}
+    #   shell: bash
+    #   run: brew install coreutils
     - name: Verify mvnd sha256 checksum
+      if: ${{ runner.os != 'macOS' }}
       shell: bash
       run: echo "$(cat ${{ inputs.install-path }}/${{ env.MVND_NAME }}.zip.sha256) ${{ inputs.install-path }}/${{ env.MVND_NAME }}.zip" | sha256sum --check
     - name: Unzip mvnd

.github/actions/maven-cache/action.yml

@@ -0,0 +1,21 @@
+# Shared Maven cache: restore only. Caller adds a separate Save step at end of job when appropriate (see plans/caching.md).
+name: Maven cache
+description: Restore Maven repository cache (one cache per branch, PRs read-only). Add actions/cache/save at end of job for the single job that should persist.
+inputs:
+  java-version:
+    description: 'Java version for cache key (e.g. matrix.java-version); omit for jobs with single JDK'
+    required: false
+    default: ''
+runs:
+  using: 'composite'
+  steps:
+    - name: Restore Maven cache
+      uses: actions/cache/restore@v5
+      with:
+        path: ~/.m2
+        key: maven-${{ github.event.pull_request.base.ref || github.ref_name }}-${{ inputs.java-version && format('java{0}-', inputs.java-version) || '' }}${{ hashFiles('**/pom.xml') }}
+        enableCrossOsArchive: true
+        restore-keys: |
+          maven-${{ github.event.pull_request.base.ref || github.ref_name }}-${{ inputs.java-version && format('java{0}-', inputs.java-version) || '' }}
+          maven-${{ github.event.pull_request.base.ref || github.ref_name }}-
+          maven-

.github/actions/maven-github-settings/action.yml

@@ -0,0 +1,61 @@
+# Creates Maven settings.xml with auth for the eXist-db org's GitHub Packages repos
+# and optionally for Sonatype Central Portal publishing.
+# Required for resolving artifacts from maven.pkg.github.com/eXist-db/{exist, exist-xqts-runner, jackrabbit-webdav-jakarta}.
+name: Maven GitHub Packages settings
+description: Create settings.xml with GitHub Packages and (optionally) Sonatype Central Portal servers
+inputs:
+  token:
+    description: 'GitHub token for package authentication'
+    required: true
+  central-token-username:
+    description: 'Sonatype Central Portal user token username (release jobs only)'
+    required: false
+    default: ''
+  central-token-password:
+    description: 'Sonatype Central Portal user token password (release jobs only)'
+    required: false
+    default: ''
+runs:
+  using: 'composite'
+  steps:
+    - name: Create Maven settings for GitHub Packages
+      shell: bash
+      env:
+        CENTRAL_TOKEN_USERNAME: ${{ inputs.central-token-username }}
+        CENTRAL_TOKEN_PASSWORD: ${{ inputs.central-token-password }}
+      run: |
+        mkdir -p ~/.m2
+        OWNER=$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')
+
+        # Build optional Central Portal server block
+        CENTRAL_SERVER=""
+        if [ -n "$CENTRAL_TOKEN_USERNAME" ]; then
+          CENTRAL_SERVER="
+            <server>
+              <id>central</id>
+              <username>${CENTRAL_TOKEN_USERNAME}</username>
+              <password>${CENTRAL_TOKEN_PASSWORD}</password>
+            </server>"
+        fi
+
+        cat > ~/.m2/settings.xml << EOF
+        <settings xmlns="http://maven.apache.org/SETTINGS/1.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.2.0 https://maven.apache.org/xsd/settings-1.2.0.xsd">
+          <servers>
+            <server>
+              <id>github</id>
+              <username>${OWNER}</username>
+              <password>${{ inputs.token }}</password>
+            </server>
+            <server>
+              <id>github-xqts-runner</id>
+              <username>${OWNER}</username>
+              <password>${{ inputs.token }}</password>
+            </server>
+            <server>
+              <id>github-jackrabbit-webdav-jakarta</id>
+              <username>${OWNER}</username>
+              <password>${{ inputs.token }}</password>
+            </server>${CENTRAL_SERVER}
+          </servers>
+        </settings>
+        EOF

.github/dependabot.yml

@@ -4,35 +4,120 @@ updates:
   directory: "/"
   schedule:
     interval: "weekly"
+  groups:
+    actions:
+      patterns:
+      - "*"
+
 - package-ecosystem: "maven"
   directory: "/"
   schedule:
     interval: "daily"
     time: "03:00"
   open-pull-requests-limit: 10
-  ignore:
-  - dependency-name: org.apache.lucene:lucene-analyzers-common
-    versions:
-    - ">= 8.a, < 9"
-  - dependency-name: org.apache.lucene:lucene-analyzers-icu
-    versions:
-    - ">= 8.a, < 9"
-  - dependency-name: org.apache.lucene:lucene-core
-    versions:
-    - ">= 8.a, < 9"
-  - dependency-name: org.apache.lucene:lucene-facet
-    versions:
-    - ">= 8.a, < 9"
-  - dependency-name: org.apache.lucene:lucene-queries
-    versions:
-    - ">= 8.a, < 9"
-  - dependency-name: org.apache.lucene:lucene-queryparser
-    versions:
-    - ">= 8.a, < 9"
-  - dependency-name: com.ibm.icu:icu4j
-    versions:
-    - "69.1"
-  - dependency-name: com.mycila:license-maven-plugin
-    versions:
-    - "4.0"
-    - "4.0.rc2"
+  groups:
+    # Major bumps stay separate for QA; patch/minor trains bundle here.
+    jetty:
+      patterns:
+      - "org.eclipse.jetty:*"
+      - "org.eclipse.jetty.websocket:*"
+      update-types:
+      - patch
+      - minor
+    lucene:
+      patterns:
+      - "org.apache.lucene:*"
+      update-types:
+      - patch
+      - minor
+    logging:
+      patterns:
+      - "org.apache.logging.log4j:*"
+      - "org.slf4j:*"
+      update-types:
+      - patch
+      - minor
+    junit-jupiter-bom:
+      patterns:
+      - "org.junit:junit-bom"
+      - "org.junit.jupiter:*"
+      - "org.junit.platform:*"
+      - "org.junit.vintage:*"
+      update-types:
+      - patch
+      - minor
+    junit4-test-support:
+      patterns:
+      - "junit:junit"
+      - "org.hamcrest:*"
+      - "org.assertj:*"
+      - "org.easymock:*"
+      - "org.objenesis:*"
+      - "org.awaitility:*"
+      - "com.googlecode.junit-toolbox:*"
+      - "org.xmlunit:*"
+      update-types:
+      - patch
+      - minor
+    httpcomponents:
+      patterns:
+      - "org.apache.httpcomponents:*"
+      update-types:
+      - patch
+      - minor
+    jaxb-angus:
+      patterns:
+      - "jakarta.xml.bind:*"
+      - "org.glassfish.jaxb:*"
+      - "org.eclipse.angus:*"
+      update-types:
+      - patch
+      - minor
+    apache-commons:
+      patterns:
+      - "commons-codec:*"
+      - "commons-io:*"
+      - "org.apache.commons:*"
+      update-types:
+      - patch
+      - minor
+    jackson:
+      patterns:
+      - "com.fasterxml.jackson.core:*"
+      update-types:
+      - patch
+      - minor
+    jline:
+      patterns:
+      - "org.jline:*"
+      update-types:
+      - patch
+      - minor
+    exificient:
+      patterns:
+      - "com.siemens.ct.exi:*"
+      update-types:
+      - patch
+      - minor
+    exquery:
+      patterns:
+      - "org.exquery:*"
+      update-types:
+      - patch
+      - minor
+    maven-plugins-apache:
+      patterns:
+      - "org.apache.maven.plugins:*"
+      update-types:
+      - patch
+      - minor
+    maven-plugins-tools:
+      patterns:
+      - "org.codehaus.mojo:*"
+      - "org.jacoco:*"
+      - "org.owasp:*"
+      - "io.github.git-commit-id:*"
+      - "software.xdev:*"
+      update-types:
+      - patch
+      - minor