From f756b62e9a82b815462e50a5f281d8405311bb40 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Tue, 21 Jan 2025 07:49:29 +0100 Subject: [PATCH 1/6] Bump Spring Boot to 3.4.1 --- buildSrc/src/main/java/Config.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index c52cfdc642c..8dc42f2aec0 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -7,7 +7,7 @@ object Config { val kotlinStdLib = "stdlib-jdk8" val springBootVersion = "2.7.5" - val springBoot3Version = "3.4.0" + val springBoot3Version = "3.4.1" val kotlinCompatibleLanguageVersion = "1.4" val composeVersion = "1.5.3" From b01287b5a0fb163169d231bc589ed484ef1506a5 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Tue, 21 Jan 2025 14:31:20 +0100 Subject: [PATCH 2/6] changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30aba6f1331..7aa53c5c9d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## Unreleased + +### Dependencies + +- Bump Spring Boot to `3.4.1` ([#4081](https://github.com/getsentry/sentry-java/pull/4081)) + ## 8.0.0 Version 8 of the Sentry Android/Java SDK brings a variety of features and fixes. The most notable changes are: From f21b0fb24fea0438591a7dfc503d2d7d4e9afd60 Mon Sep 17 00:00:00 2001 From: Lukas Bloder Date: Mon, 27 Jan 2025 10:35:09 +0100 Subject: [PATCH 3/6] update to spring boot 3.4.2 --- buildSrc/src/main/java/Config.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index 8dc42f2aec0..aadf7b14f82 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -7,7 +7,7 @@ object Config { val kotlinStdLib = "stdlib-jdk8" val springBootVersion = "2.7.5" - val springBoot3Version = "3.4.1" + val springBoot3Version = "3.4.2" val kotlinCompatibleLanguageVersion = "1.4" val composeVersion = "1.5.3" From 9f135dbb04b40007c3d48376e69369d9e9d83f96 Mon Sep 17 00:00:00 2001 From: Lukas Bloder Date: Mon, 27 Jan 2025 10:35:29 +0100 Subject: [PATCH 4/6] fix jdbc dependencies for jakarta samples --- .../build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- .../sentry-samples-spring-boot-jakarta/build.gradle.kts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts index eebb0dcd843..bd1bce43fe8 100644 --- a/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts @@ -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) diff --git a/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts index fe5dec4415f..f51c271f160 100644 --- a/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts @@ -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) diff --git a/sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts index 2f005736282..3ed7b0721af 100644 --- a/sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts @@ -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) From 0274a241e61835bbb741226a5959eb8ad8800249 Mon Sep 17 00:00:00 2001 From: Lukas Bloder Date: Mon, 27 Jan 2025 11:05:51 +0100 Subject: [PATCH 5/6] update readme --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14c86427e2c..e5d824a9c42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,7 +21,7 @@ ### Dependencies -- Bump Spring Boot to `3.4.1` ([#4081](https://github.com/getsentry/sentry-java/pull/4081)) +- Bump Spring Boot to `3.4.2` ([#4081](https://github.com/getsentry/sentry-java/pull/4081)) ## 8.0.0 From d8b89fa11372a54199d172e5ea9f664e7e065018 Mon Sep 17 00:00:00 2001 From: Lukas Bloder Date: Mon, 27 Jan 2025 11:49:44 +0100 Subject: [PATCH 6/6] update logback dependency in jakarta samples --- .../build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- .../sentry-samples-spring-boot-jakarta/build.gradle.kts | 2 +- .../sentry-samples-spring-boot-webflux-jakarta/build.gradle.kts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts index bd1bce43fe8..bd08b78c048 100644 --- a/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts @@ -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) } diff --git a/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts index f51c271f160..acfc0d24d9e 100644 --- a/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts @@ -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) } diff --git a/sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts index 3ed7b0721af..242859656c3 100644 --- a/sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts @@ -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) diff --git a/sentry-samples/sentry-samples-spring-boot-webflux-jakarta/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-webflux-jakarta/build.gradle.kts index 9b609180811..fcc34c8b5b3 100644 --- a/sentry-samples/sentry-samples-spring-boot-webflux-jakarta/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-webflux-jakarta/build.gradle.kts @@ -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) }