Skip to content

Commit 76d79ac

Browse files
committed
Make webflux-jetty's version overrides enforcedPlatform-compatible
See gh-207
1 parent 00e9547 commit 76d79ac

File tree

1 file changed

+16
-11
lines changed

1 file changed

+16
-11
lines changed

framework/webflux-jetty/build.gradle

+16-11
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,22 @@ plugins {
66
id "org.jetbrains.kotlin.jvm"
77
}
88

9+
configurations {
10+
all {
11+
resolutionStrategy {
12+
eachDependency { dependency ->
13+
// Downgrades for Jetty, see https://github.com/spring-projects/spring-boot/issues/33044
14+
if (dependency.requested.group == "jakarta.servlet" && dependency.requested.name == "jakarta.servlet-api") {
15+
dependency.useVersion("5.0.0")
16+
}
17+
if (dependency.requested.group == "jakarta.websocket" && dependency.requested.name == "jakarta.websocket-api") {
18+
dependency.useVersion("2.0.0")
19+
}
20+
}
21+
}
22+
}
23+
}
24+
925
dependencies {
1026
implementation(enforcedPlatform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
1127
implementation("org.springframework.boot:spring-boot-starter-webflux")
@@ -15,17 +31,6 @@ dependencies {
1531
replacedBy("org.springframework.boot:spring-boot-starter-jetty", "Use Jetty instead of Netty")
1632
}
1733
}
18-
// Downgrades for Jetty, see https://github.com/spring-projects/spring-boot/issues/33044
19-
implementation("jakarta.servlet:jakarta.servlet-api") {
20-
version {
21-
strictly "5.0.0"
22-
}
23-
}
24-
implementation("jakarta.websocket:jakarta.websocket-api") {
25-
version {
26-
strictly "2.0.0"
27-
}
28-
}
2934
implementation("org.jetbrains.kotlin:kotlin-reflect")
3035
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
3136
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")

0 commit comments

Comments
 (0)