Bump Spring Boot 4 to M2 (#4665)

* Bump Spring Boot 4 to M2

* replace netty bom with boot plugin bom

Author: adinauer

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"

sentry-spring-7/build.gradle.kts

@@ -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)
@@ -54,6 +56,7 @@ dependencies {
   errorprone(libs.nopen.checker)
   errorprone(libs.nullaway)
 
+  testImplementation(platform(SpringBootPlugin.BOM_COORDINATES))
   // tests
   testImplementation(projects.sentryTestSupport)
   testImplementation(projects.sentryGraphql)

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<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
     }