Commit 63f0bb7 1 parent c133203 commit 63f0bb7 Copy full SHA for 63f0bb7
File tree 7 files changed +44
-8
lines changed
helm_deploy/hmpps-person-integration-api
7 files changed +44
-8
lines changed Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change 10
10
# Suppression for h2 2.1.214 password on command line vulnerability
11
11
# can be suppressed as we only run h2 locally and not on build environments
12
12
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
Original file line number Diff line number Diff line change 1
1
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 "
4
4
}
5
5
6
6
configurations {
7
7
testImplementation { exclude(group = " org.junit.vintage" ) }
8
8
}
9
9
10
10
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 " )
12
12
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" )
14
14
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 " )
17
17
testImplementation(" io.swagger.parser.v3:swagger-parser:2.1.24" ) {
18
18
exclude(group = " io.swagger.core.v3" )
19
19
}
@@ -23,6 +23,10 @@ kotlin {
23
23
jvmToolchain(21 )
24
24
}
25
25
26
+ ktlint {
27
+ version.set(" 1.4.1" )
28
+ }
29
+
26
30
tasks {
27
31
withType< org.jetbrains.kotlin.gradle.tasks.KotlinCompile > {
28
32
compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget .JVM_21
Original file line number Diff line number Diff line change 1
1
distributionBase =GRADLE_USER_HOME
2
2
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
4
4
networkTimeout =10000
5
5
validateDistributionUrl =true
6
6
zipStoreBase =GRADLE_USER_HOME
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ name: hmpps-person-integration-api
5
5
version : 0.2.0
6
6
dependencies :
7
7
- name : generic-service
8
- version : " 3.7 "
8
+ version : " 3.8 "
9
9
repository : https://ministryofjustice.github.io/hmpps-helm-charts
10
10
- name : generic-prometheus-alerts
11
11
version : " 1.11"
Original file line number Diff line number Diff line change 3
3
4
4
## Building
5
5
6
+ To use the same version of Java locally as is used in CI and production, follow [ these notes] ( sdkman.md ) .
7
+
6
8
To build the project without tests run:
7
9
8
10
```
Original file line number Diff line number Diff line change
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 `
You can’t perform that action at this time.
0 commit comments