Fix CVE-2023-39533 (#758)

* Fix CVE-2023-39533

* Fix CVE-2023-41080

* Enable AppInsights

* Fix build issues

* revert the changes done

* Change sbNamespace to rd-servicebus-preview

* Fix TEST_URL issues

* Fix TEST_URL issues

* Update renovate config

.github/renovate.json

@@ -1,18 +1,7 @@
 {
-  "enabledManagers": ["helm-requirements","gradle-wrapper","regex"],
-  "helm-requirements":
-  {
-    "fileMatch": ["\\Chart.yaml$"],
-    "aliases": {
-      "hmctspublic": "https://hmctspublic.azurecr.io/helm/v1/repo/"
-    }
-  },
-  "regexManagers": [
-    {
-      "fileMatch": ["^Dockerfile$"],
-      "matchStrings": [
-        "datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\sARG .*?_VERSION=(?<currentValue>.*)\\s"
-      ]
-    }
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "local>hmcts/.github:renovate-config",
+    "local>hmcts/.github//renovate/automerge-minor"
   ]
-}
+}

Jenkinsfile_CNP

@@ -58,22 +58,18 @@ withPipeline(type, product, component) {
 
     before('functionalTest:preview') {
       env.execution_environment = "preview"
-      env.TEST_URL = "http://rd-caseworker-ref-api-preview.preview.platform.hmcts.net"
     }
 
     before('functionalTest:aat') {
       env.execution_environment = "aat"
-      env.TEST_URL = "http://rd-caseworker-ref-api-aat.aat.platform.hmcts.net"
     }
 
     before('smoketest:preview') {
       env.execution_environment = "preview"
-      env.TEST_URL = "http://rd-caseworker-ref-api-preview.preview.platform.hmcts.net"
     }
 
     before('smoketest:aat') {
       env.execution_environment = "aat"
-      env.TEST_URL = "http://rd-caseworker-ref-api-aat.aat.platform.hmcts.net"
     }
 
     // Sync demo and perftest with master branch

build.gradle

@@ -395,8 +395,8 @@ dependencies {
   implementation group: 'org.apache.logging.log4j', name: 'log4j', version: versions.log4j
   implementation group: 'org.apache.logging.log4j', name: 'log4j-to-slf4j', version: versions.log4j
 
-  implementation group: 'com.azure', name: 'azure-core', version: '1.13.0'
-  implementation group: 'com.azure', name: 'azure-messaging-servicebus', version: '7.0.2'
+  implementation group: 'com.azure', name: 'azure-core', version: '1.43.0'
+  implementation group: 'com.azure', name: 'azure-messaging-servicebus', version: '7.14.3'
   implementation group: 'com.google.code.gson', name: 'gson', version: '2.9.0'
   implementation group: 'org.springframework', name: 'spring-core', version: versions.springVersion
   implementation group: 'org.springframework', name: 'spring-beans', version: versions.springVersion
@@ -522,7 +522,7 @@ dependencyManagement {
 
   dependencies {
     // CVE-2023-28709
-    dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.75') {
+    dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.80') {
       entry 'tomcat-embed-core'
       entry 'tomcat-embed-el'
       entry 'tomcat-embed-websocket'

charts/rd-caseworker-ref-api/values.preview.template.yaml

@@ -43,7 +43,7 @@ servicebus:
   enabled: true
   teamName: RD
   resourceGroup: rd-aso-preview-rg
-  sbNamespace: rd
+  sbNamespace:  rd-servicebus-preview
   setup:
     topics:
       - name: crd-topic