Merge remote-tracking branch 'origin/6.3.0-branch' into JB-current

Author: Nico Verwer

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

@@ -48,7 +48,7 @@ runs:
     - name: Cache mvnd
       if: inputs.cache == 'true'
       id: cache-mvnd
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: |
           ${{ inputs.install-path }}/${{ env.MVND_NAME }}.zip

.github/workflows/ci-deploy.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Set up JDK 8
         uses: actions/setup-java@v4
         with:
-          distribution: temurin
+          distribution: liberica
           java-version: '8'
       - name: Make buildkit default
         uses: docker/setup-buildx-action@v3

.github/workflows/ci-test.yml

@@ -3,7 +3,7 @@ on: [push, pull_request]
 permissions:
   contents: read
 env:
-  MAVEN_OPTS: -XX:StartFlightRecording=maxsize=5g,disk=true,dumponexit=true,settings=default,filename=./ -DtrimStackTrace=false -D'maven.resolver.transport=wagon'
+  MAVEN_OPTS: -DtrimStackTrace=false -D'maven.resolver.transport=wagon'
   DEV_JDK: '8'
 jobs:
   license:
@@ -13,19 +13,20 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          distribution: temurin
+          distribution: liberica
           java-version: ${{ env.DEV_JDK }}
           cache: 'maven'
       - run: mvn -V -B license:check
         timeout-minutes: 60
   dependencies:
     name: Dependency checks
+    if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/develop' }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          distribution: temurin
+          distribution: liberica
           java-version: ${{ env.DEV_JDK }}
           cache: 'maven'
       - name: OWASP dependency check
@@ -40,26 +41,20 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
         jvm: ['8']
-        exclude:
-          - os: macOS-latest
-            jvm: '8'
-        include:
-          - os: macOS-latest
-            jvm: '11'
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          distribution: temurin
+          distribution: liberica
           java-version: ${{ matrix.jvm }}
           cache: 'maven'
       - name: Install Maven Daemon
         id: install-mvnd
         uses: ./.github/actions/install-mvnd
         with:
-          version: '1.0.1'
+          version: '1.0.2'
           file-version-suffix: ''
           cache: 'true'
       - name: Maven Build
@@ -72,7 +67,7 @@ jobs:
         if: ${{ matrix.os == 'ubuntu-latest' }}
         run: ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd -V -B -q -T 1C install javadoc:javadoc -DskipTests -D'dependency-check.skip' -D'license.skip' --projects '!exist-distribution,!exist-installer' --also-make
       - name: Maven Code Coverage (Develop branch on Linux only)
-        if: ${{ github.ref == 'refs/heads/develop' && matrix.os == 'ubuntu-latest' }}
+        if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/develop' && matrix.os == 'ubuntu-latest' }}
         env:
           CI_NAME: github
           BRANCH_NAME_OR_REF: ${{ github.head_ref || github.ref }}
@@ -87,6 +82,5 @@ jobs:
           name: ${{ runner.os }}-build-logs
           retention-days: 5
           path: |
