Merge branch 'master' into 941-support-check-origin-for-websocket-to-secure-against-cross-site-attacks

# Conflicts:
#	gradle.properties

Author: oliemansm

commitlint/package-lock.json

@@ -9,8 +9,8 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "@commitlint/cli": "17.5.1",
-    "@commitlint/config-conventional": "17.4.4",
+    "@commitlint/cli": "17.6.3",
+    "@commitlint/config-conventional": "17.6.3",
     "husky": "8.0.3"
   }
 }

commitlint/package.json

@@ -29,18 +29,18 @@ VCS=Git
 SOURCE_COMPATIBILITY=17
 TARGET_COMPATIBILITY=17
 ### Dependencies
-LIB_GRAPHQL_JAVA_VER=20.1
+LIB_GRAPHQL_JAVA_VER=20.2
 LIB_EXTENDED_SCALARS_VER=19.1
-LIB_SPRING_BOOT_VER=3.0.5
+LIB_SPRING_BOOT_VER=3.0.6
 LIB_GRAPHQL_SERVLET_VER=15.1.0-SNAPSHOT
 LIB_GRAPHQL_JAVA_TOOLS_VER=13.0.3
 LIB_GRAPHQL_ANNOTATIONS_VER=9.1
 LIB_REFLECTIONS_VER=0.10.2
 LIB_APACHE_COMMONS_TEXT_VER=1.10.0
 LIB_AWAITILITY_VER=4.2.0
-LIB_JSOUP_VER=1.15.4
+LIB_JSOUP_VER=1.16.1
 ### Plugins
-PLUGIN_JACOCO_VER=0.8.8
+PLUGIN_JACOCO_VER=0.8.10
 PLUGIN_SONARQUBE_VER=4.0.0.2929
 PLUGIN_NEXUS_PUBLISH_VER=1.3.0
 PLUGIN_GOOGLE_JAVA_FORMAT_VER=0.9

gradle.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.jar

@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in