Merge branch 'master' of github.com:gchq/stroom

Author: stroomdev66

.github/workflows/codeql-analysis.yml

@@ -36,7 +36,7 @@ jobs:
       with:
         distribution: 'temurin' # See 'Supported distributions' for available options
         #distribution: 'zulu' # See 'Supported distributions' for available options
-        java-version: '17'
+        java-version: '21'
 
     - name: Checkout repository
       uses: actions/checkout@v2

.github/workflows/scripts/create_github_release.sh

@@ -49,18 +49,14 @@ main() {
 
   setup_echo_colours
 
-  # Use Github's hub CLI to create our release
-  # See https://github.com/github/hub
   echo -e "${GREEN}Finding asset files for release${NC}"
-  local args=()
+  local asset_files=()
   for asset_file in "${BUILD_DIR}/release_artefacts/"*; do
     echo -e "${GREEN}Found asset file: ${BLUE}${asset_file}${NC}"
-    args+=(
-      "--attach"
-      "${asset_file}"
-    )
+    asset_files+=("${asset_file}")
   done
 
+  local args=()
   if [[ ${GITHUB_REF} =~ .*(beta|alpha).* ]]; then
     echo -e "${GREEN}Release is a pre-release${NC}"
     args+=("--prerelease")
@@ -81,13 +77,18 @@ main() {
   echo -e "${DGREY}${message}${NC}"
   echo -e "${DGREY}------------------------------------------------------------------------${NC}"
 
-  # Extract the subject/body from the annotated git tag
-  hub release create \
-    -m "${message}" \
+
+  # Create the release on GitHub using the annotated tag that triggered
+  # this build
+  # See https://cli.github.com/manual/gh_release_create
+  gh release create \
+    --title "${BUILD_TAG}" \
+    --notes "${message}" \
+    --verify-tag \
     "${args[@]}" \
-    "${BUILD_TAG}"
+    "${BUILD_TAG}" \
+    "${asset_files[@]}"
 
-  #hub release create "${args[@]}" "$BUILD_TAG"
   echo "${GREEN}Release created for tag ${BLUE}${BUILD_TAG}${NC}"
 }
 

.idea/runConfigurations/Stroom_Create_Admin_Identity_Account.xml

@@ -1,4 +1,4 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=17.0.1-tem
+java=21.0.2-tem
 

.idea/runConfigurations/Stroom_Create_Admin_Permissions.xml

@@ -0,0 +1,11 @@
+# Breaking Change Log
+
+All breaking changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/)
+and this project adheres to [Semantic Versioning](http://semver.org/).
+
+
+## [v7.2]
+
+* Quoted strings in dashboard table expressions can now be expressed with single and double quotes. As part of this change apostrophes in text are no longer escaped with `''` but instead require a leading `\` before them if they are in a single quoted string. In many cases it is preferable to use double quotes if the string in question has an apostrophe. Note that the use of `\` as an escape character also means that any existing `\` characters will need to be escaped with a preceding `\` so `\` must now become `\\`.