Skip to content

Commit 216dd35

Browse files
authored
Merge branch 'main' into feat/suppressed_exceptions_mechanism_type
2 parents c0295c7 + 1683fbb commit 216dd35

6 files changed

Lines changed: 12 additions & 8 deletions

File tree

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
- Set mechanism `type` to `suppressed` for suppressed exceptions ([#4125](https://github.com/getsentry/sentry-java/pull/4125))
2222
- This helps to distinguish an exceptions cause from any suppressed exceptions in the Sentry UI
2323

24+
### Dependencies
25+
26+
- Bump Spring Boot to `3.4.2` ([#4081](https://github.com/getsentry/sentry-java/pull/4081))
27+
2428
## 8.0.0
2529

2630
### Summary

buildSrc/src/main/java/Config.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ object Config {
77
val kotlinStdLib = "stdlib-jdk8"
88

99
val springBootVersion = "2.7.5"
10-
val springBoot3Version = "3.4.0"
10+
val springBoot3Version = "3.4.2"
1111
val kotlinCompatibleLanguageVersion = "1.4"
1212

1313
val composeVersion = "1.5.3"

sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ dependencies {
4646
implementation(Config.Libs.aspectj)
4747
implementation(Config.Libs.springBoot3Starter)
4848
implementation(Config.Libs.kotlinReflect)
49-
implementation(Config.Libs.springBootStarterJdbc)
49+
implementation(Config.Libs.springBoot3StarterJdbc)
5050
implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
5151
implementation(projects.sentrySpringBootStarterJakarta)
5252
implementation(projects.sentryLogback)
@@ -62,7 +62,7 @@ dependencies {
6262
}
6363
testImplementation(kotlin(Config.kotlinStdLib))
6464
testImplementation(Config.TestLibs.kotlinTestJunit)
65-
testImplementation("ch.qos.logback:logback-classic:1.3.5")
65+
testImplementation("ch.qos.logback:logback-classic:1.5.16")
6666
testImplementation(Config.Libs.slf4jApi2)
6767
testImplementation(Config.Libs.apolloKotlin)
6868
}

sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ dependencies {
4747
implementation(Config.Libs.aspectj)
4848
implementation(Config.Libs.springBoot3Starter)
4949
implementation(Config.Libs.kotlinReflect)
50-
implementation(Config.Libs.springBootStarterJdbc)
50+
implementation(Config.Libs.springBoot3StarterJdbc)
5151
implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
5252
implementation(projects.sentrySpringBootStarterJakarta)
5353
implementation(projects.sentryLogback)
@@ -63,7 +63,7 @@ dependencies {
6363
}
6464
testImplementation(kotlin(Config.kotlinStdLib))
6565
testImplementation(Config.TestLibs.kotlinTestJunit)
66-
testImplementation("ch.qos.logback:logback-classic:1.3.5")
66+
testImplementation("ch.qos.logback:logback-classic:1.5.16")
6767
testImplementation(Config.Libs.slf4jApi2)
6868
testImplementation(Config.Libs.apolloKotlin)
6969
}

sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ dependencies {
4646
implementation(Config.Libs.aspectj)
4747
implementation(Config.Libs.springBoot3Starter)
4848
implementation(Config.Libs.kotlinReflect)
49-
implementation(Config.Libs.springBootStarterJdbc)
49+
implementation(Config.Libs.springBoot3StarterJdbc)
5050
implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
5151
implementation(projects.sentrySpringBootStarterJakarta)
5252
implementation(projects.sentryLogback)
@@ -61,7 +61,7 @@ dependencies {
6161
}
6262
testImplementation(kotlin(Config.kotlinStdLib))
6363
testImplementation(Config.TestLibs.kotlinTestJunit)
64-
testImplementation("ch.qos.logback:logback-classic:1.3.5")
64+
testImplementation("ch.qos.logback:logback-classic:1.5.16")
6565
testImplementation(Config.Libs.slf4jApi2)
6666
testImplementation(Config.Libs.apolloKotlin)
6767
testImplementation(projects.sentry)

sentry-samples/sentry-samples-spring-boot-webflux-jakarta/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ dependencies {
3535
}
3636
testImplementation(kotlin(Config.kotlinStdLib))
3737
testImplementation(Config.TestLibs.kotlinTestJunit)
38-
testImplementation("ch.qos.logback:logback-classic:1.3.5")
38+
testImplementation("ch.qos.logback:logback-classic:1.5.16")
3939
testImplementation(Config.Libs.slf4jApi2)
4040
testImplementation(Config.Libs.apolloKotlin)
4141
}

0 commit comments

Comments
 (0)