diff --git a/Jenkinsfile_CNP b/Jenkinsfile_CNP index 0e35a66e46..e126ff5bc7 100644 --- a/Jenkinsfile_CNP +++ b/Jenkinsfile_CNP @@ -323,9 +323,9 @@ withPipeline("java", product, component) { env.CCD_IDAM_REDIRECT_URL="https://ccd-case-management-web-aat.service.core-compute-aat.internal/oauth2redirect" sh """ - docker run --rm --interactive curlimages/curl --insecure --retry 10 --retry-all-errors $CCD_DEF_URL/health - docker run --rm --interactive curlimages/curl --insecure --retry 10 --retry-all-errors $CCD_PRO_URL/health - docker run --rm --interactive curlimages/curl --insecure --retry 10 --retry-all-errors $CCD_DAT_URL/health + docker run --rm --interactive hmctspublic.azurecr.io/imported/curlimages/curl --insecure --retry 10 --retry-all-errors $CCD_DEF_URL/health + docker run --rm --interactive hmctspublic.azurecr.io/imported/curlimages/curl --insecure --retry 10 --retry-all-errors $CCD_PRO_URL/health + docker run --rm --interactive hmctspublic.azurecr.io/imported/curlimages/curl --insecure --retry 10 --retry-all-errors $CCD_DAT_URL/health """ } } diff --git a/build.gradle b/build.gradle index f239f916fb..5b999f5c28 100644 --- a/build.gradle +++ b/build.gradle @@ -9,8 +9,8 @@ plugins { id 'jacoco' id 'project-report' id 'au.com.dius.pact' version '4.6.15' - id 'net.serenity-bdd.serenity-gradle-plugin' version '4.2.6' - id 'org.sonarqube' version '5.1.0.4882' + id 'net.serenity-bdd.serenity-gradle-plugin' version '4.2.8' + id 'org.sonarqube' version '6.0.0.5145' id 'com.github.hmcts.rse-cft-lib' version '0.19.1410' } @@ -161,27 +161,27 @@ gitProperties { def versions = [ authCheckerLib : '3.0.1', ccdClient : '5.0.3', - commonsIO : '2.17.0', + commonsIO : '2.18.0', commonsValidator : '1.9.0', documentClient : '1.8.1', elasticSearchVersion : '7.17.24', hmctsJavaLogging : '6.1.7', jacksonDatabind : '2.17.1', - lombok : '1.18.34', + lombok : '1.18.36', mapStruct : '1.2.0.Final', pact_version : '4.1.34', probateCommonsVersion : '2.0.10', probatePactCommonsVersion : '1.0.2', restAssured : '5.5.0', - serenity : '4.2.6', - serenityreporter : '4.2.6', + serenity : '4.2.9', + serenityreporter : '4.2.9', serviceAuthVersion : '5.2.0', springBootVersion : '3.3.5', springBootStarterHateoas : '3.3.5', springCloud : '4.1.4', springCloudStarterNetflixHystrix: '4.1.3', springDocOpenUi : '2.6.0', - springSecurityVersion : '6.3.4' + springSecurityVersion : '6.4.0' ] jacocoTestReport { @@ -228,8 +228,8 @@ dependencies { implementation group: 'com.github.hmcts', name: 'auth-checker-lib', version: versions.authCheckerLib implementation group: 'com.github.hmcts', name: 'cmc-pdf-service-client', version: '8.0.1' implementation group: 'com.github.hmcts', name: 'send-letter-client', version: '4.0.4' - implementation group: 'com.github.hmcts', name: 'life-events-client', version: '1.2.2' - implementation group: 'com.azure', name: 'azure-storage-blob', version: '12.28.1' + implementation group: 'com.github.hmcts', name: 'life-events-client', version: '1.2.3' + implementation group: 'com.azure', name: 'azure-storage-blob', version: '12.29.0' implementation group: 'net.logstash.logback', name: 'logstash-logback-encoder', version: '8.0' implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: versions.jacksonDatabind diff --git a/config/owasp/suppressions.xml b/config/owasp/suppressions.xml index 7a774f537e..a3365459f0 100644 --- a/config/owasp/suppressions.xml +++ b/config/owasp/suppressions.xml @@ -1,9 +1,2 @@ - - - ^pkg:maven/com\.azure/azure\-json@.*$ - CVE-2023-36052 - diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index df97d72b8b..e2847c8200 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index bc64b622ce..d8357e8a6f 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -109,9 +109,9 @@ docmosis: sentEmail: templateName: FL-PRB-EML-ENG-00086.doc statementOfTruth: - templateName: FL-PRB-SOT-ENG-00091.doc + templateName: FL-PRB-SOT-ENG-00092.doc welshStatementOfTruth: - templateName: FL-PRB-SOT-WEL-00235.doc + templateName: FL-PRB-SOT-WEL-00236.doc assembledLetter: templateName: FL-PRB-GNO-ENG-00133-DTSPB-2638.docx blankLetter: diff --git a/yarn.lock b/yarn.lock index 5b9e20ef4b..2660eaf2dd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5267,13 +5267,13 @@ __metadata: linkType: hard "nock@npm:^13.0.7": - version: 13.5.5 - resolution: "nock@npm:13.5.5" + version: 13.5.6 + resolution: "nock@npm:13.5.6" dependencies: debug: "npm:^4.1.0" json-stringify-safe: "npm:^5.0.1" propagate: "npm:^2.0.0" - checksum: 10/c19d7bf9654db056357a22b00127bb5606c1bbdff188a5b6c469825e580e31cd0cb0701bce8dd8b4876dbbd36a145fdb681fd69fd59308d6db4923ce8ab2439e + checksum: 10/a57c265b75e5f7767e2f8baf058773cdbf357c31c5fea2761386ec03a008a657f9df921899fe2a9502773b47145b708863b32345aef529b3c45cba4019120f88 languageName: node linkType: hard