From 9d27204cca71d0ce6d4dea1b1092b57cd718bab6 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Fri, 19 Sep 2025 11:12:28 +0200 Subject: [PATCH 1/2] Bump Spring Boot 4 to M3 --- gradle/libs.versions.toml | 4 ++-- .../build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- sentry-samples/sentry-samples-spring-boot-4/build.gradle.kts | 2 +- sentry-spring-7/build.gradle.kts | 2 +- sentry-spring-boot-4/build.gradle.kts | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7d9b44aa53d..60c163373a7 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-M2" +springboot4 = "4.0.0-M3" # Android targetSdk = "34" compileSdk = "34" @@ -170,7 +170,7 @@ springboot4-starter-test = { module = "org.springframework.boot:spring-boot-star springboot4-starter-web = { module = "org.springframework.boot:spring-boot-starter-web", version.ref = "springboot4" } springboot4-starter-websocket = { module = "org.springframework.boot:spring-boot-starter-websocket", version.ref = "springboot4" } springboot4-starter-webflux = { module = "org.springframework.boot:spring-boot-starter-webflux", version.ref = "springboot4" } -springboot4-starter-aop = { module = "org.springframework.boot:spring-boot-starter-aop", version.ref = "springboot4" } +springboot4-starter-aspectj = { module = "org.springframework.boot:spring-boot-starter-aspectj", version.ref = "springboot4" } springboot4-starter-security = { module = "org.springframework.boot:spring-boot-starter-security", version.ref = "springboot4" } springboot4-starter-restclient = { module = "org.springframework.boot:spring-boot-starter-restclient", version.ref = "springboot4" } springboot4-starter-webclient = { module = "org.springframework.boot:spring-boot-starter-webclient", version.ref = "springboot4" } diff --git a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/build.gradle.kts index 9c01f148d10..fc3305f42c4 100644 --- a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/build.gradle.kts @@ -38,7 +38,7 @@ tasks.withType().configureEach { dependencies { implementation(libs.springboot4.starter) implementation(libs.springboot4.starter.actuator) - implementation(libs.springboot4.starter.aop) + implementation(libs.springboot4.starter.aspectj) implementation(libs.springboot4.starter.graphql) implementation(libs.springboot4.starter.jdbc) implementation(libs.springboot4.starter.quartz) diff --git a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/build.gradle.kts index b9ac158296c..86aacf5b658 100644 --- a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/build.gradle.kts @@ -39,7 +39,7 @@ tasks.withType().configureEach { dependencies { implementation(libs.springboot4.starter) implementation(libs.springboot4.starter.actuator) - implementation(libs.springboot4.starter.aop) + implementation(libs.springboot4.starter.aspectj) implementation(libs.springboot4.starter.graphql) implementation(libs.springboot4.starter.jdbc) implementation(libs.springboot4.starter.quartz) diff --git a/sentry-samples/sentry-samples-spring-boot-4/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-4/build.gradle.kts index 9b127e1136f..ec91c09a3f2 100644 --- a/sentry-samples/sentry-samples-spring-boot-4/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-4/build.gradle.kts @@ -38,7 +38,7 @@ tasks.withType().configureEach { dependencies { implementation(libs.springboot4.starter) implementation(libs.springboot4.starter.actuator) - implementation(libs.springboot4.starter.aop) + implementation(libs.springboot4.starter.aspectj) implementation(libs.springboot4.starter.graphql) implementation(libs.springboot4.starter.jdbc) implementation(libs.springboot4.starter.quartz) diff --git a/sentry-spring-7/build.gradle.kts b/sentry-spring-7/build.gradle.kts index cb85ae85c36..a8071860ad0 100644 --- a/sentry-spring-7/build.gradle.kts +++ b/sentry-spring-7/build.gradle.kts @@ -67,7 +67,7 @@ dependencies { testImplementation(libs.kotlin.test.junit) testImplementation(libs.mockito.kotlin.spring7) testImplementation(libs.mockito.inline) - testImplementation(libs.springboot4.starter.aop) + testImplementation(libs.springboot4.starter.aspectj) testImplementation(libs.springboot4.starter.graphql) testImplementation(libs.springboot4.starter.security) testImplementation(libs.springboot4.starter.test) diff --git a/sentry-spring-boot-4/build.gradle.kts b/sentry-spring-boot-4/build.gradle.kts index 980fa7416e3..897d59c3c20 100644 --- a/sentry-spring-boot-4/build.gradle.kts +++ b/sentry-spring-boot-4/build.gradle.kts @@ -45,7 +45,7 @@ dependencies { compileOnly(libs.reactor.core) compileOnly(libs.servlet.jakarta.api) compileOnly(libs.springboot4.starter) - compileOnly(libs.springboot4.starter.aop) + compileOnly(libs.springboot4.starter.aspectj) compileOnly(libs.springboot4.starter.graphql) compileOnly(libs.springboot4.starter.quartz) compileOnly(libs.springboot4.starter.security) @@ -93,7 +93,7 @@ dependencies { */ // testImplementation(libs.springboot4.otel) testImplementation(libs.springboot4.starter) - testImplementation(libs.springboot4.starter.aop) + testImplementation(libs.springboot4.starter.aspectj) testImplementation(libs.springboot4.starter.graphql) testImplementation(libs.springboot4.starter.quartz) testImplementation(libs.springboot4.starter.security) From 28fb07806778a1043994289e670d6989da2ec16a Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Fri, 19 Sep 2025 11:13:53 +0200 Subject: [PATCH 2/2] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e7a027d5aa5..972c1e20522 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ options.isPropagateTraceparent = true } ``` +- Sentry now supports Spring Boot 4 M3 pre-release ([#4739](https://github.com/getsentry/sentry-java/pull/4739)) ### Improvements