-            **/*.jfr
             **/hs_err_pid*.log
             **/target/surefire-reports/*

.github/workflows/ci-xqts.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Set up JDK 8
         uses: actions/setup-java@v4
         with:
-          distribution: temurin
+          distribution: liberica
           java-version: '8'
       - name: Cache Maven packages
         uses: actions/cache@v4

exist-ant/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.exist-db</groupId>
         <artifactId>exist-parent</artifactId>
-        <version>6.3.0-SNAPSHOT</version>
+        <version>6.4.0-SNAPSHOT</version>
         <relativePath>../exist-parent</relativePath>
     </parent>
 

exist-core/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.exist-db</groupId>
         <artifactId>exist-parent</artifactId>
-        <version>6.3.0-SNAPSHOT</version>
+        <version>6.4.0-SNAPSHOT</version>
         <relativePath>../exist-parent</relativePath>
     </parent>
 
@@ -1103,7 +1103,7 @@ The BaseX Team. The original license statement is also included below.]]></pream
                     </dependency>
                 </dependencies>
                 <configuration>
-                    <argLine>@{jacocoArgLine} -Dfile.encoding=${project.build.sourceEncoding}</argLine>
+                    <argLine>@{jacocoArgLine} -Dfile.encoding=${project.build.sourceEncoding} -Dexist.recovery.progressbar.hide=true</argLine>
                     <systemPropertyVariables>
                         <jetty.home>${project.basedir}/../exist-jetty-config/target/classes/org/exist/jetty</jetty.home>
                         <exist.configurationFile>${project.build.testOutputDirectory}/conf.xml</exist.configurationFile>
@@ -1139,18 +1139,17 @@ The BaseX Team. The original license statement is also included below.]]></pream
     <profiles>
         <profile>
             <!--
-            Disable parallel tests on Windows.
-            When running multiple tests in parallel, Quartz seems to stop eXist-db from shutting down
-            on AppVeyor Windows CI, see: https://github.com/quartz-scheduler/quartz/issues/448
+            Disable parallel tests on Windows in CI, seems to cause an occasional issue with
+            Surefire that produces the Maven error: 'Corrupted channel by directly writing to native stream in forked JVM'.
             -->
-            <id>windows-disable-parallel-testing</id>
+            <id>windows-disable-parallel-ci-testing</id>
             <activation>
                 <os>
                     <family>windows</family>
                 </os>
                 <property>
-                    <name>env.APPVEYOR</name>
-                    <value>True</value>
+                    <name>env.GITHUB_ACTIONS</name>
+                    <value>true</value>
                 </property>
             </activation>
             <build>
@@ -1179,16 +1178,16 @@ The BaseX Team. The original license statement is also included below.]]></pream
                             <forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory" />
                             <forkCount>1C</forkCount>
                             <reuseForks>false</reuseForks>
-                            <argLine>-Dfile.encoding=${project.build.sourceEncoding}</argLine>
+                            <argLine>-Dfile.encoding=${project.build.sourceEncoding} -Dexist.recovery.progressbar.hide=true</argLine>
                             <systemPropertyVariables>
                                 <jetty.home>${project.basedir}/../exist-jetty-config/target/classes/org/exist/jetty</jetty.home>
                                 <exist.configurationFile>${project.build.testOutputDirectory}/conf.xml</exist.configurationFile>
                                 <exist.jetty.standalone.webapp.dir>${project.build.testOutputDirectory}/standalone-webapp</exist.jetty.standalone.webapp.dir>
                                 <log4j.configurationFile>${project.build.testOutputDirectory}/log4j2.xml</log4j.configurationFile>
                             </systemPropertyVariables>
                             <excludes>
-                                <!-- NOTE: this test fails on AppVeyor Windows CI with Oracle JDK 11,
-                                 but not on some other windows systems :-/ -->
+                                <!-- NOTE: this test occasionally fails on Windows CI
+                                 but not on some other Windows systems :-/ -->
                                 <exclude>org.exist.storage.lock.CollectionLocksTest</exclude>
 
                                 <!-- NOTE: these can still exhibit deadlocks -->

exist-core/src/main/java/org/exist/collections/triggers/XQueryTrigger.java

@@ -411,6 +411,7 @@ private void execute(final TriggerPhase phase, final TriggerEvent event, final D
 			compiledQuery = getScript(broker, transaction);
 			if (compiledQuery == null) {
 				// NOTE: can occur if there is no such XQueryTrigger library module available in the database
+				TriggerStatePerThread.clearIfFinished(phase);
 				return;
 			}
 		} catch (final TriggerException e) {
@@ -451,6 +452,7 @@ private void execute(final TriggerPhase phase, final TriggerEvent event, final D
 					if (LOG.isDebugEnabled()) {
 						LOG.debug("No such function '" + functionName + "' in XQueryTrigger: " + compiledQuery.getSource());
 					}
+					TriggerStatePerThread.clearIfFinished(phase);
 					return;
 				}
 			}

exist-core/src/main/java/org/exist/plugin/PluginsManagerImpl.java

@@ -241,7 +241,7 @@ public void addPlugin(final String className) {
                 // NOTE: must set interrupted flag
                 Thread.currentThread().interrupt();
             }
-            LOG.error(e);
+            LOG.warn(e);
 		}
 	}
 

exist-core/src/main/java/org/exist/storage/NativeBroker.java

@@ -3033,8 +3033,7 @@ public Object start() {
                 }
             }.run();
             // create a copy of the old doc to copy the nodes into it
-            final DocumentImpl tempDoc = new DocumentImpl(null, null, doc.getCollection(), doc.getDocId(), doc.getFileURI());
-            tempDoc.copyOf(this, doc, doc);
+            final DocumentImpl tempDoc = new DocumentImpl(null, pool, doc.getCollection(), doc.getDocId(), doc.getFileURI());
             final StreamListener listener = getIndexController().getStreamListener(doc, ReindexMode.STORE);
             // copy the nodes
             final NodeList nodes = doc.getChildNodes();
@@ -3067,7 +3066,7 @@ public Object start() {
             if (LOG.isDebugEnabled()) {
                 LOG.debug("Defragmentation took {} ms.", (System.currentTimeMillis() - start));
             }
-        } catch(final PermissionDeniedException | IOException e) {
+        } catch(IOException e) {
             LOG.error(e);
         }
     }

exist-core/src/main/java/org/exist/storage/ValueIndexFactory.java

@@ -127,7 +127,6 @@ public final static byte[] serialize(final Indexable value, final int offset) th
         return serialize(value, offset, true);
     }
 
-    // TODO(AR) switch implementation to various serialize methods in the AtomicValues (requires major version bump)
     public final static byte[] serialize(final Indexable value, final int offset, final boolean caseSensitive) throws EXistException {
         /* xs:string */
         if (Type.subTypeOf(value.getType(), Type.STRING)) {