Merge d858319 into b03edbb

adinauer · web-flow · commit 16737826de6a · 2025-11-21T09:35:56.000+01:00
diff --git 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:
diff --git 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"
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
@@ -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)
       }

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,6 @@ class SentrySpanRestClientCustomizerTest {`
`89`	`89`	`.disableAutomaticRetries() // Required to not make another request automatically`
`90`	`90`	`.build()`
`91`	`91`	`val requestFactory = HttpComponentsClientHttpRequestFactory(httpClient)`
`92`		`- requestFactory.setConnectTimeout(Duration.ofSeconds(2))`
`93`	`92`	`requestFactory.setConnectionRequestTimeout(Duration.ofSeconds(2))`
`94`	`93`	`it.requestFactory(requestFactory)`
`95`	`94`	`}`