From 6835580a35fb4ba576e400654776570c3078376a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2024 15:31:42 +0000 Subject: [PATCH 1/2] Update all non-major dependencies --- Dockerfile | 2 +- build.gradle | 42 +++++++++++++++---------------- infrastructure/.terraform-version | 2 +- infrastructure/state.tf | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4c34a7e02..ba10f83b7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # renovate: datasource=github-releases depName=microsoft/ApplicationInsights-Java -ARG APP_INSIGHTS_AGENT_VERSION=3.5.1 +ARG APP_INSIGHTS_AGENT_VERSION=3.5.3 # Application image FROM hmctspublic.azurecr.io/base/java:17-distroless diff --git a/build.gradle b/build.gradle index 773609c65..d75f433b9 100644 --- a/build.gradle +++ b/build.gradle @@ -15,12 +15,12 @@ plugins { id 'pmd' id 'com.github.ben-manes.versions' version '0.51.0' id "info.solidsoft.pitest" version '1.15.0' - id 'io.spring.dependency-management' version '1.1.4' - id 'org.owasp.dependencycheck' version '9.0.10' + id 'io.spring.dependency-management' version '1.1.5' + id 'org.owasp.dependencycheck' version '9.2.0' id 'org.sonarqube' version '3.5.0.2730' id 'org.springframework.boot' version '2.7.18' - id 'uk.gov.hmcts.java' version '0.12.59' - id 'au.com.dius.pact' version '4.6.8' + id 'uk.gov.hmcts.java' version '0.12.63' + id 'au.com.dius.pact' version '4.6.10' id "io.freefair.lombok" version "6.6.3" } @@ -30,14 +30,14 @@ apply plugin: 'project-report' apply plugin: 'idea' def versions = [ - junit : '5.10.2', - junitPlatform : '1.10.2', + junit : '5.10.3', + junitPlatform : '1.10.3', gradlePitest : '1.5.1', - pitest : '1.15.8', + pitest : '1.16.1', reformLogging : '5.1.7', reformHealthStarter: '0.0.5', restAssured : '5.4.0', - serenity : '4.1.4', + serenity : '4.1.20', sonarPitest : '0.5', pact_version : '4.1.38', springDoc : '1.8.0', @@ -211,7 +211,7 @@ project.ext { } jacoco { - toolVersion = "0.8.11" + toolVersion = "0.8.12" } jacocoTestReport { @@ -279,18 +279,18 @@ dependencyManagement { } - dependencySet(group: 'com.fasterxml.jackson.core', version: '2.17.0') { + dependencySet(group: 'com.fasterxml.jackson.core', version: '2.17.1') { entry 'jackson-databind' entry 'jackson-core' entry 'jackson-annotations' } - dependencySet(group: 'com.fasterxml.jackson.dataformat', version: '2.17.0') { + dependencySet(group: 'com.fasterxml.jackson.dataformat', version: '2.17.1') { entry 'jackson-dataformat-yaml' entry 'jackson-dataformat-csv' } - dependencySet(group: 'com.fasterxml.jackson.datatype', version: '2.17.0') { + dependencySet(group: 'com.fasterxml.jackson.datatype', version: '2.17.1') { entry 'jackson-datatype-jsr310' entry 'jackson-datatype-jdk8' } @@ -326,7 +326,7 @@ dependencies { implementation group: 'com.github.ben-manes.caffeine', name: 'caffeine' // CVE-2019-17195 - implementation group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '9.37.3' + implementation group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '9.40' // CVE-2021-27568 implementation group: 'net.minidev', name: 'json-smart', version: '2.5.1' @@ -352,13 +352,13 @@ dependencies { implementation group: 'uk.gov.hmcts.reform', name: 'properties-volume-spring-boot-starter', version: '0.1.0' implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.14.0' - implementation group: 'commons-io', name: 'commons-io', version: '2.16.0' + implementation group: 'commons-io', name: 'commons-io', version: '2.16.1' implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.14' implementation group: 'com.github.hmcts', name: 'ccd-case-document-am-client', version: '1.7.3' - implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.0.87' - implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-websocket', version: '9.0.87' + implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.0.90' + implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-websocket', version: '9.0.90' implementation group: 'com.launchdarkly', name: 'launchdarkly-java-server-sdk', version: '6.3.0' implementation group: 'com.github.hmcts', name: 'ccd-case-document-am-client', version: '1.7.3' @@ -383,7 +383,7 @@ dependencies { testImplementation group: 'net.serenity-bdd', name: 'serenity-spring', version: versions.serenity testImplementation group: 'com.github.hmcts', name: 'ccd-case-document-am-client', version: '1.7.3' - testImplementation group: 'com.github.hmcts', name: 'fortify-client', version: '1.4.1', classifier: 'all', { + testImplementation group: 'com.github.hmcts', name: 'fortify-client', version: '1.4.3', classifier: 'all', { exclude group: 'commons-io', module: 'commons-io' exclude group: 'org.apache.commons', module: 'commons-lang3' } @@ -395,11 +395,11 @@ dependencies { } //pact contract testing - contractTestImplementation group: 'au.com.dius.pact.consumer', name: 'junit5', version: "4.6.8" + contractTestImplementation group: 'au.com.dius.pact.consumer', name: 'junit5', version: "4.6.10" - contractTestImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2") - contractTestRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.2") - contractTestImplementation('org.junit.jupiter:junit-jupiter-api:5.10.2') + contractTestImplementation("org.junit.jupiter:junit-jupiter-api:5.10.3") + contractTestRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.3") + contractTestImplementation('org.junit.jupiter:junit-jupiter-api:5.10.3') integrationTestImplementation sourceSets.main.runtimeClasspath integrationTestImplementation sourceSets.test.runtimeClasspath diff --git a/infrastructure/.terraform-version b/infrastructure/.terraform-version index 6a126f402..f8e233b27 100644 --- a/infrastructure/.terraform-version +++ b/infrastructure/.terraform-version @@ -1 +1 @@ -1.7.5 +1.9.0 diff --git a/infrastructure/state.tf b/infrastructure/state.tf index 186020593..3dbe401bb 100644 --- a/infrastructure/state.tf +++ b/infrastructure/state.tf @@ -4,7 +4,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 3.97.0" + version = "~> 3.109.0" } } } From a60e99c5ab6979f9f5cae8b812ff5bf6cb22ce89 Mon Sep 17 00:00:00 2001 From: 58060 <62423932+hmcts-jenkins-d-to-i[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2024 15:37:51 +0000 Subject: [PATCH 2/2] Updating Terraform Formatting --- infrastructure/main.tf | 14 +++++++------- infrastructure/output.tf | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/infrastructure/main.tf b/infrastructure/main.tf index b0ece470a..27c4dc4aa 100644 --- a/infrastructure/main.tf +++ b/infrastructure/main.tf @@ -6,21 +6,21 @@ locals { preview_app_service_plan = "${var.product}-${var.component}-${var.env}" non_preview_app_service_plan = "${var.product}-${var.env}" - app_service_plan = "${var.env == "preview" || var.env == "spreview" ? local.preview_app_service_plan : local.non_preview_app_service_plan}" + app_service_plan = var.env == "preview" || var.env == "spreview" ? local.preview_app_service_plan : local.non_preview_app_service_plan - preview_vault_name = "${var.raw_product}-aat" - non_preview_vault_name = "${var.raw_product}-${var.env}" - key_vault_name = "${var.env == "preview" || var.env == "spreview" ? local.preview_vault_name : local.non_preview_vault_name}" + preview_vault_name = "${var.raw_product}-aat" + non_preview_vault_name = "${var.raw_product}-${var.env}" + key_vault_name = var.env == "preview" || var.env == "spreview" ? local.preview_vault_name : local.non_preview_vault_name } resource "azurerm_resource_group" "rg" { name = "${var.product}-${var.component}-${var.env}" location = var.location - tags = merge(var.common_tags, tomap({"lastUpdated" = "${timestamp()}"})) + tags = merge(var.common_tags, tomap({ "lastUpdated" = "${timestamp()}" })) } data "azurerm_key_vault" "ia_key_vault" { - name = "${local.key_vault_name}" - resource_group_name = "${local.key_vault_name}" + name = local.key_vault_name + resource_group_name = local.key_vault_name } diff --git a/infrastructure/output.tf b/infrastructure/output.tf index 0efc82e7c..90263cc17 100644 --- a/infrastructure/output.tf +++ b/infrastructure/output.tf @@ -1,17 +1,17 @@ output "microserviceName" { - value = "${var.component}" + value = var.component } output "resourceGroup" { - value = "${azurerm_resource_group.rg.name}" + value = azurerm_resource_group.rg.name } output "appServicePlan" { - value = "${local.app_service_plan}" + value = local.app_service_plan } output "vaultUri" { - value = "${data.azurerm_key_vault.ia_key_vault.vault_uri}" + value = data.azurerm_key_vault.ia_key_vault.vault_uri }