Skip to content

Migrate spring boot dependencies to version catalog #4441

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
merged 4 commits into from
May 28, 2025
Merged

Migrate spring boot dependencies to version catalog #4441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d34aedb
Migrate spring boot dependencies to version catalog
rbro112 May 22, 2025
f56b92c
Fixes
rbro112 May 23, 2025
8f2e822
Format code
getsentry-bot May 28, 2025
95c60dc
Spotless
rbro112 May 28, 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
24 changes: 0 additions & 24 deletions buildSrc/src/main/java/Config.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,30 +53,6 @@ object Config {
val jacksonDatabind = "com.fasterxml.jackson.core:jackson-databind:2.18.3"
val jacksonKotlin = "com.fasterxml.jackson.module:jackson-module-kotlin:2.18.3"

val springBootStarter = "org.springframework.boot:spring-boot-starter:$springBootVersion"
val springBootStarterGraphql = "org.springframework.boot:spring-boot-starter-graphql:$springBootVersion"
val springBootStarterQuartz = "org.springframework.boot:spring-boot-starter-quartz:$springBootVersion"
val springBootStarterTest = "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
val springBootStarterWeb = "org.springframework.boot:spring-boot-starter-web:$springBootVersion"
val springBootStarterWebsocket = "org.springframework.boot:spring-boot-starter-websocket:$springBootVersion"
val springBootStarterWebflux = "org.springframework.boot:spring-boot-starter-webflux:$springBootVersion"
val springBootStarterAop = "org.springframework.boot:spring-boot-starter-aop:$springBootVersion"
val springBootStarterSecurity = "org.springframework.boot:spring-boot-starter-security:$springBootVersion"
val springBootStarterJdbc = "org.springframework.boot:spring-boot-starter-jdbc:$springBootVersion"
val springBootStarterActuator = "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"

val springBoot3Starter = "org.springframework.boot:spring-boot-starter:$springBoot3Version"
val springBoot3StarterGraphql = "org.springframework.boot:spring-boot-starter-graphql:$springBoot3Version"
val springBoot3StarterQuartz = "org.springframework.boot:spring-boot-starter-quartz:$springBoot3Version"
val springBoot3StarterTest = "org.springframework.boot:spring-boot-starter-test:$springBoot3Version"
val springBoot3StarterWeb = "org.springframework.boot:spring-boot-starter-web:$springBoot3Version"
val springBoot3StarterWebsocket = "org.springframework.boot:spring-boot-starter-websocket:$springBoot3Version"
val springBoot3StarterWebflux = "org.springframework.boot:spring-boot-starter-webflux:$springBoot3Version"
val springBoot3StarterAop = "org.springframework.boot:spring-boot-starter-aop:$springBoot3Version"
val springBoot3StarterSecurity = "org.springframework.boot:spring-boot-starter-security:$springBoot3Version"
val springBoot3StarterJdbc = "org.springframework.boot:spring-boot-starter-jdbc:$springBoot3Version"
val springBoot3StarterActuator = "org.springframework.boot:spring-boot-starter-actuator:$springBoot3Version"

val springWeb = "org.springframework:spring-webmvc"
val springWebflux = "org.springframework:spring-webflux"
val springSecurityWeb = "org.springframework.security:spring-security-web"
Expand Down
30 changes: 26 additions & 4 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ otelInstrumentation = "2.10.0"
otelInstrumentationAlpha = "2.10.0-alpha"
# check https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/dependencyManagement/build.gradle.kts#L49 for release version above to find a compatible version
otelSemanticConventions = "1.28.0-alpha"
springTwo = "2.7.18"
springThree = "3.5.0"
springboot2 = "2.7.18"
springboot3 = "3.5.0"
targetSdk = "34"
compileSdk = "34"
minSdk = "21"
Expand All @@ -35,8 +35,8 @@ detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.8" }
jacoco-android = { id = "com.mxalbert.gradle.jacoco-android", version = "0.2.0" }
kover = { id = "org.jetbrains.kotlinx.kover", version = "0.7.3" }
vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version = "0.30.0" }
spring-boot-two = { id = "org.springframework.boot", version.ref = "springTwo" }
spring-boot-three = { id = "org.springframework.boot", version.ref = "springThree" }
springboot2 = { id = "org.springframework.boot", version.ref = "springboot2" }
springboot3 = { id = "org.springframework.boot", version.ref = "springboot3" }
spring-dependency-management = { id = "io.spring.dependency-management", version = "1.0.11.RELEASE" }
gretty = { id = "org.gretty", version = "4.0.0" }

