Skip to content

Commit 2e6e336

Browse files
JordanJLopezJordan Lopez
andauthored
feat: Upgrade Spring, Spring Boot, Reactor, Ktor, other dependencies (#2151)
### 📝 Description Doing patch and minor version upgrades to make subsequent breaking changes easier. #### Test Dependency Upgrades * chore: Upgrade junit from v5.10.2 -> v5.12.2 * chore: Upgrade logback from v1.5.6 to v1.5.32 * chore: Upgrade rxjava from v3.1.8 to v3.1.12 * chore: Upgrade wiremock from v3.7.0 to v3.13.2 #### Patch Upgrades * fix: Upgrade slf4j from v2.0.13 to v2.0.17 * fix: Upgrade reactor-extensions from v1.2.2 to v1.2.5 * fix: Upgrade classgraph from v4.8.174 to v4.8.184 * fix: Upgrade fastjson2 from v2.0.56 to v2.0.61 #### Feature Upgrades * feat: Upgrade ktor from v3.0.3 to v3.2.3 * feat: Upgrade Spring, Spring Boot, Reactor * Spring v6.1.10 -> v6.2.16 * Spring Boot v3.2.7 -> v3.5.1 * Reactor v3.6.7 -> v3.7.16 * feat: Upgrade graalvm Gradle plugin from v0.10.2 to v0.11.1 ### 🔗 Related Issues --------- Co-authored-by: Jordan Lopez <jordlopez@expediagroup.com>
1 parent 06d5d29 commit 2e6e336

9 files changed

Lines changed: 33 additions & 28 deletions

File tree

buildSrc/src/main/kotlin/com.expediagroup.graphql.conventions.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ dependencies {
144144
implementation(libs.kotlinx.coroutines.jdk8)
145145
testImplementation(libs.kotlin.test)
146146
testImplementation(platform(libs.junit.bom))
147-
testImplementation("org.junit.jupiter:junit-jupiter")
148-
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
147+
testImplementation(libs.junit.jupiter)
148+
testRuntimeOnly(libs.junit.platform.launcher)
149149
testImplementation(libs.kotlin.junit.test)
150150
testImplementation(libs.mockk)
151151
}

gradle/libs.versions.toml

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
11
[versions]
22
android-plugin = "8.5.0"
3-
classgraph = "4.8.174"
3+
classgraph = "4.8.184"
44
dataloader = "4.0.0"
55
federation = "5.5.0"
66
graphql-java = "23.1"
7-
graalvm = "0.10.2"
7+
graalvm = "0.11.1"
88
jackson = "2.17.1"
99
# kotlin version has to match the compile-testing compiler version
1010
kotlin = "2.0.0"
1111
kotlinx-benchmark = "0.4.13"
1212
kotlinx-coroutines = "1.9.0"
1313
# TODO kotlin 1.9 upgrade: fix GraphQLTestUtils and GenerateKotlinxClientIT
1414
kotlinx-serialization = "1.6.3"
15-
ktor = "3.0.3"
15+
ktor = "3.2.3"
1616
fastjson2 = "2.0.56"
1717
maven-plugin-annotation = "3.13.1"
1818
maven-plugin-api = "3.9.8"
1919
maven-project = "2.2.1"
2020
poet = "1.17.0"
2121
## reactor and spring versions should be the same as defined in spring-boot-dependencies
22-
reactor-core = "3.6.7"
23-
reactor-extensions = "1.2.2"
24-
slf4j = "2.0.13"
25-
spring = "6.1.10"
26-
spring-boot = "3.2.7"
22+
reactor-core = "3.7.16"
23+
reactor-extensions = "1.2.5"
24+
slf4j = "2.0.17"
25+
spring = "6.2.16"
26+
spring-boot = "3.5.11"
2727

2828
# security vulnerabilities overrides
2929
commons-codec = { strictly = "[1.13, 2[", prefer = "1.16.0" }
3030

3131
# test dependencies
3232
compile-testing = "0.5.1"
3333
icu = "75.1"
34-
junit = "5.10.2"
35-
junit-platform = "1.10.1"
36-
logback = "1.5.6"
34+
junit = "5.12.2"
35+
logback = "1.5.32"
3736
mockk = "1.13.13"
38-
rxjava = "3.1.8"
39-
wiremock = "3.7.0"
37+
rxjava = "3.1.12"
38+
wiremock = "3.13.2"
4039

4140
# plugins
4241
detekt = "1.23.7"
42+
#dokka = "2.1.0"
4343
dokka = "2.0.0"
4444
jacoco = "0.8.12"
4545
ktlint-core = "1.5.0"
@@ -90,21 +90,20 @@ spring-webflux = { group = "org.springframework", name = "spring-webflux", versi
9090
spring-context = { group = "org.springframework", name = "spring-context", version.ref = "spring" }
9191
fastjson2 = { group = "com.alibaba.fastjson2", name = "fastjson2-kotlin", version.ref = "fastjson2" }
9292
fastjson2-spring = { group = "com.alibaba.fastjson2", name = "fastjson2-extension-spring6", version.ref = "fastjson2" }
93-
junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junit-platform" }
9493

9594
# security vulnerabilities overrides
9695
commons-codec = { group = "commons-codec", name = "commons-codec", version.ref = "commons-codec" }
9796

9897
# test dependencies
9998
compile-testing = { group = "dev.zacsweers.kctfork", name = "core", version.ref = "compile-testing" }
10099
icu = { group = "com.ibm.icu", name = "icu4j", version.ref = "icu" }
101-
logback = { group = "ch.qos.logback", name = "logback-classic", version.ref = "logback" }
102-
junit-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junit" }
103100
junit-bom = { group = "org.junit", name = "junit-bom", version.ref = "junit" }
104-
junit-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junit" }
105-
kotlin-junit-test = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit5", version.ref = "kotlin" }
101+
junit-jupiter = { module = "org.junit.jupiter:junit-jupiter" }
102+
junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher" }
103+
logback = { group = "ch.qos.logback", name = "logback-classic", version.ref = "logback" }
106104
kotlin-annotation-processing = { group = "org.jetbrains.kotlin", name = "kotlin-annotation-processing-embeddable", version.ref = "kotlin" }
107105
kotlin-compiler = { group = "org.jetbrains.kotlin", name = "kotlin-compiler-embeddable", version.ref = "kotlin" }
106+
kotlin-junit-test = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit5", version.ref = "kotlin" }
108107
kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "kotlin" }
109108
kotlinx-benchmark = { group = "org.jetbrains.kotlinx", name = "kotlinx-benchmark-runtime", version.ref = "kotlinx-benchmark" }
110109
kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }

