From 359f6de1a0cb9aa965bc4e50ce8b090d46804ff0 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Fri, 21 Nov 2025 08:25:33 +0100 Subject: [PATCH 1/3] bump spring boot 4 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3432bad6ee..9a60c852f6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -32,7 +32,7 @@ retrofit = "2.9.0" slf4j = "1.7.30" springboot2 = "2.7.18" springboot3 = "3.5.0" -springboot4 = "4.0.0-RC2" +springboot4 = "4.0.0" # Android targetSdk = "34" compileSdk = "34" From 32ea3093d233c414535b1ce053bbabc50d880fe1 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Fri, 21 Nov 2025 09:01:41 +0100 Subject: [PATCH 2/3] remove removed method from test --- .../io/sentry/spring/boot4/SentrySpanRestClientCustomizerTest.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/sentry-spring-boot-4/src/test/kotlin/io/sentry/spring/boot4/SentrySpanRestClientCustomizerTest.kt b/sentry-spring-boot-4/src/test/kotlin/io/sentry/spring/boot4/SentrySpanRestClientCustomizerTest.kt index 8c19c7c706..7b50e923b1 100644 --- a/sentry-spring-boot-4/src/test/kotlin/io/sentry/spring/boot4/SentrySpanRestClientCustomizerTest.kt +++ b/sentry-spring-boot-4/src/test/kotlin/io/sentry/spring/boot4/SentrySpanRestClientCustomizerTest.kt @@ -89,7 +89,6 @@ class SentrySpanRestClientCustomizerTest { .disableAutomaticRetries() // Required to not make another request automatically .build() val requestFactory = HttpComponentsClientHttpRequestFactory(httpClient) - requestFactory.setConnectTimeout(Duration.ofSeconds(2)) requestFactory.setConnectionRequestTimeout(Duration.ofSeconds(2)) it.requestFactory(requestFactory) } From d8583192c632984e01c1e1f628b7777e3ea7d6ac Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Fri, 21 Nov 2025 09:35:15 +0100 Subject: [PATCH 3/3] replace pre-releases in Spring Boot 4 matrix with GA release --- .github/workflows/spring-boot-4-matrix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/spring-boot-4-matrix.yml b/.github/workflows/spring-boot-4-matrix.yml index ddc84f3954..570cadfcd3 100644 --- a/.github/workflows/spring-boot-4-matrix.yml +++ b/.github/workflows/spring-boot-4-matrix.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - springboot-version: [ '4.0.0-M1', '4.0.0-M2', '4.0.0-M3' ] + springboot-version: [ '4.0.0' ] name: Spring Boot ${{ matrix.springboot-version }} env: