diff --git a/Dockerfile b/Dockerfile index 83f31173e1..312dbe85e5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # renovate: datasource=github-releases depName=microsoft/ApplicationInsights-Java -ARG APP_INSIGHTS_AGENT_VERSION=3.4.13 +ARG APP_INSIGHTS_AGENT_VERSION=3.6.2 # Application image FROM hmctspublic.azurecr.io/base/java:17-distroless diff --git a/build.gradle b/build.gradle index a0f184857a..f4ff477e88 100644 --- a/build.gradle +++ b/build.gradle @@ -16,14 +16,14 @@ plugins { id 'jacoco' id 'pmd' id 'com.github.ben-manes.versions' version '0.51.0' - id "info.solidsoft.pitest" version '1.9.0' - id 'io.spring.dependency-management' version '1.1.0' + id "info.solidsoft.pitest" version '1.15.0' + id 'io.spring.dependency-management' version '1.1.6' id 'org.flywaydb.flyway' version '5.2.4' - id 'org.owasp.dependencycheck' version '10.0.3' - id 'org.sonarqube' version '4.3.0.3225' + id 'org.owasp.dependencycheck' version '10.0.4' + id 'org.sonarqube' version '4.4.1.3373' id 'org.springframework.boot' version '2.7.18' - id 'uk.gov.hmcts.java' version '0.12.43' - id 'au.com.dius.pact' version '4.2.14' + id 'uk.gov.hmcts.java' version '0.12.63' + id 'au.com.dius.pact' version '4.6.15' id "io.freefair.lombok" version "6.6.3" } @@ -33,13 +33,13 @@ apply plugin: 'project-report' apply plugin: 'idea' def versions = [ - reformLogging : '6.0.1', - serenity : '3.6.22', - junit : '5.8.2', - junitPlatform : '1.7.2', + reformLogging : '6.1.7', + serenity : '3.9.8', + junit : '5.11.3', + junitPlatform : '1.11.3', sonarPitest : '0.5', - pitest : '1.9.0', - restAssured : '5.3.1' + pitest : '1.17.1', + restAssured : '5.5.0' ] ext.libraries = [ @@ -152,13 +152,13 @@ configurations { checkstyle { maxWarnings = 0 - toolVersion = '10.12.0' + toolVersion = '10.20.1' // need to set configDirectory to rootDir otherwise submodule will use submodule/config/checkstyle configFile(new File(rootDir, 'config/checkstyle/checkstyle.xml')) } pmd { - toolVersion = '7.0.0' + toolVersion = '7.7.0' ignoreFailures = true sourceSets = [sourceSets.main, sourceSets.test, sourceSets.integrationTest, sourceSets.functionalTest, sourceSets.smokeTest] reportsDir = file("$project.buildDir/reports/pmd") @@ -208,11 +208,11 @@ task fortifyScan(type: JavaExec, description: 'Run fortify scan.') { project.ext { pacticipant = 'ia_caseApi' pacticipantVersion = getCheckedOutGitCommitHash() - set('springCloudVersion', "2021.0.3") + set('springCloudVersion', "2021.0.9") } jacoco { - toolVersion = "0.8.10" + toolVersion = "0.8.12" } jacocoTestReport { @@ -273,11 +273,11 @@ dependencyManagement { dependencies { - dependencySet(group: 'com.google.guava', version: '32.1.2-jre') { + dependencySet(group: 'com.google.guava', version: '32.1.3-jre') { entry 'guava' } - dependencySet(group: 'org.yaml', version: '2.0') { + dependencySet(group: 'org.yaml', version: '2.3') { entry 'snakeyaml' } @@ -285,23 +285,23 @@ dependencyManagement { entry 'commons-fileupload' } - dependencySet(group: 'com.fasterxml.jackson.core', version: '2.16.0') { + dependencySet(group: 'com.fasterxml.jackson.core', version: '2.18.1') { entry 'jackson-databind' entry 'jackson-core' entry 'jackson-annotations' } - dependencySet(group: 'com.fasterxml.jackson.dataformat', version: '2.16.0') { + dependencySet(group: 'com.fasterxml.jackson.dataformat', version: '2.18.1') { entry 'jackson-dataformat-csv' entry 'jackson-dataformat-yaml' } - dependencySet(group: 'com.fasterxml.jackson.datatype', version: '2.16.0') { + dependencySet(group: 'com.fasterxml.jackson.datatype', version: '2.18.1') { entry 'jackson-datatype-jsr310' entry 'jackson-datatype-jdk8' } - dependencySet(group: 'com.fasterxml.jackson.module', version: '2.16.0') { + dependencySet(group: 'com.fasterxml.jackson.module', version: '2.18.1') { entry 'jackson-module-parameter-names' } } @@ -342,77 +342,77 @@ dependencies { implementation group: 'org.yaml', name: 'snakeyaml' implementation group: 'org.apache.commons', name: 'commons-lang3' - implementation group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '9.22' - implementation (group: 'net.minidev', name: 'json-smart', version: '2.4.10'){ + implementation group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '9.47' + implementation (group: 'net.minidev', name: 'json-smart', version: '2.5.1'){ version { strictly('2.4.10') } } - implementation group: 'commons-io', name: 'commons-io', version: '2.10.0' + implementation group: 'commons-io', name: 'commons-io', version: '2.18.0' implementation group: 'org.apache.httpcomponents', name: 'httpclient' - implementation group: 'org.springdoc', name: 'springdoc-openapi-ui', version: '1.6.8' - implementation group: 'org.postgresql', name: 'postgresql', version: '42.4.4' - implementation group: 'com.sun.xml.bind', name: 'jaxb-osgi', version: '2.3.3' + implementation group: 'org.springdoc', name: 'springdoc-openapi-ui', version: '1.8.0' + implementation group: 'org.postgresql', name: 'postgresql', version: '42.7.4' + implementation group: 'com.sun.xml.bind', name: 'jaxb-osgi', version: '2.3.9' - implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.0.83' - implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-websocket', version: '9.0.83' + implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.0.97' + implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-websocket', version: '9.0.97' implementation group: 'com.google.guava', name: 'guava' - implementation group: 'com.launchdarkly', name: 'launchdarkly-java-server-sdk', version: '6.2.1' + implementation group: 'com.launchdarkly', name: 'launchdarkly-java-server-sdk', version: '6.3.0' - implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.13' - implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.2.13' + implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.5.12' + implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.5.12' implementation group: 'net.logstash.logback', name: 'logstash-logback-encoder', version: '8.0' - implementation group: 'org.javamoney.moneta', name: 'moneta-core', version: '1.4.2' + implementation group: 'org.javamoney.moneta', name: 'moneta-core', version: '1.4.4' implementation group: 'com.github.hmcts.java-logging', name: 'logging', version: versions.reformLogging implementation group: 'com.github.hmcts.java-logging', name: 'logging-appinsights', version: versions.reformLogging - implementation(group: 'com.github.hmcts', name: 'service-auth-provider-java-client', version: '4.0.2') { + implementation(group: 'com.github.hmcts', name: 'service-auth-provider-java-client', version: '4.1.2') { exclude group: "org.bouncycastle", module: "bcprov-jdk15on" } - implementation(group: 'org.springframework.cloud', name: 'spring-cloud-starter-openfeign', version: '3.1.8') { + implementation(group: 'org.springframework.cloud', name: 'spring-cloud-starter-openfeign', version: '3.1.9') { exclude group: "org.bouncycastle", module: "bcprov-jdk15on" } - implementation(group: 'org.springframework.cloud', name: 'spring-cloud-starter-bootstrap' , version: '3.1.7') { + implementation(group: 'org.springframework.cloud', name: 'spring-cloud-starter-bootstrap' , version: '3.1.9') { exclude group: "org.bouncycastle", module: "bcprov-jdk15on" } - implementation group: 'org.bouncycastle', name: 'bcprov-jdk18on', version: '1.74' - implementation group: 'uk.gov.service.notify', name: 'notifications-java-client', version: '5.0.1-RELEASE' + implementation group: 'org.bouncycastle', name: 'bcprov-jdk18on', version: '1.79' + implementation group: 'uk.gov.service.notify', name: 'notifications-java-client', version: '5.2.1-RELEASE' - compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.30' - annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.30' - testCompileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.30' - testAnnotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.30' + compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.36' + annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.36' + testCompileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.36' + testAnnotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.36' - implementation group: 'org.springframework.retry', name: 'spring-retry', version: '1.3.3' + implementation group: 'org.springframework.retry', name: 'spring-retry', version: '1.3.4' implementation group: 'org.springframework.security', name: 'spring-security-crypto' implementation group: 'com.fasterxml.jackson.core', name: 'jackson-annotations' - implementation(group: 'org.springframework.cloud', name: 'spring-cloud-starter-bootstrap' , version: '4.0.0'){ + implementation(group: 'org.springframework.cloud', name: 'spring-cloud-starter-bootstrap' , version: '4.1.4'){ exclude group: "org.bouncycastle", module: "bcprov-jdk15on" } - implementation group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '9.37.3' + implementation group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '9.47' - implementation group: 'net.minidev', name: 'json-smart', version: '2.5.0' - implementation 'joda-time:joda-time:2.12.7' + implementation group: 'net.minidev', name: 'json-smart', version: '2.5.1' + implementation 'joda-time:joda-time:2.13.0' - implementation group: 'com.googlecode.libphonenumber', name: 'libphonenumber', version: '8.13.43' + implementation group: 'com.googlecode.libphonenumber', name: 'libphonenumber', version: '8.13.50' testImplementation group: 'org.pitest', name: 'pitest', version: versions.pitest testImplementation "info.solidsoft.gradle.pitest:gradle-pitest-plugin:${versions.pitest}" testImplementation "org.codehaus.sonar-plugins:sonar-pitest-plugin:${versions.sonarPitest}" - testImplementation group: 'com.h2database', name: 'h2', version: '1.4.197' + testImplementation group: 'com.h2database', name: 'h2', version: '1.4.200' testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test' - testImplementation group: 'org.mockito', name: 'mockito-core', version :'4.3.0' + testImplementation group: 'org.mockito', name: 'mockito-core', version :'4.11.0' testImplementation group: 'org.mockito', name: 'mockito-inline', version :'5.2.0' - testImplementation(group: 'org.springframework.cloud', name: 'spring-cloud-contract-wiremock', version: '3.1.6') { + testImplementation(group: 'org.springframework.cloud', name: 'spring-cloud-contract-wiremock', version: '3.1.10') { exclude group: "com.github.tomakehurst", module: "wiremock-standalone" } testImplementation group: 'org.powermock', name: 'powermock-api-mockito2', version: '2.0.9' @@ -425,7 +425,7 @@ dependencies { testImplementation group: 'net.serenity-bdd', name: 'serenity-rest-assured', version: versions.serenity testImplementation group: 'net.serenity-bdd', name: 'serenity-spring', version: versions.serenity - testImplementation group: 'com.github.hmcts', name: 'fortify-client', version: '1.3.0', classifier: 'all', { + testImplementation group: 'com.github.hmcts', name: 'fortify-client', version: '1.4.5', classifier: 'all', { exclude group: 'commons-io', module: 'commons-io' exclude group: 'org.apache.commons', module: 'commons-lang3' } diff --git a/charts/ia-case-api/Chart.yaml b/charts/ia-case-api/Chart.yaml index ae9c05355a..8d8999a28f 100644 --- a/charts/ia-case-api/Chart.yaml +++ b/charts/ia-case-api/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: ia-case-api home: https://github.com/hmcts/ia-case-api -version: 0.0.55 +version: 0.0.56 description: Immigration & Asylum Case API maintainers: - name: HMCTS Immigration & Asylum Team @@ -11,7 +11,7 @@ dependencies: version: 5.2.1 repository: https://hmctspublic.azurecr.io/helm/v1/repo/ - name: ccd - version: ~9.0.22 + version: ~9.2.0 repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/' condition: ccd.enabled - name: xui-webapp @@ -23,11 +23,11 @@ dependencies: repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/' condition: idam-pr.enabled - name: ia-case-payments-api - version: 0.0.22 + version: 0.0.24 repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/' condition: ia-case-payments-api.enabled - name: ia-case-documents-api - version: 0.0.40 + version: 0.0.41 repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/' condition: ia-case-documents-api.enabled - name: ia-case-notifications-api @@ -35,19 +35,19 @@ dependencies: repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/' condition: ia-case-notifications-api.enabled - name: ia-home-office-integration-api - version: 0.0.26 + version: 0.0.27 repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/' condition: ia-home-office-integration-api.enabled - name: ia-aip-frontend - version: 0.0.49 + version: 0.0.52 repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/' condition: ia-aip-frontend.enabled - name: ia-bail-case-api - version: 0.0.21 + version: 0.0.22 repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/' condition: ia-bail-case-api.enabled - name: ia-timed-event-service - version: 0.0.27 + version: 0.0.29 repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/' condition: ia-timed-event-service.enabled - name: ccd-case-document-am-api @@ -55,11 +55,11 @@ dependencies: repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/' condition: ccd-case-document-am-api.enabled - name: em-ccdorc - version: 2.0.23 + version: 2.0.25 repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/' condition: em-ccdorc.enabled - name: em-stitching - version: 1.0.53 + version: 1.0.55 repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/' condition: em-stitching.enabled - name: aac-manage-case-assignment @@ -71,7 +71,7 @@ dependencies: repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/' condition: wa.enabled - name: servicebus - version: 1.0.6 + version: 1.0.7 repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/' condition: servicebus.enabled - name: ccd-message-publisher diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd49177..a4b76b9530 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5f4d1a0ba6..c1d5e01859 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists \ No newline at end of file +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1aa94a4269..f5feea6d6b 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 7101f8e467..9b42019c79 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/infrastructure/.terraform-version b/infrastructure/.terraform-version index dc1e644a10..66beabb579 100644 --- a/infrastructure/.terraform-version +++ b/infrastructure/.terraform-version @@ -1 +1 @@ -1.6.0 +1.9.8 diff --git a/package.json b/package.json index e63ea19f35..43593934bc 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ }, "dependencies": { "request": "2.88.2", - "walk-sync": "2.0.2", + "walk-sync": "2.2.0", "process": "0.11.10" } }