Skip to content
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

Upgrade Spring Boot dependency to 2.5.13 #2011

Merged
merged 2 commits into from
Apr 27, 2022
Merged

Upgrade Spring Boot dependency to 2.5.13 #2011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac56660
Upgrade Spring Boot to 2.5.13
maciejwalkowiak Apr 26, 2022
52e2914
Changelog
maciejwalkowiak Apr 26, 2022
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Starting with version `6.6.0` of the `sentry`, [Sentry's version >= v21.9.0](htt

* Fix: Profiling rate decreased from 300hz to 100hz; fixed profiling traces folder creation on manual sdk init (#1997)
* Fix: Allow disabling sending of client reports via Android Manifest and external options (#2007)
* Ref: Upgrade Spring Boot dependency to 2.5.13 (#2011)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@maciejwalkowiak or @adinauer please also add it to https://docs.sentry.io/platforms/java/migration/

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It does not require anything from users migrating to Sentry SDK 6.0


## 6.0.0-alpha.6

Expand Down
4 changes: 1 addition & 3 deletions buildSrc/src/main/java/Config.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ object Config {
val kotlinVersion = "1.5.31"
val kotlinStdLib = "stdlib-jdk8"

val springBootVersion = "2.4.4"
// Spring is currently not compatible with Kotlin 1.4
val springKotlinCompatibleLanguageVersion = "1.3"
val springBootVersion = "2.5.13"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this a breaking change to folks? As in they'll be stuck on an older version?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, similar to Logback and Log4j - we do not dictate the Spring Boot version used in user projects (as explained here #2010 (comment)). It only changes version used by us and as long as we don't use anything that got introduced in 2.5 we're good. Anyways, 2.4 reached end of life and all Spring Boot users are recommended to upgrade to >= 2.5

val kotlinCompatibleLanguageVersion = "1.4"

object BuildPlugins {
Expand Down
2 changes: 1 addition & 1 deletion sentry-apache-http-client-5/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ configure<JavaPluginExtension> {

tasks.withType<KotlinCompile>().configureEach {
kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
kotlinOptions.languageVersion = Config.springKotlinCompatibleLanguageVersion
kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion
}

dependencies {
Expand Down
6 changes: 3 additions & 3 deletions sentry-servlet-jakarta/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ configure<JavaPluginExtension> {

tasks.withType<KotlinCompile>().configureEach {
kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
kotlinOptions.languageVersion = Config.springKotlinCompatibleLanguageVersion
kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion
}

dependencies {
Expand Down Expand Up @@ -82,12 +82,12 @@ repositories {
val compileKotlin: KotlinCompile by tasks
compileKotlin.kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
languageVersion = Config.springKotlinCompatibleLanguageVersion
languageVersion = Config.kotlinCompatibleLanguageVersion
}
val compileTestKotlin: KotlinCompile by tasks
compileTestKotlin.kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
languageVersion = Config.springKotlinCompatibleLanguageVersion
languageVersion = Config.kotlinCompatibleLanguageVersion
}

tasks.withType<JavaCompile>().configureEach {
Expand Down
6 changes: 3 additions & 3 deletions sentry-servlet/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ configure<JavaPluginExtension> {

tasks.withType<KotlinCompile>().configureEach {
kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
kotlinOptions.languageVersion = Config.springKotlinCompatibleLanguageVersion
kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion
}

dependencies {
Expand Down Expand Up @@ -83,12 +83,12 @@ repositories {
val compileKotlin: KotlinCompile by tasks
compileKotlin.kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
languageVersion = Config.springKotlinCompatibleLanguageVersion
languageVersion = Config.kotlinCompatibleLanguageVersion
}
val compileTestKotlin: KotlinCompile by tasks
compileTestKotlin.kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
languageVersion = Config.springKotlinCompatibleLanguageVersion
languageVersion = Config.kotlinCompatibleLanguageVersion
}

tasks.withType<JavaCompile>().configureEach {
Expand Down
2 changes: 1 addition & 1 deletion sentry-spring-boot-starter/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ configure<JavaPluginExtension> {

tasks.withType<KotlinCompile>().configureEach {
kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
kotlinOptions.languageVersion = Config.springKotlinCompatibleLanguageVersion
kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion sentry-spring/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ configure<JavaPluginExtension> {

tasks.withType<KotlinCompile>().configureEach {
kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
kotlinOptions.languageVersion = Config.springKotlinCompatibleLanguageVersion
kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion
}

dependencies {
Expand Down