Expand All @@ -63,7 +63,29 @@ otel-javaagent-tooling = { module = "io.opentelemetry.javaagent:opentelemetry-ja
otel-javaagent-extension-api = { module = "io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api", version.ref = "otelInstrumentationAlpha" }
otel-semconv = { module = "io.opentelemetry.semconv:opentelemetry-semconv", version.ref = "otelSemanticConventions" }
otel-semconv-incubating = { module = "io.opentelemetry.semconv:opentelemetry-semconv-incubating", version.ref = "otelSemanticConventions" }
springboot-starter = { module = "org.springframework.boot:spring-boot-starter", version.ref = "springboot2" }
springboot-starter-graphql = { module = "org.springframework.boot:spring-boot-starter-graphql", version.ref = "springboot2" }
springboot-starter-quartz = { module = "org.springframework.boot:spring-boot-starter-quartz", version.ref = "springboot2" }
springboot-starter-test = { module = "org.springframework.boot:spring-boot-starter-test", version.ref = "springboot2" }
springboot-starter-web = { module = "org.springframework.boot:spring-boot-starter-web", version.ref = "springboot2" }
springboot-starter-websocket = { module = "org.springframework.boot:spring-boot-starter-websocket", version.ref = "springboot2" }
springboot-starter-webflux = { module = "org.springframework.boot:spring-boot-starter-webflux", version.ref = "springboot2" }
springboot-starter-aop = { module = "org.springframework.boot:spring-boot-starter-aop", version.ref = "springboot2" }
springboot-starter-security = { module = "org.springframework.boot:spring-boot-starter-security", version.ref = "springboot2" }
springboot-starter-jdbc = { module = "org.springframework.boot:spring-boot-starter-jdbc", version.ref = "springboot2" }
springboot-starter-actuator = { module = "org.springframework.boot:spring-boot-starter-actuator", version.ref = "springboot2" }
springboot3-otel = { module = "io.opentelemetry.instrumentation:opentelemetry-spring-boot-starter", version.ref = "otelInstrumentation" }
springboot3-starter = { module = "org.springframework.boot:spring-boot-starter", version.ref = "springboot3" }
springboot3-starter-graphql = { module = "org.springframework.boot:spring-boot-starter-graphql", version.ref = "springboot3" }
springboot3-starter-quartz = { module = "org.springframework.boot:spring-boot-starter-quartz", version.ref = "springboot3" }
springboot3-starter-test = { module = "org.springframework.boot:spring-boot-starter-test", version.ref = "springboot3" }
springboot3-starter-web = { module = "org.springframework.boot:spring-boot-starter-web", version.ref = "springboot3" }
springboot3-starter-websocket = { module = "org.springframework.boot:spring-boot-starter-websocket", version.ref = "springboot3" }
springboot3-starter-webflux = { module = "org.springframework.boot:spring-boot-starter-webflux", version.ref = "springboot3" }
springboot3-starter-aop = { module = "org.springframework.boot:spring-boot-starter-aop", version.ref = "springboot3" }
springboot3-starter-security = { module = "org.springframework.boot:spring-boot-starter-security", version.ref = "springboot3" }
springboot3-starter-jdbc = { module = "org.springframework.boot:spring-boot-starter-jdbc", version.ref = "springboot3" }
springboot3-starter-actuator = { module = "org.springframework.boot:spring-boot-starter-actuator", version.ref = "springboot3" }

# test libraries
androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version = "1.6.8" }
Expand Down
2 changes: 1 addition & 1 deletion sentry-graphql-22/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ dependencies {
testImplementation(libs.mockito.kotlin)
testImplementation(libs.mockito.inline)
testImplementation(libs.okhttp.mockwebserver)
testImplementation(libs.springboot.starter.graphql)
testImplementation(Config.Libs.okhttp)
testImplementation(Config.Libs.springBootStarterGraphql)
testImplementation("com.netflix.graphql.dgs:graphql-error-types:4.9.2")
testImplementation(Config.Libs.graphQlJava22)
}
Expand Down
2 changes: 1 addition & 1 deletion sentry-graphql-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ dependencies {
testImplementation(libs.mockito.kotlin)
testImplementation(libs.mockito.inline)
testImplementation(libs.okhttp.mockwebserver)
testImplementation(libs.springboot.starter.graphql)
testImplementation(Config.Libs.okhttp)
testImplementation(Config.Libs.springBootStarterGraphql)
testImplementation("com.netflix.graphql.dgs:graphql-error-types:4.9.2")
testImplementation(Config.Libs.graphQlJava)
}
Expand Down
2 changes: 1 addition & 1 deletion sentry-graphql/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ dependencies {
testImplementation(libs.mockito.kotlin)
testImplementation(libs.mockito.inline)
testImplementation(libs.okhttp.mockwebserver)
testImplementation(libs.springboot.starter.graphql)
testImplementation(Config.Libs.okhttp)
testImplementation(Config.Libs.springBootStarterGraphql)
testImplementation("com.netflix.graphql.dgs:graphql-error-types:4.9.2")
testImplementation(Config.Libs.graphQlJava)
}
Expand Down
6 changes: 3 additions & 3 deletions sentry-samples/sentry-samples-netflix-dgs/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import org.jetbrains.kotlin.config.KotlinCompilerVersion
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
alias(libs.plugins.spring.boot.two)
alias(libs.plugins.springboot2)
alias(libs.plugins.spring.dependency.management)
kotlin("jvm")
alias(libs.plugins.kotlin.spring)
Expand All @@ -18,15 +18,15 @@ repositories {
}

