Skip to content

Commit 289ff9b

Browse files
authored
Spring upgrade org.springframework.boot from 3.3.6 to 3.5.7 (#9253)
* upgrade to 3.4 * update to 3.4 * update gradle in dockerfiles * wip * remove comments * upgrade to 3.5.7 * remove deprecated mock tools * fix tests * fix tests * update gradle to 9.2.0 * Revert "update gradle to 9.2.0" This reverts commit e28b370. * gradle 8.14.3
1 parent f688141 commit 289ff9b

60 files changed

Lines changed: 401 additions & 392 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

backend/Dockerfile.db-liquibase-action

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM gradle:8.3-jdk17 AS build
1+
FROM gradle:8.14.3-jdk17 AS build
22

33
WORKDIR /home/gradle/graphql-api
44

backend/Dockerfile.prod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM gradle:8.3-jdk17 AS build
1+
FROM gradle:8.14.3-jdk17 AS build
22
WORKDIR /home/gradle/graphql-api
33
COPY --chown=gradle:gradle .git .git
44
WORKDIR /home/gradle/graphql-api/backend

backend/build.gradle

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
}
66

77
plugins {
8-
id 'org.springframework.boot' version '3.3.6'
8+
id 'org.springframework.boot' version '3.5.7'
99
id 'org.liquibase.gradle' version '3.0.2'
1010
id 'io.spring.dependency-management' version '1.1.6'
1111
id 'java'
@@ -23,7 +23,7 @@ java {
2323
}
2424

2525
ext {
26-
set('springCloudVersion', "2023.0.1")
26+
set('springCloudVersion', "2025.0.0")
2727
set('oktaVersion', "13.0.2")
2828
set('hibernate.version', '6.6.2.Final')
2929
}
@@ -37,25 +37,25 @@ jar {
3737

3838
dependencies {
3939
// core infrastructure
40-
implementation 'org.springframework.boot:spring-boot-starter-web:3.3.7'
40+
implementation 'org.springframework.boot:spring-boot-starter-web:3.5.7'
4141
implementation 'org.springframework.boot:spring-boot-starter-cache'
4242
implementation 'org.springframework.boot:spring-boot-actuator'
4343
implementation 'org.springframework.boot:spring-boot-actuator-autoconfigure'
4444

4545
// graphql
46-
implementation 'org.springframework.boot:spring-boot-starter-graphql:3.4.4'
47-
implementation 'org.springframework.graphql:spring-graphql:1.4.1'
48-
implementation 'org.springframework:spring-web:6.2.9'
46+
implementation 'org.springframework.boot:spring-boot-starter-graphql:3.5.7'
47+
implementation 'org.springframework.graphql:spring-graphql:1.4.3'
48+
implementation 'org.springframework:spring-web:6.2.12'
4949
testImplementation 'org.springframework:spring-webflux'
5050
testImplementation 'org.springframework.graphql:spring-graphql-test'
51-
implementation 'com.graphql-java:graphql-java:24.1'
51+
implementation 'com.graphql-java:graphql-java:24.3'
5252
// graphql-java-extended-validation schema directives
5353
implementation 'com.graphql-java:graphql-java-extended-validation:22.0'
5454
// graphql-java-extended-scalars
5555
implementation 'com.graphql-java:graphql-java-extended-scalars:22.0'
5656

5757

58-
//Feign HTTP Client
58+
// Feign HTTP Client
5959
implementation 'org.springframework.cloud:spring-cloud-starter-openfeign:4.1.4'
6060
implementation 'org.springframework.cloud:spring-cloud-starter-loadbalancer'
6161

@@ -69,13 +69,13 @@ dependencies {
6969
* DevSecOps verifies these packages at least once per month. LAST VERIFIED: 25 June 2025.
7070
*/
7171
implementation 'com.squareup.okio:okio:3.10.2'
72-
implementation 'org.springframework:spring-core:6.2.1'
73-
implementation 'org.springframework.security:spring-security-core:6.4.6'
74-
implementation 'org.springframework.security:spring-security-crypto:6.3.9'
75-
implementation 'org.springframework.security:spring-security-oauth2-client:6.4.4'
76-
implementation 'org.apache.tomcat.embed:tomcat-embed-core:10.1.40'
72+
implementation 'org.springframework:spring-core:6.2.12'
73+
implementation 'org.springframework.security:spring-security-core:6.5.6'
74+
implementation 'org.springframework.security:spring-security-crypto:6.5.6'
75+
implementation 'org.springframework.security:spring-security-oauth2-client:6.5.6'
76+
implementation 'org.apache.tomcat.embed:tomcat-embed-core:10.1.48'
7777
implementation 'org.apache.tomcat.embed:tomcat-embed-websocket:11.0.5'
78-
implementation 'org.springframework.security:spring-security-web:6.3.5'
78+
implementation 'org.springframework.security:spring-security-web:6.5.6'
7979

8080
// non-pinned security dependencies
8181
implementation 'org.owasp.encoder:encoder:1.3.1'
@@ -86,7 +86,7 @@ dependencies {
8686
// this provides additional types for JsonB and for ListArray types in Postgres
8787
implementation 'io.hypersistence:hypersistence-utils-hibernate-62:3.7.6'
8888
implementation 'org.liquibase:liquibase-core:4.31.1'
89-
implementation 'org.postgresql:postgresql:42.7.7'
89+
implementation 'org.postgresql:postgresql:42.7.8'
9090

9191
// data validation
9292
implementation 'com.googlecode.libphonenumber:libphonenumber:8.13.28'
@@ -142,6 +142,11 @@ dependencies {
142142
testImplementation 'org.springframework.security:spring-security-test'
143143
testImplementation 'net.ttddyy:datasource-proxy:1.10'
144144

145+
testImplementation 'org.mockito:mockito-core'
146+
testImplementation 'org.mockito:mockito-junit-jupiter'
147+
testImplementation 'org.junit.jupiter:junit-jupiter'
148+
testImplementation 'com.fasterxml.jackson.core:jackson-databind'
149+
145150
// used to autoconfigure WireMock for testing
146151
testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
147152
testImplementation 'org.springframework.cloud:spring-cloud-starter-contract-stub-runner'
@@ -156,10 +161,10 @@ dependencies {
156161
testAnnotationProcessor 'org.projectlombok:lombok'
157162

158163
// WireMock (only used for testing)
159-
testImplementation "com.github.tomakehurst:wiremock-jre8-standalone:2.35.0"
164+
testImplementation "com.github.tomakehurst:wiremock-jre8-standalone:2.35.2"
160165

161166
implementation 'ca.uhn.hapi.fhir:hapi-fhir-structures-r4:7.6.0'
162-
implementation 'com.fasterxml.jackson.core:jackson-core:2.17.3'
167+
implementation 'com.fasterxml.jackson.core:jackson-core:2.19.2'
163168

164169
// HL7v2
165170
implementation 'ca.uhn.hapi:hapi-base:2.5.1'

0 commit comments

Comments
 (0)