Skip to content

Commit 40076e3

Browse files
committed
BE: Chore: Bump Spring Boot to 3.5.3
1 parent 9c6b622 commit 40076e3

File tree

2 files changed

+4
-19
lines changed

2 files changed

+4
-19
lines changed

api/build.gradle

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,13 @@ dependencies {
5353
exclude group: 'io.projectreactor.ipc', module: 'reactor-netty'
5454
}
5555

56-
runtimeOnly libs.micrometer.registry.prometheus
56+
runtimeOnly(libs.micrometer.registry.prometheus){
57+
exclude group: 'com.google.protobuf', module: 'protobuf-java' because("Micrometer uses protobuf-java 4.x, which is incompatible with protobuf-java 3.x used by various dependencies of this project. See https://github.com/prometheus/client_java/issues/1431")
58+
}
5759

5860
// CVE Fixes
5961
implementation libs.apache.commons.compress
6062
implementation libs.okhttp3.logging.intercepter
61-
implementation libs.json.smart
62-
implementation libs.netty.common
63-
implementation libs.netty.handler
64-
implementation libs.spring.context
6563

6664
implementation libs.modelcontextprotocol.spring.webflux
6765
implementation libs.victools.jsonschema.generator
@@ -89,7 +87,6 @@ dependencies {
8987
testImplementation libs.testcontainers
9088
testImplementation libs.testcontainers.kafka
9189
testImplementation libs.testcontainers.jupiter
92-
testImplementation libs.junit.jupiter.engine
9390
testImplementation libs.mockito.core
9491
testImplementation libs.mockito.jupiter
9592
testImplementation libs.bytebuddy

gradle/libs.versions.toml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
spring-boot = '3.4.5'
2+
spring-boot = '3.5.3'
33

44
aws-msk-auth = '2.3.0'
55
azure-identity = '1.15.4'
@@ -21,7 +21,6 @@ lombok = '1.18.34'
2121
odd-oddrn-generator = '0.1.17'
2222
odd-oddrn-client = '0.1.41'
2323
cel = '0.3.0'
24-
junit = '5.11.2'
2524
mockito = '5.16.0'
2625
okhttp3 = '4.12.0'
2726
testcontainers = '1.20.6'
@@ -38,9 +37,6 @@ testng = '7.10.0'
3837
bonigarcia-webdrivermanager = '5.9.3'
3938
aspectj = '1.9.21'
4039

41-
# CVE fixes
42-
netty = '4.1.119.Final'
43-
4440
[plugins]
4541
spring-boot = { id = 'org.springframework.boot', version.ref = 'spring-boot' }
4642
spring-dependency-management = { id = 'io.spring.dependency-management', version = '1.1.3' }
@@ -101,8 +97,6 @@ testcontainers = { module = 'org.testcontainers:testcontainers', version.ref = '
10197
testcontainers-kafka = { module = 'org.testcontainers:kafka', version.ref = 'testcontainers' }
10298
testcontainers-jupiter = { module = 'org.testcontainers:junit-jupiter', version.ref = 'testcontainers' }
10399

104-
junit-jupiter-engine = { module = 'org.junit.jupiter:junit-jupiter-engine', version.ref = 'junit' }
105-
106100
mockito-core = { module = 'org.mockito:mockito-core', version.ref = 'mockito' }
107101
mockito-jupiter = { module = 'org.mockito:mockito-junit-jupiter', version.ref = 'mockito' }
108102

@@ -126,12 +120,6 @@ aspectj = { module = 'org.aspectj:aspectjweaver', version.ref = 'aspectj' }
126120
bonigarcia-webdrivermanager = { module = 'io.github.bonigarcia:webdrivermanager', version.ref = 'bonigarcia-webdrivermanager' }
127121
netty-resolver-dns-native = { module = 'io.netty:netty-resolver-dns-native-macos' }
128122

129-
# CVE fixes
130-
json-smart = { module = 'net.minidev:json-smart', version = '2.5.2' }
131-
netty-common = { module = 'io.netty:netty-common', version.ref = 'netty' }
132-
netty-handler = { module = 'io.netty:netty-handler', version.ref = 'netty' }
133-
spring-context = { module = 'org.springframework:spring-context', version = '6.2.7' }
134-
135123
# test scope
136124
bouncycastle-bcpkix = { module = 'org.bouncycastle:bcpkix-jdk18on', version = '1.80' }
137125

0 commit comments

Comments
 (0)