Skip to content

[WIP] test with spring boot 3.5.0 #4111

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 22 commits into from
May 23, 2025
Merged

[WIP] test with spring boot 3.5.0 #4111

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
f756b62
Bump Spring Boot to 3.4.1
adinauer Jan 21, 2025
0f27f4b
Merge branch 'main' into feat/spring-boot-3-4-1
adinauer Jan 21, 2025
b01287b
changelog
adinauer Jan 21, 2025
7a36d7f
Merge branch 'main' into feat/spring-boot-3-4-1
adinauer Jan 22, 2025
9a5f0d1
Merge branch 'main' into feat/spring-boot-3-4-1
lbloder Jan 24, 2025
f21b0fb
update to spring boot 3.4.2
lbloder Jan 27, 2025
9f135db
fix jdbc dependencies for jakarta samples
lbloder Jan 27, 2025
0274a24
update readme
lbloder Jan 27, 2025
d8b89fa
update logback dependency in jakarta samples
lbloder Jan 27, 2025
14b733f
[WIP] test with spring boot 3.5.0
lbloder Jan 27, 2025
048a214
Update buildSrc/src/main/java/Config.kt
adinauer Apr 28, 2025
dcb0cca
Merge branch 'main' into feat/test-spring-boot-3-5-0
adinauer Apr 28, 2025
4852dc8
adapt to breaking change in spring-graphql-1.4.0, fix test, add withO…
lbloder May 6, 2025
e31d911
bump to Spring Boot 3.5.0
lcian May 23, 2025
805f821
trigger CI?
lcian May 23, 2025
7a93089
Merge branch 'main' into feat/test-spring-boot-3-5-0
adinauer May 23, 2025
2d00bd3
update spring boot version in toml
adinauer May 23, 2025
c8968fe
move changelog
adinauer May 23, 2025
d41470a
revert maven milestone repos
adinauer May 23, 2025
088b6c2
fix changelog
adinauer May 23, 2025
f29b3d3
restore old changelog entry
adinauer May 23, 2025
55f4752
fix gh pr link
adinauer May 23, 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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@
- There was up to three of these, one for `io.sentry.opentelemetry.agent.AgentMarker`, `io.sentry.opentelemetry.agent.AgentlessMarker` and `io.sentry.opentelemetry.agent.AgentlessSpringMarker`.
- These were not indicators of something being wrong but rather the SDK looking at what is available at runtime to configure itself accordingly.

### Dependencies

- Bump Spring Boot to `3.4.2` ([#4081](https://github.com/getsentry/sentry-java/pull/4081))
Comment thread
adinauer marked this conversation as resolved.
Outdated

## 8.0.0

### Summary
Expand Down
2 changes: 2 additions & 0 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ plugins {
buildscript {
repositories {
google()
maven(url = "https://repo.spring.io/milestone")
Comment thread
adinauer marked this conversation as resolved.
Outdated
}
dependencies {
classpath(Config.BuildPlugins.androidGradle)
Expand Down Expand Up @@ -82,6 +83,7 @@ allprojects {
google()
mavenCentral()
mavenLocal()
maven(url = "https://repo.spring.io/milestone")
}
group = Config.Sentry.group
version = properties[Config.Sentry.versionNameProp].toString()
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/Config.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ object Config {
val kotlinStdLib = "stdlib-jdk8"

val springBootVersion = "2.7.5"
val springBoot3Version = "3.4.0"
val springBoot3Version = "3.5.0-M1"
Comment thread
adinauer marked this conversation as resolved.
Outdated
val kotlinCompatibleLanguageVersion = "1.4"

val composeVersion = "1.5.3"
Expand Down
4 changes: 2 additions & 2 deletions sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ dependencies {
implementation(Config.Libs.aspectj)
implementation(Config.Libs.springBoot3Starter)
implementation(Config.Libs.kotlinReflect)
implementation(Config.Libs.springBootStarterJdbc)
implementation(Config.Libs.springBoot3StarterJdbc)
implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
implementation(projects.sentrySpringBootStarterJakarta)
implementation(projects.sentryLogback)
Expand All @@ -62,7 +62,7 @@ dependencies {
}
testImplementation(kotlin(Config.kotlinStdLib))
testImplementation(Config.TestLibs.kotlinTestJunit)
testImplementation("ch.qos.logback:logback-classic:1.3.5")
testImplementation("ch.qos.logback:logback-classic:1.5.16")
testImplementation(Config.Libs.slf4jApi2)
testImplementation(Config.Libs.apolloKotlin)
}
Expand Down
4 changes: 2 additions & 2 deletions sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ dependencies {
implementation(Config.Libs.aspectj)
implementation(Config.Libs.springBoot3Starter)
implementation(Config.Libs.kotlinReflect)
implementation(Config.Libs.springBootStarterJdbc)
implementation(Config.Libs.springBoot3StarterJdbc)
implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
implementation(projects.sentrySpringBootStarterJakarta)
implementation(projects.sentryLogback)
Expand All @@ -63,7 +63,7 @@ dependencies {
}
testImplementation(kotlin(Config.kotlinStdLib))
testImplementation(Config.TestLibs.kotlinTestJunit)
testImplementation("ch.qos.logback:logback-classic:1.3.5")
testImplementation("ch.qos.logback:logback-classic:1.5.16")
testImplementation(Config.Libs.slf4jApi2)
testImplementation(Config.Libs.apolloKotlin)
}
Expand Down
4 changes: 2 additions & 2 deletions sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ dependencies {
implementation(Config.Libs.aspectj)
implementation(Config.Libs.springBoot3Starter)
implementation(Config.Libs.kotlinReflect)
implementation(Config.Libs.springBootStarterJdbc)
implementation(Config.Libs.springBoot3StarterJdbc)
implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
implementation(projects.sentrySpringBootStarterJakarta)
implementation(projects.sentryLogback)
Expand All @@ -61,7 +61,7 @@ dependencies {
}
testImplementation(kotlin(Config.kotlinStdLib))
testImplementation(Config.TestLibs.kotlinTestJunit)
testImplementation("ch.qos.logback:logback-classic:1.3.5")
testImplementation("ch.qos.logback:logback-classic:1.5.16")
testImplementation(Config.Libs.slf4jApi2)
testImplementation(Config.Libs.apolloKotlin)
testImplementation(projects.sentry)
Expand Down
2 changes: 1 addition & 1 deletion sentry-samples/sentry-samples-spring-boot-webflux-jakarta/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ dependencies {
}
testImplementation(kotlin(Config.kotlinStdLib))
testImplementation(Config.TestLibs.kotlinTestJunit)
testImplementation("ch.qos.logback:logback-classic:1.3.5")
testImplementation("ch.qos.logback:logback-classic:1.5.16")
testImplementation(Config.Libs.slf4jApi2)
testImplementation(Config.Libs.apolloKotlin)
}
Expand Down
1 change: 1 addition & 0 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ pluginManagement {
repositories {
mavenCentral()
gradlePluginPortal()
maven(url = "https://repo.spring.io/milestone")
}
}

Expand Down