Merge branch 'master' into feature/update-jdk-17

# Conflicts:
#	gradle.properties

Author: oliemansm

commitlint/package-lock.json

@@ -9,8 +9,8 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "@commitlint/cli": "17.0.3",
-    "@commitlint/config-conventional": "17.0.3",
-    "husky": "8.0.1"
+    "@commitlint/cli": "17.3.0",
+    "@commitlint/config-conventional": "17.3.0",
+    "husky": "8.0.2"
   }
 }

commitlint/package.json

@@ -29,18 +29,18 @@ VCS=Git
 SOURCE_COMPATIBILITY=17
 TARGET_COMPATIBILITY=17
 ### Dependencies
-LIB_GRAPHQL_JAVA_VER=19.1
-LIB_EXTENDED_SCALARS_VER=18.1
-LIB_SPRING_BOOT_VER=2.7.2
+LIB_GRAPHQL_JAVA_VER=19.3
+LIB_EXTENDED_SCALARS_VER=19.1
+LIB_SPRING_BOOT_VER=2.7.6
 LIB_GRAPHQL_SERVLET_VER=14.0.0
-LIB_GRAPHQL_JAVA_TOOLS_VER=13.0.0
+LIB_GRAPHQL_JAVA_TOOLS_VER=13.0.2
 LIB_GRAPHQL_ANNOTATIONS_VER=9.1
 LIB_REFLECTIONS_VER=0.10.2
-LIB_APACHE_COMMONS_TEXT_VER=1.9
+LIB_APACHE_COMMONS_TEXT_VER=1.10.0
 LIB_AWAITILITY_VER=4.2.0
-LIB_JSOUP_VER=1.15.2
+LIB_JSOUP_VER=1.15.3
 ### Plugins
 PLUGIN_JACOCO_VER=0.8.7
-PLUGIN_SONARQUBE_VER=3.4.0.2513
+PLUGIN_SONARQUBE_VER=3.5.0.2730
 PLUGIN_NEXUS_PUBLISH_VER=1.1.0
 PLUGIN_GOOGLE_JAVA_FORMAT_VER=0.9

gradle.properties

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

gradle/wrapper/gradle-wrapper.jar

@@ -86,7 +86,9 @@ private Map<String, String> getReplacements() {
   private boolean isJsSuffixAdded() {
     if (nonNull(altairProperties.getCdn().getVersion())) {
       String[] versionValues = altairProperties.getCdn().getVersion().split("\\.");
-      return isNumeric(versionValues[0]) && parseInt(versionValues[0]) >= 4;
+      return isNumeric(versionValues[0]) && parseInt(versionValues[0]) >= 4
+              // -es2018 version is not published for versions 4.2.0 onwards
+              && versionValues.length > 2 && isNumeric(versionValues[1]) && parseInt(versionValues[1]) < 2;
     }
     return false;
   }