Merge branch '7.0' of github.com:gchq/stroom into 7.1

Author: stroomdev66

.github/workflows/build_and_release.yml

@@ -116,15 +116,15 @@ jobs:
 #
 #      - name: Upload Test Results
 #        if: always()
-#        uses: actions/upload-artifact@v3
+#        uses: actions/upload-artifact@v4
 #        with:
 #          name: Unit Test Results
 #          path: test-results.tar.gz
 #          retention-days: 5
 
       - name: Upload Test Results
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Unit Test Results
           path: "**/test-results/**/*.xml"
@@ -139,7 +139,7 @@ jobs:
 #
 #      - name: Upload Test Results
 #        if: always()
-#        uses: actions/upload-artifact@v3
+#        uses: actions/upload-artifact@v4
 #        with:
 #          name: Unit Test Results
 #          path: "**/test-results/**/*.xml"