diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 62e486bd084..16cc70ce6b4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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" diff --git a/sentry-spring-7/build.gradle.kts b/sentry-spring-7/build.gradle.kts index 45a70b33a6b..cb85ae85c36 100644 --- a/sentry-spring-7/build.gradle.kts +++ b/sentry-spring-7/build.gradle.kts @@ -28,7 +28,9 @@ tasks.withType().configureEach { dependencies { api(projects.sentry) + compileOnly(platform(SpringBootPlugin.BOM_COORDINATES)) + compileOnly(Config.Libs.springWeb) compileOnly(Config.Libs.springAop) compileOnly(Config.Libs.springSecurityWeb) @@ -54,6 +56,7 @@ dependencies { errorprone(libs.nopen.checker) errorprone(libs.nullaway) + testImplementation(platform(SpringBootPlugin.BOM_COORDINATES)) // tests testImplementation(projects.sentryTestSupport) testImplementation(projects.sentryGraphql) diff --git a/sentry-spring-7/src/test/kotlin/io/sentry/spring7/mvc/SentrySpringIntegrationTest.kt b/sentry-spring-7/src/test/kotlin/io/sentry/spring7/mvc/SentrySpringIntegrationTest.kt index c9a05dbdad6..1127456cc6c 100644 --- a/sentry-spring-7/src/test/kotlin/io/sentry/spring7/mvc/SentrySpringIntegrationTest.kt +++ b/sentry-spring-7/src/test/kotlin/io/sentry/spring7/mvc/SentrySpringIntegrationTest.kt @@ -389,21 +389,21 @@ open class App { @Bean open fun sentryUserFilter(scopes: IScopes, @Lazy sentryUserProviders: List) = FilterRegistrationBean().apply { - this.filter = SentryUserFilter(scopes, sentryUserProviders) + this.setFilter(SentryUserFilter(scopes, sentryUserProviders)) this.order = Ordered.LOWEST_PRECEDENCE } @Bean open fun sentrySpringFilter(scopes: IScopes) = FilterRegistrationBean().apply { - this.filter = SentrySpringFilter(scopes) + this.setFilter(SentrySpringFilter(scopes)) this.order = Ordered.HIGHEST_PRECEDENCE } @Bean open fun sentryTracingFilter(scopes: IScopes) = FilterRegistrationBean().apply { - this.filter = SentryTracingFilter(scopes) + this.setFilter(SentryTracingFilter(scopes)) this.order = Ordered.HIGHEST_PRECEDENCE + 1 // must run after SentrySpringFilter }