diff --git a/Dockerfile b/Dockerfile index 38f9dcb9..f744521c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # renovate: datasource=github-releases depName=microsoft/ApplicationInsights-Java -ARG APP_INSIGHTS_AGENT_VERSION=3.4.18 +ARG APP_INSIGHTS_AGENT_VERSION=3.4.19 # Application image FROM hmctspublic.azurecr.io/base/java:17-distroless diff --git a/build.gradle b/build.gradle index b1a5d104..eaa22141 100644 --- a/build.gradle +++ b/build.gradle @@ -15,11 +15,11 @@ plugins { id 'jacoco' id 'io.spring.dependency-management' version '1.1.4' id 'org.springframework.boot' version '2.7.18' - id 'uk.gov.hmcts.java' version '0.12.50' - id 'org.owasp.dependencycheck' version '9.0.4' + id 'uk.gov.hmcts.java' version '0.12.54' + id 'org.owasp.dependencycheck' version '9.0.8' id 'com.github.ben-manes.versions' version '0.50.0' id 'org.sonarqube' version '3.5.0.2730' - id 'au.com.dius.pact' version '4.2.14' + id 'au.com.dius.pact' version '4.6.4' id 'info.solidsoft.pitest' version '1.15.0' id 'io.freefair.lombok' version '6.6.3' id 'com.adarshr.test-logger' version '3.2.0' @@ -33,16 +33,16 @@ def versions = [ junit : '5.10.1', junitPlatform : '1.10.1', gradlePitest : '1.15.0', - pact_version : '4.1.38', + pact_version : '4.6.4', pitest : '1.15.3', reformLogging : '5.1.7', reformHealthStarter: '0.0.5', - restAssured : '5.3.2', - serenity : '3.6.22', + restAssured : '5.4.0', + serenity : '3.9.8', sonarPitest : '0.5', springHystrix : '2.2.10.RELEASE', springDoc : '1.7.0', - springCloud : '3.1.6' + springCloud : '3.1.9' ] mainClassName = 'uk.gov.hmcts.reform.iahomeofficeintegrationapi.Application' @@ -149,7 +149,7 @@ task fortifyScan(type: JavaExec, description: 'Run fortify scan.') { checkstyle { maxWarnings = 0 - toolVersion = '10.12.0' + toolVersion = '10.12.7' getConfigDirectory().set(new File(rootDir, 'config/checkstyle')) } @@ -236,26 +236,26 @@ dependencyManagement { dependencies { dependency group: 'commons-fileupload', name: 'commons-fileupload', version: '1.5' - dependency group: 'com.google.guava', name: 'guava', version: '32.1.2-jre' + dependency group: 'com.google.guava', name: 'guava', version: '32.1.3-jre' dependency group: 'org.yaml', name: 'snakeyaml', version: '2.2' - dependencySet(group: 'com.fasterxml.jackson.core', version: '2.16.0') { + dependencySet(group: 'com.fasterxml.jackson.core', version: '2.16.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.16.1') { entry 'jackson-dataformat-yaml' entry 'jackson-dataformat-cbor' } - dependencySet(group: 'com.fasterxml.jackson.datatype', version: '2.16.0') { + dependencySet(group: 'com.fasterxml.jackson.datatype', version: '2.16.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.16.1') { entry 'jackson-module-parameter-names' entry 'jackson-module-afterburner' } @@ -327,24 +327,24 @@ dependencies { implementation group: 'org.apiguardian', name:'apiguardian-api', version: '1.1.2' // CVE-2019-17195 - implementation group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '9.37.2' + implementation group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '9.37.3' // CVE-2021-27568 implementation group: 'net.minidev', name: 'json-smart', version: '2.5.0' - implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.16.0' + implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.16.1' implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.14' implementation group: 'commons-io', name: 'commons-io', version: '2.15.1' - 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.4.14' + implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.4.14' - implementation group: 'net.bytebuddy', name: 'byte-buddy', version: '1.14.10' + implementation group: 'net.bytebuddy', name: 'byte-buddy', version: '1.14.11' implementation group: 'com.sun.xml.bind', name: 'jaxb-osgi', version: '2.3.9' implementation group: 'com.launchdarkly', name: 'launchdarkly-java-server-sdk', version: '6.3.0' - 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.84' + implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-websocket', version: '9.0.84' compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.30' annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.30' @@ -362,7 +362,7 @@ dependencies { testImplementation(group: 'org.springframework.boot', name: 'spring-boot-starter-test') { exclude group: "com.vaadin.external.google", module: "android-json" } - testImplementation(group: 'org.springframework.cloud', name: 'spring-cloud-contract-wiremock', version: '3.1.8') { + testImplementation(group: 'org.springframework.cloud', name: 'spring-cloud-contract-wiremock', version: '3.1.9') { exclude group: "com.github.tomakehurst", module: "wiremock-standalone" } testImplementation group: 'org.springframework.security', name: 'spring-security-test' @@ -371,7 +371,7 @@ dependencies { testImplementation "info.solidsoft.gradle.pitest:gradle-pitest-plugin:${versions.gradlePitest}" testImplementation "org.codehaus.sonar-plugins:sonar-pitest-plugin:${versions.sonarPitest}" - testImplementation group: 'net.bytebuddy', name: 'byte-buddy-agent', version: '1.14.10' + testImplementation group: 'net.bytebuddy', name: 'byte-buddy-agent', version: '1.14.11' testImplementation group: 'com.vladsch.flexmark', name: 'flexmark-all', version: '0.64.8' testImplementation group: 'io.rest-assured', name: 'rest-assured-all', version: versions.restAssured @@ -390,9 +390,9 @@ dependencies { } //PACT testing - contractTestImplementation group: 'com.google.guava', name: 'guava', version: '32.1.2-jre' + contractTestImplementation group: 'com.google.guava', name: 'guava', version: '32.1.3-jre' contractTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-web' - contractTestImplementation group: 'org.assertj', name: 'assertj-core', version: '3.24.2' + contractTestImplementation group: 'org.assertj', name: 'assertj-core', version: '3.25.1' //pact contract testing contractTestImplementation group: 'au.com.dius.pact.consumer', name: 'junit5', version: versions.pact_version contractTestImplementation group: 'au.com.dius', name: 'pact-jvm-model', version: '3.6.15' diff --git a/charts/ia-home-office-integration-api/Chart.yaml b/charts/ia-home-office-integration-api/Chart.yaml index afe92864..88dcc26f 100644 --- a/charts/ia-home-office-integration-api/Chart.yaml +++ b/charts/ia-home-office-integration-api/Chart.yaml @@ -3,11 +3,11 @@ appVersion: "1.0" description: Helm chart for ia-home-office-integration-api microservice name: ia-home-office-integration-api home: https://github.com/hmcts/ia-home-office-integration-api -version: 0.0.24 +version: 0.0.25 maintainers: - name: HMCTS Immigration & Asylum Team email: ImmigrationandAsylum@HMCTS.NET dependencies: - name: java - version: 5.0.2 + version: 5.0.3 repository: https://hmctspublic.azurecr.io/helm/v1/repo/ diff --git a/infrastructure/.terraform-version b/infrastructure/.terraform-version index 9f05f9f2..ec70f755 100644 --- a/infrastructure/.terraform-version +++ b/infrastructure/.terraform-version @@ -1 +1 @@ -1.6.5 +1.6.6