Skip to content

Commit 52ace28

Browse files
rbro112rbro112
committed
Migrate spring boot dependencies to version catalog
1 parent b07fe07 commit 52ace28

File tree

24 files changed

+196
-174
lines changed

24 files changed

+196
-174
lines changed

‎buildSrc/src/main/java/Config.kt

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ object Config {
55
val AGP = System.getenv("VERSION_AGP") ?: "8.6.0"
66
val kotlinStdLib = "stdlib-jdk8"
77

8-
val springBootVersion = "2.7.18"
9-
val springBoot3Version = "3.4.2"
108
val kotlinCompatibleLanguageVersion = "1.6"
119

1210
val androidComposeCompilerVersion = "1.5.14"
@@ -53,29 +51,29 @@ object Config {
5351
val jacksonDatabind = "com.fasterxml.jackson.core:jackson-databind:2.18.3"
5452
val jacksonKotlin = "com.fasterxml.jackson.module:jackson-module-kotlin:2.18.3"
5553

56-
val springBootStarter = "org.springframework.boot:spring-boot-starter:$springBootVersion"
57-
val springBootStarterGraphql = "org.springframework.boot:spring-boot-starter-graphql:$springBootVersion"
58-
val springBootStarterQuartz = "org.springframework.boot:spring-boot-starter-quartz:$springBootVersion"
59-
val springBootStarterTest = "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
60-
val springBootStarterWeb = "org.springframework.boot:spring-boot-starter-web:$springBootVersion"
61-
val springBootStarterWebsocket = "org.springframework.boot:spring-boot-starter-websocket:$springBootVersion"
62-
val springBootStarterWebflux = "org.springframework.boot:spring-boot-starter-webflux:$springBootVersion"
63-
val springBootStarterAop = "org.springframework.boot:spring-boot-starter-aop:$springBootVersion"
64-
val springBootStarterSecurity = "org.springframework.boot:spring-boot-starter-security:$springBootVersion"
65-
val springBootStarterJdbc = "org.springframework.boot:spring-boot-starter-jdbc:$springBootVersion"
66-
val springBootStarterActuator = "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"
67-
68-
val springBoot3Starter = "org.springframework.boot:spring-boot-starter:$springBoot3Version"
69-
val springBoot3StarterGraphql = "org.springframework.boot:spring-boot-starter-graphql:$springBoot3Version"
70-
val springBoot3StarterQuartz = "org.springframework.boot:spring-boot-starter-quartz:$springBoot3Version"
71-
val springBoot3StarterTest = "org.springframework.boot:spring-boot-starter-test:$springBoot3Version"
72-
val springBoot3StarterWeb = "org.springframework.boot:spring-boot-starter-web:$springBoot3Version"
73-
val springBoot3StarterWebsocket = "org.springframework.boot:spring-boot-starter-websocket:$springBoot3Version"
74-
val springBoot3StarterWebflux = "org.springframework.boot:spring-boot-starter-webflux:$springBoot3Version"
75-
val springBoot3StarterAop = "org.springframework.boot:spring-boot-starter-aop:$springBoot3Version"
76-
val springBoot3StarterSecurity = "org.springframework.boot:spring-boot-starter-security:$springBoot3Version"
77-
val springBoot3StarterJdbc = "org.springframework.boot:spring-boot-starter-jdbc:$springBoot3Version"
78-
val springBoot3StarterActuator = "org.springframework.boot:spring-boot-starter-actuator:$springBoot3Version"
54+
// val springBootStarter = "org.springframework.boot:spring-boot-starter:$springBootVersion"
55+
// val springBootStarterGraphql = "org.springframework.boot:spring-boot-starter-graphql:$springBootVersion"
56+
// val springBootStarterQuartz = "org.springframework.boot:spring-boot-starter-quartz:$springBootVersion"
57+
// val springBootStarterTest = "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
58+
// val springBootStarterWeb = "org.springframework.boot:spring-boot-starter-web:$springBootVersion"
59+
// val springBootStarterWebsocket = "org.springframework.boot:spring-boot-starter-websocket:$springBootVersion"
60+
// val springBootStarterWebflux = "org.springframework.boot:spring-boot-starter-webflux:$springBootVersion"
61+
// val springBootStarterAop = "org.springframework.boot:spring-boot-starter-aop:$springBootVersion"
62+
// val springBootStarterSecurity = "org.springframework.boot:spring-boot-starter-security:$springBootVersion"
63+
// val springBootStarterJdbc = "org.springframework.boot:spring-boot-starter-jdbc:$springBootVersion"
64+
// val springBootStarterActuator = "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"
65+
//
66+
// val springBoot3Starter = "org.springframework.boot:spring-boot-starter:$springBoot3Version"
67+
// val springBoot3StarterGraphql = "org.springframework.boot:spring-boot-starter-graphql:$springBoot3Version"
68+
// val springBoot3StarterQuartz = "org.springframework.boot:spring-boot-starter-quartz:$springBoot3Version"
69+
// val springBoot3StarterTest = "org.springframework.boot:spring-boot-starter-test:$springBoot3Version"
70+
// val springBoot3StarterWeb = "org.springframework.boot:spring-boot-starter-web:$springBoot3Version"
71+
// val springBoot3StarterWebsocket = "org.springframework.boot:spring-boot-starter-websocket:$springBoot3Version"
72+
// val springBoot3StarterWebflux = "org.springframework.boot:spring-boot-starter-webflux:$springBoot3Version"
73+
// val springBoot3StarterAop = "org.springframework.boot:spring-boot-starter-aop:$springBoot3Version"
74+
// val springBoot3StarterSecurity = "org.springframework.boot:spring-boot-starter-security:$springBoot3Version"
75+
// val springBoot3StarterJdbc = "org.springframework.boot:spring-boot-starter-jdbc:$springBoot3Version"
76+
// val springBoot3StarterActuator = "org.springframework.boot:spring-boot-starter-actuator:$springBoot3Version"
7977

8078
val springWeb = "org.springframework:spring-webmvc"
8179
val springWebflux = "org.springframework:spring-webflux"

‎gradle/libs.versions.toml

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ otelInstrumentation = "2.10.0"
1313
otelInstrumentationAlpha = "2.10.0-alpha"
1414
# 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
1515
otelSemanticConvetions = "1.28.0-alpha"
16-
springTwo = "2.7.18"
17-
springThree = "3.4.2"
16+
springboot2 = "2.7.18"
17+
springboot3 = "3.4.2"
1818
targetSdk = "34"
1919
compileSdk = "34"
2020
minSdk = "21"
@@ -35,8 +35,8 @@ detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.8" }
3535
jacoco-android = { id = "com.mxalbert.gradle.jacoco-android", version = "0.2.0" }
3636
kover = { id = "org.jetbrains.kotlinx.kover", version = "0.7.3" }
3737
vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version = "0.30.0" }
38-
spring-boot-two = { id = "org.springframework.boot", version.ref = "springTwo" }
39-
spring-boot-three = { id = "org.springframework.boot", version.ref = "springThree" }
38+
springboot2 = { id = "org.springframework.boot", version.ref = "springboot2" }
39+
springboot3 = { id = "org.springframework.boot", version.ref = "springboot2" }
4040
spring-dependency-management = { id = "io.spring.dependency-management", version = "1.0.11.RELEASE" }
4141
gretty = { id = "org.gretty", version = "4.0.0" }
4242

@@ -63,7 +63,29 @@ otel-javaagent-tooling = { module = "io.opentelemetry.javaagent:opentelemetry-ja
6363
otel-javaagent-extension-api = { module = "io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api", version.ref = "otelInstrumentationAlpha" }
6464
otel-semconv = { module = "io.opentelemetry.semconv:opentelemetry-semconv", version.ref = "otelSemanticConvetions" }
6565
otel-semconv-incubating = { module = "io.opentelemetry.semconv:opentelemetry-semconv-incubating", version.ref = "otelSemanticConvetions" }
66+
springboot-starter = { module = "org.springframework.boot:spring-boot-starter", version.ref = "springboot2" }
67+
springboot-starter-graphql = { module = "org.springframework.boot:spring-boot-starter-graphql", version.ref = "springboot2" }
68+
springboot-starter-quartz = { module = "org.springframework.boot:spring-boot-starter-quartz", version.ref = "springboot2" }
69+
springboot-starter-test = { module = "org.springframework.boot:spring-boot-starter-test", version.ref = "springboot2" }
70+
springboot-starter-web = { module = "org.springframework.boot:spring-boot-starter-web", version.ref = "springboot2" }
71+
springboot-starter-websocket = { module = "org.springframework.boot:spring-boot-starter-websocket", version.ref = "springboot2" }
72+
springboot-starter-webflux = { module = "org.springframework.boot:spring-boot-starter-webflux", version.ref = "springboot2" }
73+
springboot-starter-aop = { module = "org.springframework.boot:spring-boot-starter-aop", version.ref = "springboot2" }
74+
springboot-starter-security = { module = "org.springframework.boot:spring-boot-starter-security", version.ref = "springboot2" }
75+
springboot-starter-jdbc = { module = "org.springframework.boot:spring-boot-starter-jdbc", version.ref = "springboot2" }
76+
springboot-starter-actuator = { module = "org.springframework.boot:spring-boot-starter-actuator", version.ref = "springboot2" }
6677
springboot3-otel = { module = "io.opentelemetry.instrumentation:opentelemetry-spring-boot-starter", version.ref = "otelInstrumentation" }
78+
springboot3-starter = { module = "org.springframework.boot:spring-boot-starter", version.ref = "springboot3" }
79+
springboot3-starter-graphql = { module = "org.springframework.boot:spring-boot-starter-graphql", version.ref = "springboot3" }
80+
springboot3-starter-quartz = { module = "org.springframework.boot:spring-boot-starter-quartz", version.ref = "springboot3" }
81+
springboot3-starter-test = { module = "org.springframework.boot:spring-boot-starter-test", version.ref = "springboot3" }
82+
springboot3-starter-web = { module = "org.springframework.boot:spring-boot-starter-web", version.ref = "springboot3" }
83+
springboot3-starter-websocket = { module = "org.springframework.boot:spring-boot-starter-websocket", version.ref = "springboot3" }
84+
springboot3-starter-webflux = { module = "org.springframework.boot:spring-boot-starter-webflux", version.ref = "springboot3" }
85+
springboot3-starter-aop = { module = "org.springframework.boot:spring-boot-starter-aop", version.ref = "springboot3" }
86+
springboot3-starter-security = { module = "org.springframework.boot:spring-boot-starter-security", version.ref = "springboot3" }
87+
springboot3-starter-jdbc = { module = "org.springframework.boot:spring-boot-starter-jdbc", version.ref = "springboot3" }
88+
springboot3-starter-actuator = { module = "org.springframework.boot:spring-boot-starter-actuator", version.ref = "springboot3" }
6789

6890
# test libraries
6991
androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version = "1.6.8" }

‎sentry-graphql-22/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ dependencies {
3434
testImplementation(libs.mockito.kotlin)
3535
testImplementation(libs.mockito.inline)
3636
testImplementation(libs.okhttp.mockwebserver)
37+
testImplementation(libs.springboot.starter.graphql)
3738
testImplementation(Config.Libs.okhttp)
38-
testImplementation(Config.Libs.springBootStarterGraphql)
3939
testImplementation("com.netflix.graphql.dgs:graphql-error-types:4.9.2")
4040
testImplementation(Config.Libs.graphQlJava22)
4141
}

‎sentry-graphql-core/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ dependencies {
3333
testImplementation(libs.mockito.kotlin)
3434
testImplementation(libs.mockito.inline)
3535
testImplementation(libs.okhttp.mockwebserver)
36+
testImplementation(libs.springboot.starter.graphql)
3637
testImplementation(Config.Libs.okhttp)
37-
testImplementation(Config.Libs.springBootStarterGraphql)
3838
testImplementation("com.netflix.graphql.dgs:graphql-error-types:4.9.2")
3939
testImplementation(Config.Libs.graphQlJava)
4040
}

‎sentry-graphql/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ dependencies {
3434
testImplementation(libs.mockito.kotlin)
3535
testImplementation(libs.mockito.inline)
3636
testImplementation(libs.okhttp.mockwebserver)
37+
testImplementation(libs.springboot.starter.graphql)
3738
testImplementation(Config.Libs.okhttp)
38-
testImplementation(Config.Libs.springBootStarterGraphql)
3939
testImplementation("com.netflix.graphql.dgs:graphql-error-types:4.9.2")
4040
testImplementation(Config.Libs.graphQlJava)
4141
}

‎sentry-samples/sentry-samples-netflix-dgs/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import org.jetbrains.kotlin.config.KotlinCompilerVersion
22
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
33

44
plugins {
5-
alias(libs.plugins.spring.boot.two)
5+
alias(libs.plugins.springboot2)
66
alias(libs.plugins.spring.dependency.management)
77
kotlin("jvm")
88
alias(libs.plugins.kotlin.spring)
@@ -18,15 +18,15 @@ repositories {
1818
}
1919

2020
dependencies {
21-
implementation(Config.Libs.springBootStarterWeb)
21+
implementation(libs.springboot.starter.web)
2222
implementation(Config.Libs.kotlinReflect)
2323
implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
2424
implementation(projects.sentrySpringBootStarter)
2525
implementation(projects.sentryGraphql)
2626
implementation(platform("com.netflix.graphql.dgs:graphql-dgs-platform-dependencies:4.9.2"))
2727
implementation("com.netflix.graphql.dgs:graphql-dgs-subscriptions-websockets-autoconfigure:4.9.2")
2828
implementation("com.netflix.graphql.dgs:graphql-dgs-spring-boot-starter")
29-
testImplementation(Config.Libs.springBootStarterTest) {
29+
testImplementation(libs.springboot.starter.test) {
3030
exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
3131
}
3232
}

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import org.jetbrains.kotlin.config.KotlinCompilerVersion
22
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
33

44
plugins {
5-
alias(libs.plugins.spring.boot.three)
5+
alias(libs.plugins.springboot3)
66
alias(libs.plugins.spring.dependency.management)
77
kotlin("jvm")
88
alias(libs.plugins.kotlin.spring)
@@ -31,18 +31,18 @@ tasks.withType<KotlinCompile>().configureEach {
3131
}
3232

3333
dependencies {
34-
implementation(Config.Libs.springBoot3StarterSecurity)
35-
implementation(Config.Libs.springBoot3StarterActuator)
36-
implementation(Config.Libs.springBoot3StarterWeb)
37-
implementation(Config.Libs.springBoot3StarterWebsocket)
38-
implementation(Config.Libs.springBoot3StarterGraphql)
39-
implementation(Config.Libs.springBoot3StarterQuartz)
40-
implementation(Config.Libs.springBoot3StarterWebflux)
41-
implementation(Config.Libs.springBoot3StarterAop)
34+
implementation(libs.springboot3.starter)
35+
implementation(libs.springboot3.starter.actuator)
36+
implementation(libs.springboot3.starter.aop)
37+
implementation(libs.springboot3.starter.graphql)
38+
implementation(libs.springboot3.starter.jdbc)
39+
implementation(libs.springboot3.starter.quartz)
40+
implementation(libs.springboot3.starter.security)
41+
implementation(libs.springboot3.starter.web)
42+
implementation(libs.springboot3.starter.webflux)
43+
implementation(libs.springboot3.starter.websocket)
4244
implementation(Config.Libs.aspectj)
43-
implementation(Config.Libs.springBoot3Starter)
4445
implementation(Config.Libs.kotlinReflect)
45-
implementation(Config.Libs.springBoot3StarterJdbc)
4646
implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
4747
implementation(projects.sentrySpringBootStarterJakarta)
4848
implementation(projects.sentryLogback)
@@ -55,7 +55,7 @@ dependencies {
5555
runtimeOnly(libs.hsqldb)
5656

5757
testImplementation(projects.sentrySystemTestSupport)
58-
testImplementation(Config.Libs.springBoot3StarterTest) {
58+
testImplementation(libs.springboot3.starter.test) {
5959
exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
6060
}
6161
testImplementation(kotlin(Config.kotlinStdLib))

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
33
import org.springframework.boot.gradle.tasks.run.BootRun
44

55
plugins {
6-
alias(libs.plugins.spring.boot.three)
6+
alias(libs.plugins.springboot3)
77
alias(libs.plugins.spring.dependency.management)
88
kotlin("jvm")
99
alias(libs.plugins.kotlin.spring)
@@ -35,18 +35,18 @@ tasks.withType<KotlinCompile>().configureEach {
3535
}
3636

3737
dependencies {
38-
implementation(Config.Libs.springBoot3StarterSecurity)
39-
implementation(Config.Libs.springBoot3StarterActuator)
40-
implementation(Config.Libs.springBoot3StarterWeb)
41-
implementation(Config.Libs.springBoot3StarterWebsocket)
42-
implementation(Config.Libs.springBoot3StarterGraphql)
43-
implementation(Config.Libs.springBoot3StarterQuartz)
44-
implementation(Config.Libs.springBoot3StarterWebflux)
45-
implementation(Config.Libs.springBoot3StarterAop)
38+
implementation(libs.springboot3.starter)
39+
implementation(libs.springboot3.starter.actuator)
40+
implementation(libs.springboot3.starter.aop)
41+
implementation(libs.springboot3.starter.graphql)
42+
implementation(libs.springboot3.starter.jdbc)
43+
implementation(libs.springboot3.starter.quartz)
44+
implementation(libs.springboot3.starter.security)
45+
implementation(libs.springboot3.starter.web)
46+
implementation(libs.springboot3.starter.webflux)
47+
implementation(libs.springboot3.starter.websocket)
4648
implementation(Config.Libs.aspectj)
47-
implementation(Config.Libs.springBoot3Starter)
4849
implementation(Config.Libs.kotlinReflect)
49-
implementation(Config.Libs.springBoot3StarterJdbc)
5050
implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
5151
implementation(projects.sentrySpringBootStarterJakarta)
5252
implementation(projects.sentryLogback)
@@ -59,7 +59,7 @@ dependencies {
5959
runtimeOnly(libs.hsqldb)
6060

6161
testImplementation(projects.sentrySystemTestSupport)
62-
testImplementation(Config.Libs.springBoot3StarterTest) {
62+
testImplementation(libs.springboot3.starter.test) {
6363
exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
6464
}
6565
testImplementation(kotlin(Config.kotlinStdLib))

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import org.jetbrains.kotlin.config.KotlinCompilerVersion
22
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
33

44
plugins {
5-
alias(libs.plugins.spring.boot.three)
5+
alias(libs.plugins.springboot3)
66
alias(libs.plugins.spring.dependency.management)
77
kotlin("jvm")
88
alias(libs.plugins.kotlin.spring)
@@ -34,18 +34,18 @@ tasks.withType<KotlinCompile>().configureEach {
3434
}
3535

3636
dependencies {
37-
implementation(Config.Libs.springBoot3StarterSecurity)
38-
implementation(Config.Libs.springBoot3StarterActuator)
39-
implementation(Config.Libs.springBoot3StarterWeb)
40-
implementation(Config.Libs.springBoot3StarterWebsocket)
41-
implementation(Config.Libs.springBoot3StarterGraphql)
42-
implementation(Config.Libs.springBoot3StarterQuartz)
43-
implementation(Config.Libs.springBoot3StarterWebflux)
44-
implementation(Config.Libs.springBoot3StarterAop)
37+
implementation(libs.springboot3.starter)
38+
implementation(libs.springboot3.starter.actuator)
39+
implementation(libs.springboot3.starter.aop)
40+
implementation(libs.springboot3.starter.graphql)
41+
implementation(libs.springboot3.starter.jdbc)
42+
implementation(libs.springboot3.starter.quartz)
43+
implementation(libs.springboot3.starter.security)
44+
implementation(libs.springboot3.starter.web)
45+
implementation(libs.springboot3.starter.webflux)
46+
implementation(libs.springboot3.starter.websocket)
4547
implementation(Config.Libs.aspectj)
46-
implementation(Config.Libs.springBoot3Starter)
4748
implementation(Config.Libs.kotlinReflect)
48-
implementation(Config.Libs.springBoot3StarterJdbc)
4949
implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
5050
implementation(projects.sentrySpringBootStarterJakarta)
5151
implementation(projects.sentryLogback)
@@ -57,7 +57,7 @@ dependencies {
5757
runtimeOnly(libs.hsqldb)
5858

5959
testImplementation(projects.sentrySystemTestSupport)
60-
testImplementation(Config.Libs.springBoot3StarterTest) {
60+
testImplementation(libs.springboot3.starter.test) {
6161
exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
6262
}
6363
testImplementation(kotlin(Config.kotlinStdLib))

0 commit comments

Comments
 (0)