Skip to content

Bump Spring Boot 4 to M2 #4665

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

Merged
merged 2 commits into from
Aug 27, 2025
Merged

Bump Spring Boot 4 to M2 #4665

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
2efe58d
Bump Spring Boot 4 to M2
adinauer Aug 26, 2025
549e9a7
replace netty bom with boot plugin bom
adinauer Aug 27, 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
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ retrofit = "2.9.0"
slf4j = "1.7.30"
springboot2 = "2.7.18"
springboot3 = "3.5.0"
springboot4 = "4.0.0-M1"
springboot4 = "4.0.0-M2"
# Android
targetSdk = "34"
compileSdk = "34"
Expand Down
3 changes: 3 additions & 0 deletions sentry-spring-7/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ tasks.withType<KotlinCompile>().configureEach {

dependencies {
api(projects.sentry)

compileOnly(platform(SpringBootPlugin.BOM_COORDINATES))

compileOnly(Config.Libs.springWeb)
compileOnly(Config.Libs.springAop)
compileOnly(Config.Libs.springSecurityWeb)
Expand All @@ -54,6 +56,7 @@ dependencies {
errorprone(libs.nopen.checker)
errorprone(libs.nullaway)

testImplementation(platform(SpringBootPlugin.BOM_COORDINATES))
// tests
testImplementation(projects.sentryTestSupport)
testImplementation(projects.sentryGraphql)
Expand Down
6 changes: 3 additions & 3 deletions sentry-spring-7/src/test/kotlin/io/sentry/spring7/mvc/SentrySpringIntegrationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,21 +389,21 @@ open class App {
@Bean
open fun sentryUserFilter(scopes: IScopes, @Lazy sentryUserProviders: List<SentryUserProvider>) =
FilterRegistrationBean<SentryUserFilter>().apply {
this.filter = SentryUserFilter(scopes, sentryUserProviders)
this.setFilter(SentryUserFilter(scopes, sentryUserProviders))
this.order = Ordered.LOWEST_PRECEDENCE
}

@Bean
open fun sentrySpringFilter(scopes: IScopes) =
FilterRegistrationBean<SentrySpringFilter>().apply {
this.filter = SentrySpringFilter(scopes)
this.setFilter(SentrySpringFilter(scopes))
this.order = Ordered.HIGHEST_PRECEDENCE
}

@Bean
open fun sentryTracingFilter(scopes: IScopes) =
FilterRegistrationBean<SentryTracingFilter>().apply {
this.filter = SentryTracingFilter(scopes)
this.setFilter(SentryTracingFilter(scopes))
this.order = Ordered.HIGHEST_PRECEDENCE + 1 // must run after SentrySpringFilter
}

Expand Down
Loading