CDPS-1096: Upgrade spring boot to 3.4.1

Author: brightonsbox

.sdkmanrc

@@ -0,0 +1,3 @@
+# Enable auto-env through the sdkman_auto_env config
+# Add key=value pairs of SDKs to use below
+java=21.0.5-tem

.trivyignore

@@ -10,3 +10,6 @@
 # Suppression for h2 2.1.214 password on command line vulnerability
 #   can be suppressed as we only run h2 locally and not on build environments
 CVE-2022-45868
+# Suppression for tomcat vulnerability affecting jsp compilation in the default servlet
+#   can be suppressed as we do not use the default servlet and haven't configured it for write either
+CVE-2024-50379

build.gradle.kts

@@ -1,19 +1,19 @@
 plugins {
-  id("uk.gov.justice.hmpps.gradle-spring-boot") version "6.0.9"
-  kotlin("plugin.spring") version "2.0.21"
+  id("uk.gov.justice.hmpps.gradle-spring-boot") version "6.1.2"
+  kotlin("plugin.spring") version "2.1.0"
 }
 
 configurations {
   testImplementation { exclude(group = "org.junit.vintage") }
 }
 
 dependencies {
-  implementation("uk.gov.justice.service.hmpps:hmpps-kotlin-spring-boot-starter:1.0.8")
+  implementation("uk.gov.justice.service.hmpps:hmpps-kotlin-spring-boot-starter:1.1.1")
   implementation("org.springframework.boot:spring-boot-starter-webflux")
-  implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0")
+  implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.0")
 
-  testImplementation("uk.gov.justice.service.hmpps:hmpps-kotlin-spring-boot-starter-test:1.0.8")
-  testImplementation("org.wiremock:wiremock-standalone:3.9.1")
+  testImplementation("uk.gov.justice.service.hmpps:hmpps-kotlin-spring-boot-starter-test:1.1.1")
+  testImplementation("org.wiremock:wiremock-standalone:3.10.0")
   testImplementation("io.swagger.parser.v3:swagger-parser:2.1.24") {
     exclude(group = "io.swagger.core.v3")
   }
@@ -23,6 +23,10 @@ kotlin {
   jvmToolchain(21)
 }
 
+ktlint {
+  version.set("1.4.1")
+}
+
 tasks {
   withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
     compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21

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.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

helm_deploy/hmpps-person-integration-api/Chart.yaml

@@ -5,7 +5,7 @@ name: hmpps-person-integration-api
 version: 0.2.0
 dependencies:
   - name: generic-service
-    version: "3.7"
+    version: "3.8"
     repository: https://ministryofjustice.github.io/hmpps-helm-charts
   - name: generic-prometheus-alerts
     version: "1.11"

readme/build_test_run.md

@@ -3,6 +3,8 @@
 
 ## Building
 
+To use the same version of Java locally as is used in CI and production, follow [these notes](sdkman.md).
+
 To build the project without tests run:
 
 ```

readme/sdkman.md

@@ -0,0 +1,24 @@
+[< Back](./building_and_running.md)
+---
+
+## sdkman
+
+It is recommended to use [sdkman](https://sdkman.io/) to ensure that you are running the same version of Java that is 
+used in CI and in production.
+
+To do this on a mac:
+
+```shell
+curl -s "https://get.sdkman.io" | bash
+```
+
+Close the terminal and reopen. Then run **within the repository folder**:
+
+```shell
+sdk env
+```
+
+This will pick up the `.sdkmanrc` file which contains the java version that should be used.
+
+To enable sdkman to automatically switch you to the correct java version when changing directory in the terminal,
+edit `~/.sdkman/etc/config` and set `sdkman_auto_env=true`