From c130ad7ffccad1f14839ae8e490c1f9ecfee2ad7 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Tue, 2 Jul 2024 14:23:13 +0200 Subject: [PATCH 1/4] Bump Spring Boot to 3.3.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 7a0081d5f47..4b7d1814f37 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.2.0" + val springBoot3Version = "3.3.1" val kotlinCompatibleLanguageVersion = "1.4" val composeVersion = "1.5.3" From 5e112612e2c2a8d06dfc773d61cae85c7e165da3 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Tue, 2 Jul 2024 14:27:29 +0200 Subject: [PATCH 2/4] changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f67618933fa..bc37ccba2d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## Unreleased + +### Dependencies + +- Bump Spring Boot to 3.3.1 ([#3541](https://github.com/getsentry/sentry-java/pull/3541)) + ## 7.11.0 ### Features From 5f9cddf1a96b5634bfedbb6facc25643d497dbe8 Mon Sep 17 00:00:00 2001 From: Lukas Bloder Date: Mon, 8 Jul 2024 14:42:22 +0200 Subject: [PATCH 3/4] add specific classpath dependency for commons compress --- build.gradle.kts | 1 + buildSrc/src/main/java/Config.kt | 1 + 2 files changed, 2 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index 998c547efbb..4404ca40df4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -41,6 +41,7 @@ buildscript { classpath(Config.QualityPlugins.binaryCompatibilityValidatorPlugin) classpath(Config.BuildPlugins.composeGradlePlugin) + classpath(Config.BuildPlugins.commonsCompressOverride) } } diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index 4b7d1814f37..e9aca1de633 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -27,6 +27,7 @@ object Config { val dokkaPlugin = "org.jetbrains.dokka:dokka-gradle-plugin:1.7.10" val dokkaPluginAlias = "org.jetbrains.dokka" val composeGradlePlugin = "org.jetbrains.compose:compose-gradle-plugin:$composeVersion" + val commonsCompressOverride = "org.apache.commons:commons-compress:1.25.0" } object Android { From 631899e9667964a929f0822f5c74b1c4a3bbd61a Mon Sep 17 00:00:00 2001 From: Lukas Bloder Date: Mon, 29 Jul 2024 13:12:33 +0200 Subject: [PATCH 4/4] bump to latest patch release of spring boot --- 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 e9aca1de633..375999587d8 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.3.1" + val springBoot3Version = "3.3.2" val kotlinCompatibleLanguageVersion = "1.4" val composeVersion = "1.5.3"