dependencies {
implementation(Config.Libs.springBootStarterWeb)
implementation(libs.springboot.starter.web)
implementation(Config.Libs.kotlinReflect)
implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
implementation(projects.sentrySpringBootStarter)
implementation(projects.sentryGraphql)
implementation(platform("com.netflix.graphql.dgs:graphql-dgs-platform-dependencies:4.9.2"))
implementation("com.netflix.graphql.dgs:graphql-dgs-subscriptions-websockets-autoconfigure:4.9.2")
implementation("com.netflix.graphql.dgs:graphql-dgs-spring-boot-starter")
testImplementation(Config.Libs.springBootStarterTest) {
testImplementation(libs.springboot.starter.test) {
exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
}
}
Expand Down
24 changes: 12 additions & 12 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 @@ -2,7 +2,7 @@ import org.jetbrains.kotlin.config.KotlinCompilerVersion
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
alias(libs.plugins.spring.boot.three)
alias(libs.plugins.springboot3)
alias(libs.plugins.spring.dependency.management)
kotlin("jvm")
alias(libs.plugins.kotlin.spring)
Expand Down Expand Up @@ -31,18 +31,18 @@ tasks.withType<KotlinCompile>().configureEach {
}

dependencies {
implementation(Config.Libs.springBoot3StarterSecurity)
implementation(Config.Libs.springBoot3StarterActuator)
implementation(Config.Libs.springBoot3StarterWeb)
implementation(Config.Libs.springBoot3StarterWebsocket)
implementation(Config.Libs.springBoot3StarterGraphql)
implementation(Config.Libs.springBoot3StarterQuartz)
implementation(Config.Libs.springBoot3StarterWebflux)
implementation(Config.Libs.springBoot3StarterAop)
implementation(libs.springboot3.starter)
implementation(libs.springboot3.starter.actuator)
implementation(libs.springboot3.starter.aop)
implementation(libs.springboot3.starter.graphql)
implementation(libs.springboot3.starter.jdbc)
implementation(libs.springboot3.starter.quartz)
implementation(libs.springboot3.starter.security)
implementation(libs.springboot3.starter.web)
implementation(libs.springboot3.starter.webflux)
implementation(libs.springboot3.starter.websocket)
implementation(Config.Libs.aspectj)
implementation(Config.Libs.springBoot3Starter)
implementation(Config.Libs.kotlinReflect)
implementation(Config.Libs.springBoot3StarterJdbc)
implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
implementation(projects.sentrySpringBootStarterJakarta)
implementation(projects.sentryLogback)
Expand All @@ -55,7 +55,7 @@ dependencies {
runtimeOnly(libs.hsqldb)

testImplementation(projects.sentrySystemTestSupport)
testImplementation(Config.Libs.springBoot3StarterTest) {
testImplementation(libs.springboot3.starter.test) {
exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
}
testImplementation(kotlin(Config.kotlinStdLib))
Expand Down
24 changes: 12 additions & 12 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 @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.springframework.boot.gradle.tasks.run.BootRun

plugins {
alias(libs.plugins.spring.boot.three)
alias(libs.plugins.springboot3)
alias(libs.plugins.spring.dependency.management)
kotlin("jvm")
alias(libs.plugins.kotlin.spring)
Expand Down Expand Up @@ -35,18 +35,18 @@ tasks.withType<KotlinCompile>().configureEach {
}

dependencies {
implementation(Config.Libs.springBoot3StarterSecurity)
implementation(Config.Libs.springBoot3StarterActuator)
implementation(Config.Libs.springBoot3StarterWeb)
implementation(Config.Libs.springBoot3StarterWebsocket)
implementation(Config.Libs.springBoot3StarterGraphql)
implementation(Config.Libs.springBoot3StarterQuartz)
implementation(Config.Libs.springBoot3StarterWebflux)
implementation(Config.Libs.springBoot3StarterAop)
implementation(libs.springboot3.starter)
implementation(libs.springboot3.starter.actuator)
implementation(libs.springboot3.starter.aop)
implementation(libs.springboot3.starter.graphql)
implementation(libs.springboot3.starter.jdbc)
implementation(libs.springboot3.starter.quartz)
implementation(libs.springboot3.starter.security)
implementation(libs.springboot3.starter.web)
implementation(libs.springboot3.starter.webflux)
implementation(libs.springboot3.starter.websocket)
implementation(Config.Libs.aspectj)
implementation(Config.Libs.springBoot3Starter)
implementation(Config.Libs.kotlinReflect)
implementation(Config.Libs.springBoot3StarterJdbc)
implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
implementation(projects.sentrySpringBootStarterJakarta)
implementation(projects.sentryLogback)
Expand All @@ -59,7 +59,7 @@ dependencies {
runtimeOnly(libs.hsqldb)

testImplementation(projects.sentrySystemTestSupport)
testImplementation(Config.Libs.springBoot3StarterTest) {
testImplementation(libs.springboot3.starter.test) {
exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
}
testImplementation(kotlin(Config.kotlinStdLib))
Expand Down
24 changes: 12 additions & 12 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 @@ -2,7 +2,7 @@ import org.jetbrains.kotlin.config.KotlinCompilerVersion
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
alias(libs.plugins.spring.boot.three)
alias(libs.plugins.springboot3)
alias(libs.plugins.spring.dependency.management)
kotlin("jvm")
alias(libs.plugins.kotlin.spring)
Expand Down Expand Up @@ -34,18 +34,18 @@ tasks.withType<KotlinCompile>().configureEach {
}

dependencies {
implementation(Config.Libs.springBoot3StarterSecurity)
implementation(Config.Libs.springBoot3StarterActuator)
implementation(Config.Libs.springBoot3StarterWeb)
implementation(Config.Libs.springBoot3StarterWebsocket)
implementation(Config.Libs.springBoot3StarterGraphql)
implementation(Config.Libs.springBoot3StarterQuartz)
implementation(Config.Libs.springBoot3StarterWebflux)
implementation(Config.Libs.springBoot3StarterAop)
implementation(libs.springboot3.starter)
implementation(libs.springboot3.starter.actuator)
implementation(libs.springboot3.starter.aop)
implementation(libs.springboot3.starter.graphql)
implementation(libs.springboot3.starter.jdbc)
implementation(libs.springboot3.starter.quartz)
implementation(libs.springboot3.starter.security)
implementation(libs.springboot3.starter.web)
implementation(libs.springboot3.starter.webflux)
implementation(libs.springboot3.starter.websocket)
implementation(Config.Libs.aspectj)
implementation(Config.Libs.springBoot3Starter)
implementation(Config.Libs.kotlinReflect)
implementation(Config.Libs.springBoot3StarterJdbc)
implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
implementation(projects.sentrySpringBootStarterJakarta)
implementation(projects.sentryLogback)
Expand All @@ -57,7 +57,7 @@ dependencies {
runtimeOnly(libs.hsqldb)

testImplementation(projects.sentrySystemTestSupport)
testImplementation(Config.Libs.springBoot3StarterTest) {
testImplementation(libs.springboot3.starter.test) {
exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
}
testImplementation(kotlin(Config.kotlinStdLib))
Expand Down
24 changes: 12 additions & 12 deletions sentry-samples/sentry-samples-spring-boot-opentelemetry-noagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import org.jetbrains.kotlin.config.KotlinCompilerVersion
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
alias(libs.plugins.spring.boot.two)
alias(libs.plugins.springboot2)
alias(libs.plugins.spring.dependency.management)
kotlin("jvm")
alias(libs.plugins.kotlin.spring)
Expand Down Expand Up @@ -34,18 +34,18 @@ tasks.withType<KotlinCompile>().configureEach {
}

dependencies {
implementation(Config.Libs.springBootStarterSecurity)
implementation(Config.Libs.springBootStarterWeb)
implementation(Config.Libs.springBootStarterWebsocket)
implementation(Config.Libs.springBootStarterWebflux)
implementation(Config.Libs.springBootStarterGraphql)
implementation(Config.Libs.springBootStarterQuartz)
implementation(Config.Libs.springBootStarterAop)
implementation(Config.Libs.springBootStarterActuator)
implementation(libs.springboot.starter)
implementation(libs.springboot.starter.actuator)
implementation(libs.springboot.starter.aop)
implementation(libs.springboot.starter.graphql)
implementation(libs.springboot.starter.jdbc)
implementation(libs.springboot.starter.quartz)
implementation(libs.springboot.starter.security)
implementation(libs.springboot.starter.web)
implementation(libs.springboot.starter.webflux)
implementation(libs.springboot.starter.websocket)
implementation(Config.Libs.aspectj)
implementation(Config.Libs.springBootStarter)
implementation(Config.Libs.kotlinReflect)
implementation(Config.Libs.springBootStarterJdbc)
implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
implementation(projects.sentrySpringBootStarter)
implementation(projects.sentryLogback)
Expand All @@ -58,7 +58,7 @@ dependencies {
runtimeOnly(libs.hsqldb)

testImplementation(projects.sentrySystemTestSupport)
testImplementation(Config.Libs.springBootStarterTest) {
testImplementation(libs.springboot.starter.test) {
exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
}
testImplementation(kotlin(Config.kotlinStdLib))
Expand Down
Loading
Loading