Skip to content

Replace pre-releases in Spring Boot 4 matrix with GA release #4924

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adinauer merged 4 commits into from
Nov 21, 2025
Merged

Replace pre-releases in Spring Boot 4 matrix with GA release #4924

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
359f6de
bump spring boot 4
adinauer Nov 21, 2025
32ea309
remove removed method from test
adinauer Nov 21, 2025
d858319
replace pre-releases in Spring Boot 4 matrix with GA release
adinauer Nov 21, 2025
fd1ad21
Merge branch 'main' into feat/spring-boot-4-matrix
adinauer Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/spring-boot-4-matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion ...pring-boot-4/src/test/kotlin/io/sentry/spring/boot4/SentrySpanRestClientCustomizerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
Loading