Skip to content

BE: Chore: Bump Spring Boot to 3.5.3 #1143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

BE: Chore: Bump Spring Boot to 3.5.3 #1143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40076e3
BE: Chore: Bump Spring Boot to 3.5.3
yeikel Jun 21, 2025
b57acf5
Remove mockito and assertj
yeikel Jun 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions api/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,13 @@ dependencies {
exclude group: 'io.projectreactor.ipc', module: 'reactor-netty'
}

runtimeOnly libs.micrometer.registry.prometheus
runtimeOnly(libs.micrometer.registry.prometheus){
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")
}
Comment on lines +56 to +58
Copy link
Collaborator Author

@yeikel yeikel Jun 22, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This may cause issues for anyone using this functionality, but there does not seem to be a clear fix for this other than prometheus/client_java#1431

None of our tests seem to be flagging this right now but it may be a matter of coverage

@Haarolean What do you think?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For now, I pushed b57acf5 which we can revert as needed

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I doubt we have tests for this. However we should have a docker-compose somewhere in documentation/compose to try it out with prometheus.


// CVE Fixes
implementation libs.apache.commons.compress
implementation libs.okhttp3.logging.intercepter
implementation libs.json.smart
implementation libs.netty.common
implementation libs.netty.handler
implementation libs.spring.context

implementation libs.modelcontextprotocol.spring.webflux
implementation libs.victools.jsonschema.generator
Expand Down Expand Up @@ -89,11 +87,7 @@ dependencies {
testImplementation libs.testcontainers
testImplementation libs.testcontainers.kafka
testImplementation libs.testcontainers.jupiter
testImplementation libs.junit.jupiter.engine
testImplementation libs.mockito.core
testImplementation libs.mockito.jupiter
testImplementation libs.bytebuddy
testImplementation libs.assertj
testImplementation libs.jsonschemavalidator
testImplementation(libs.kafka.clients) { artifact { classifier = "test" } }
testImplementation libs.bouncycastle.bcpkix
Expand Down
20 changes: 1 addition & 19 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
spring-boot = '3.4.5'
spring-boot = '3.5.3'

aws-msk-auth = '2.3.0'
azure-identity = '1.15.4'
Expand All @@ -10,7 +10,6 @@ apache-commons-pool2 = '2.12.1'
apache-datasketches = '3.1.0'
apache-commons-compress = '1.26.0'

assertj = '3.25.3'
avro = '1.11.4'
byte-buddy = '1.14.19'
confluent = '7.9.0'
Expand All @@ -21,8 +20,6 @@ lombok = '1.18.34'
odd-oddrn-generator = '0.1.17'
odd-oddrn-client = '0.1.41'
cel = '0.3.0'
junit = '5.11.2'
mockito = '5.16.0'
okhttp3 = '4.12.0'
testcontainers = '1.20.6'
swagger-integration-jakarta = '2.2.28'
Expand All @@ -38,9 +35,6 @@ testng = '7.10.0'
bonigarcia-webdrivermanager = '5.9.3'
aspectj = '1.9.21'

# CVE fixes
netty = '4.1.119.Final'

[plugins]
spring-boot = { id = 'org.springframework.boot', version.ref = 'spring-boot' }
spring-dependency-management = { id = 'io.spring.dependency-management', version = '1.1.3' }
Expand Down Expand Up @@ -101,11 +95,6 @@ testcontainers = { module = 'org.testcontainers:testcontainers', version.ref = '
testcontainers-kafka = { module = 'org.testcontainers:kafka', version.ref = 'testcontainers' }
testcontainers-jupiter = { module = 'org.testcontainers:junit-jupiter', version.ref = 'testcontainers' }

junit-jupiter-engine = { module = 'org.junit.jupiter:junit-jupiter-engine', version.ref = 'junit' }

mockito-core = { module = 'org.mockito:mockito-core', version.ref = 'mockito' }
mockito-jupiter = { module = 'org.mockito:mockito-junit-jupiter', version.ref = 'mockito' }

okhttp3 = { module = 'com.squareup.okhttp3:okhttp', version.ref = 'okhttp3' }
okhttp3-mockwebserver = { module = 'com.squareup.okhttp3:mockwebserver', version.ref = 'okhttp3' }
okhttp3-logging-intercepter = { module = 'com.squareup.okhttp3:logging-interceptor', version.ref = 'okhttp3' }
Expand All @@ -114,7 +103,6 @@ opendatadiscovery-oddrn = { module = 'org.opendatadiscovery:oddrn-generator-java
opendatadiscovery-client = { module = 'org.opendatadiscovery:ingestion-contract-client', version.ref = 'odd-oddrn-client' }

bytebuddy = { module = 'net.bytebuddy:byte-buddy', version.ref = 'byte-buddy' }
assertj = { module = 'org.assertj:assertj-core', version.ref = 'assertj' }
jsonschemavalidator = { module = 'com.github.java-json-tools:json-schema-validator', version.ref = 'json-schema-validator' }

allure-testng = { module = 'io.qameta.allure:allure-testng', version.ref = 'allure' }
Expand All @@ -126,12 +114,6 @@ aspectj = { module = 'org.aspectj:aspectjweaver', version.ref = 'aspectj' }
bonigarcia-webdrivermanager = { module = 'io.github.bonigarcia:webdrivermanager', version.ref = 'bonigarcia-webdrivermanager' }
netty-resolver-dns-native = { module = 'io.netty:netty-resolver-dns-native-macos' }

# CVE fixes
json-smart = { module = 'net.minidev:json-smart', version = '2.5.2' }
netty-common = { module = 'io.netty:netty-common', version.ref = 'netty' }
netty-handler = { module = 'io.netty:netty-handler', version.ref = 'netty' }
spring-context = { module = 'org.springframework:spring-context', version = '6.2.7' }

# test scope
bouncycastle-bcpkix = { module = 'org.bouncycastle:bcpkix-jdk18on', version = '1.80' }

Expand Down
Loading