integration/graalvm/ktor-graalvm-server/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies {
1212
implementation(projects.commonGraalvmServer)
1313
implementation(libs.logback)
1414
implementation(libs.ktor.server.cio)
15-
testImplementation(libs.junit.api)
15+
testImplementation(libs.junit.jupiter)
1616
testImplementation(libs.kotlin.test)
1717
testImplementation(libs.ktor.client.content)
1818
testImplementation(libs.ktor.server.test.host)

integration/graalvm/maven-graalvm-server/build.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ dependencies {
99
implementation(projects.commonGraalvmServer)
1010
implementation(libs.logback)
1111
implementation(libs.ktor.server.cio)
12-
testImplementation(libs.junit.api)
12+
testImplementation(platform(libs.junit.bom))
13+
testImplementation(libs.junit.jupiter)
14+
testRuntimeOnly(libs.junit.platform.launcher)
1315
testImplementation(libs.kotlin.test)
1416
testImplementation(libs.ktor.client.content)
1517
testImplementation(libs.ktor.server.test.host)
@@ -23,7 +25,7 @@ tasks {
2325
val mavenEnvironmentVariables = mapOf(
2426
"graphqlKotlinVersion" to project.ext["version"],
2527
"graphqlJavaVersion" to libs.versions.graphql.java.get(),
26-
"junitVersion" to libs.versions.junit.asProvider().get(),
28+
"junitVersion" to libs.versions.junit.get(),
2729
"kotlinJvmTarget" to kotlinJvmVersion,
2830
"kotlinVersion" to libs.versions.kotlin.get(),
2931
"ktorVersion" to libs.versions.ktor.get(),

integration/gradle-plugin-android-test/app/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ android {
2020
dependencies {
2121
implementation("com.expediagroup:graphql-kotlin-ktor-client")
2222
implementation(libs.kotlin.stdlib)
23-
testImplementation(libs.junit.api)
24-
testImplementation(libs.junit.engine)
23+
testImplementation(platform(libs.junit.bom))
24+
testImplementation(libs.junit.jupiter)
25+
testRuntimeOnly(libs.junit.platform.launcher)
2526
}
2627

2728
graphql {

integration/gradle-plugin-integration-tests/client-generator/jacoco/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ plugins {
88

99
dependencies {
1010
implementation("com.expediagroup:graphql-kotlin-spring-client")
11-
testImplementation(libs.junit.api)
12-
testImplementation(libs.junit.engine)
11+
testImplementation(platform(libs.junit.bom))
12+
testImplementation(libs.junit.jupiter)
13+
testRuntimeOnly(libs.junit.platform.launcher)
1314
testImplementation(libs.mockk)
1415
}
1516

integration/maven-plugin-integration-tests/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ tasks {
4444
"kotlinxSerializationVersion" to libs.versions.kotlinx.serialization.get(),
4545
"ktorVersion" to libs.versions.ktor.get(),
4646
"reactorVersion" to libs.versions.reactor.core.get(),
47-
"junitVersion" to libs.versions.junit.asProvider().get()
47+
"junitVersion" to libs.versions.junit.get()
4848
)
4949
var wireMockServer: WireMockServerRunner? = null
5050
var wireMockServerPort: Int? = null

plugins/schema/graphql-kotlin-sdl-generator/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ testing {
2222
val integrationTest by registering(JvmTestSuite::class) {
2323
dependencies {
2424
implementation(project())
25+
implementation(platform(libs.junit.bom))
2526
implementation(libs.junit.platform.launcher)
2627
}
2728

plugins/server/graphql-kotlin-graalvm-metadata-generator/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ testing {
2121
val integrationTest by registering(JvmTestSuite::class) {
2222
dependencies {
2323
implementation(project())
24+
implementation(platform(libs.junit.bom))
2425
implementation(libs.junit.platform.launcher)
2526
}
2627

0 commit comments

Comments
 (0)