Skip to content

Commit 099b139

Browse files
yeikelgermanosin
andauthored
BE: Chore: Bump Spring Boot to 3.5.3 (#1143)
Co-authored-by: German Osin <german.osin@gmail.com>
1 parent 7ef51b5 commit 099b139

File tree

2 files changed

+7
-13
lines changed

2 files changed

+7
-13
lines changed

api/build.gradle

Lines changed: 3 additions & 5 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

gradle/libs.versions.toml

Lines changed: 4 additions & 8 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,9 @@ 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'
24+
# This version should be compatible with the version used by spring-boot-starter-test to avoid conflicts
25+
# See https://github.com/spring-projects/spring-boot/blob/b6b570ebebb6ea233e00af5e554adcf40256f224/gradle.properties#L16C21-L16C27
26+
junit = '5.12.2'
2527
mockito = '5.16.0'
2628
okhttp3 = '4.12.0'
2729
testcontainers = '1.20.6'
@@ -126,12 +128,6 @@ aspectj = { module = 'org.aspectj:aspectjweaver', version.ref = 'aspectj' }
126128
bonigarcia-webdrivermanager = { module = 'io.github.bonigarcia:webdrivermanager', version.ref = 'bonigarcia-webdrivermanager' }
127129
netty-resolver-dns-native = { module = 'io.netty:netty-resolver-dns-native-macos' }
128130

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-
135131
# test scope
136132
bouncycastle-bcpkix = { module = 'org.bouncycastle:bcpkix-jdk18on', version = '1.80' }
137133

0 commit comments

Comments
 (0)