Merge branch 'develop-6.x.x' into pr5680

Author: nverwer

.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.2'
   file-version-suffix:
     description: 'A suffix to append to the version of the download file of Maven Daemon to install'
     required: false
@@ -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/workflows/ci-deploy.yml

@@ -1,11 +1,15 @@
 name: Deploy
-on: [push, pull_request]
+on:
+  push:
+  pull_request:
+  schedule:
+      - cron: "0 6 * * *"
+  workflow_dispatch:
 jobs:
   build:
     name: Build and Test Images
     runs-on: ubuntu-latest
     # NOTE (DP): Publish on develop and master, test on PRs against these
-    # TODO(DP) Reinstate CRONed release builds to update stock apps regularly
     if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/develop-6.x.x' || github.ref == 'refs/heads/master'|| github.base_ref ==  'develop' || github.base_ref ==  'develop-6.x.x' || github.base_ref ==  'master'
     steps:
       - uses: actions/checkout@v4
@@ -46,6 +50,23 @@ jobs:
           sleep 35s
       - name: Run tests
         run: bats --tap exist-docker/src/test/bats/*.bats
+
+      - name: debug logs
+        if: failure()
+        run: docker logs exist-ci | grep 'ERROR'
+
+      - name: Copy logs on failure
+        if: failure()
+        run: |
+          echo "Copying logs..."
+          docker cp exist-ci:/exist/logs/exist.log ./exist.log
+
+      - name: Upload logs artifact
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: exist-core-failed-log
+          path: exist.log
       # NOTE (DP): When on master push release, when on develop push latest: Version is included automatically
       # TODO (DP): Confirm that releases triggered from maven publish images with the non SNAPSHOT version
       - name: Publish latest images

exist-jetty-config/src/main/resources/webapp/WEB-INF/web.xml

@@ -176,6 +176,7 @@
     <servlet>
         <servlet-name>JMXServlet</servlet-name>
         <servlet-class>org.exist.management.client.JMXServlet</servlet-class>
+        <load-on-startup>4</load-on-startup>
     </servlet>
 
     <!--