Skip to content

Commit 63f0bb7

Browse files
committed
CDPS-1096: Upgrade spring boot to 3.4.1
1 parent c133203 commit 63f0bb7

File tree

7 files changed

+44
-8
lines changed

7 files changed

+44
-8
lines changed

.sdkmanrc

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

.trivyignore

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

build.gradle.kts

+10-6
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
plugins {
2-
id("uk.gov.justice.hmpps.gradle-spring-boot") version "6.0.9"
3-
kotlin("plugin.spring") version "2.0.21"
2+
id("uk.gov.justice.hmpps.gradle-spring-boot") version "6.1.2"
3+
kotlin("plugin.spring") version "2.1.0"
44
}
55

66
configurations {
77
testImplementation { exclude(group = "org.junit.vintage") }
88
}
99

1010
dependencies {
11-
implementation("uk.gov.justice.service.hmpps:hmpps-kotlin-spring-boot-starter:1.0.8")
11+
implementation("uk.gov.justice.service.hmpps:hmpps-kotlin-spring-boot-starter:1.1.1")
1212
implementation("org.springframework.boot:spring-boot-starter-webflux")
13-
implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0")
13+
implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.0")
1414

15-
testImplementation("uk.gov.justice.service.hmpps:hmpps-kotlin-spring-boot-starter-test:1.0.8")
16-
testImplementation("org.wiremock:wiremock-standalone:3.9.1")
15+
testImplementation("uk.gov.justice.service.hmpps:hmpps-kotlin-spring-boot-starter-test:1.1.1")
16+
testImplementation("org.wiremock:wiremock-standalone:3.10.0")
1717
testImplementation("io.swagger.parser.v3:swagger-parser:2.1.24") {
1818
exclude(group = "io.swagger.core.v3")
1919
}
@@ -23,6 +23,10 @@ kotlin {
2323
jvmToolchain(21)
2424
}
2525

26+
ktlint {
27+
version.set("1.4.1")
28+
}
29+
2630
tasks {
2731
withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
2832
compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: hmpps-person-integration-api
55
version: 0.2.0
66
dependencies:
77
- name: generic-service
8-
version: "3.7"
8+
version: "3.8"
99
repository: https://ministryofjustice.github.io/hmpps-helm-charts
1010
- name: generic-prometheus-alerts
1111
version: "1.11"

readme/build_test_run.md

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
## Building
55

6+
To use the same version of Java locally as is used in CI and production, follow [these notes](sdkman.md).
7+
68
To build the project without tests run:
79

810
```

readme/sdkman.md

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
[< Back](./building_and_running.md)
2+
---
3+
4+
## sdkman
5+
6+
It is recommended to use [sdkman](https://sdkman.io/) to ensure that you are running the same version of Java that is
7+
used in CI and in production.
8+
9+
To do this on a mac:
10+
11+
```shell
12+
curl -s "https://get.sdkman.io" | bash
13+
```
14+
15+
Close the terminal and reopen. Then run **within the repository folder**:
16+
17+
```shell
18+
sdk env
19+
```
20+
21+
This will pick up the `.sdkmanrc` file which contains the java version that should be used.
22+
23+
To enable sdkman to automatically switch you to the correct java version when changing directory in the terminal,
24+
edit `~/.sdkman/etc/config` and set `sdkman_auto_env=true`

0 commit comments

Comments
 (0)