From d94c7778c71cffb5001c0345a53b95cdd9c39019 Mon Sep 17 00:00:00 2001 From: Nelson Osacky Date: Wed, 18 Nov 2026 11:36:30 +0100 Subject: [PATCH 1/2] ci(spring): Drop Spring Boot 3.2 and 3.3 from the test matrix Spring's commercial support for 3.2 ended on 2025-12-31 and for 3.3 on 2026-06-30, so 9.0's Spring Boot 3 integrations are now tested against 3.4.13 and 3.5.13. Nothing gated on 3.2 or 3.3, so the matrix file is the only change besides the e2e rule's example task names, which named the 3.2.12 tasks. Fixes #6370 Refs JAVA-799 Co-Authored-By: Claude Opus 5.5 --- .cursor/rules/e2e_tests.mdc | 8 ++++---- gradle/spring-boot-versions.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.cursor/rules/e2e_tests.mdc b/.cursor/rules/e2e_tests.mdc index 8295253b07f..f4d54c7a629 100644 --- a/.cursor/rules/e2e_tests.mdc +++ b/.cursor/rules/e2e_tests.mdc @@ -69,12 +69,12 @@ both on each version. - The `springBootMatrix` block in each Spring module's build file runs its suites on every version of its Spring Boot line in `gradle/spring-boot-versions.json`, with a task per suite and version, - e.g. `integrationTestWebfluxBoot3_2_12`. The suites and the SDK compile once, against the - catalog's version; only the runtime classpath changes. `allIntegrationTestsBoot3_2_12` runs one + e.g. `integrationTestWebfluxBoot3_4_13`. The suites and the SDK compile once, against the + catalog's version; only the runtime classpath changes. `allIntegrationTestsBoot3_4_13` runs one version's suites, `allIntegrationTestsBoot3` every version's. - The `spring-boot-{2,3,4}-matrix.yml` workflows read the same file and run each version in its own - job, e.g. `./gradlew :sentry-spring-jakarta:allIntegrationTestsBoot3_2_12 - :sentry-spring-boot-jakarta:allIntegrationTestsBoot3_2_12`. The suites aren't part of `check`, so + job, e.g. `./gradlew :sentry-spring-jakarta:allIntegrationTestsBoot3_4_13 + :sentry-spring-boot-jakarta:allIntegrationTestsBoot3_4_13`. The suites aren't part of `check`, so a new suite only runs on CI once it's added to its module's `springBootMatrix` block, and a new module once it's added to its workflow. - Suite code may only use APIs that exist in the oldest version of its line. Compiled against a diff --git a/gradle/spring-boot-versions.json b/gradle/spring-boot-versions.json index efe0fdd0624..8cf4c6848ba 100644 --- a/gradle/spring-boot-versions.json +++ b/gradle/spring-boot-versions.json @@ -1,5 +1,5 @@ { "boot2": ["2.7.0", "2.7.18"], - "boot3": ["3.2.12", "3.3.13", "3.4.13", "3.5.13"], + "boot3": ["3.4.13", "3.5.13"], "boot4": ["4.0.0", "4.0.5", "4.1.0"] } From bdca541592c6e82bc582c11305640682cb5c7550 Mon Sep 17 00:00:00 2001 From: Nelson Osacky Date: Wed, 18 Nov 2026 11:37:02 +0100 Subject: [PATCH 2/2] changelog Co-Authored-By: Claude Opus 5.5 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index be7899e2dd6..6fadaaa8f03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ ### Breaking Changes +- The Spring Boot 3 integrations are tested against Spring Boot 3.4 and newer. Spring Boot 3.2 and 3.3 are no longer supported ([#6656](https://github.com/getsentry/sentry-java/pull/6656)) - Remove the deprecated `io.sentry.android.core.LoadClass`. Use `io.sentry.util.LoadClass` instead ([#6594](https://github.com/getsentry/sentry-java/pull/6594)) - `SentryOptions.getIgnoredErrors()`, `getIgnoredTransactions()`, `getIgnoredCheckIns()` and `getIgnoredSpanOrigins()` now return `List` instead of `List`, matching their setters ([#6489](https://github.com/getsentry/sentry-java/pull/6489)) - The SDK is now compiled for Java 11 instead of Java 8. JVM applications need Java 11 or newer ([#6459](https://github.com/getsentry/sentry-java/pull/6459))