diff --git a/.github/renovate.json b/.github/renovate.json index 667f79aa5..690ad059b 100644 --- a/.github/renovate.json +++ b/.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=(?.*?) depName=(?.*?)( versioning=(?.*?))?\\sARG .*?_VERSION=(?.*)\\s" - ] - } + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "local>hmcts/.github:renovate-config", + "local>hmcts/.github//renovate/automerge-minor" ] -} +} \ No newline at end of file diff --git a/Jenkinsfile_CNP b/Jenkinsfile_CNP index b52aad38c..4d78ef2b3 100644 --- a/Jenkinsfile_CNP +++ b/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 diff --git a/build.gradle b/build.gradle index 69eae2f15..bc8aa0a9b 100644 --- a/build.gradle +++ b/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' diff --git a/charts/rd-caseworker-ref-api/values.preview.template.yaml b/charts/rd-caseworker-ref-api/values.preview.template.yaml index 39b5bb3cc..318e6911a 100644 --- a/charts/rd-caseworker-ref-api/values.preview.template.yaml +++ b/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