From 7e9ae3f7b537d0e21f7647af447714ffb9efea1b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 21 Sep 2023 18:09:26 +0100 Subject: [PATCH] Remove dependency downgrades for Jetty The downgrades are no longer needed as Boot 3.2 uses Jetty 12 which supports Jakarta EE 10. --- framework/webflux-jetty/build.gradle | 11 ----------- framework/webmvc-jetty-tls/build.gradle | 6 ------ framework/webmvc-jetty/build.gradle | 6 ------ 3 files changed, 23 deletions(-) diff --git a/framework/webflux-jetty/build.gradle b/framework/webflux-jetty/build.gradle index 2c393d94..3da8670e 100644 --- a/framework/webflux-jetty/build.gradle +++ b/framework/webflux-jetty/build.gradle @@ -15,17 +15,6 @@ dependencies { replacedBy("org.springframework.boot:spring-boot-starter-jetty", "Use Jetty instead of Netty") } } - // Downgrades for Jetty, see https://github.com/spring-projects/spring-boot/issues/33044 - implementation("jakarta.servlet:jakarta.servlet-api") { - version { - strictly "5.0.0" - } - } - implementation("jakarta.websocket:jakarta.websocket-api") { - version { - strictly "2.0.0" - } - } implementation("org.jetbrains.kotlin:kotlin-reflect") implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor") diff --git a/framework/webmvc-jetty-tls/build.gradle b/framework/webmvc-jetty-tls/build.gradle index 2f5e3a9b..3b996d27 100644 --- a/framework/webmvc-jetty-tls/build.gradle +++ b/framework/webmvc-jetty-tls/build.gradle @@ -14,12 +14,6 @@ dependencies { replacedBy("org.springframework.boot:spring-boot-starter-jetty", "Use Jetty instead of Tomcat") } } - // Downgrade for Jetty, see https://github.com/spring-projects/spring-boot/issues/33044 - implementation("jakarta.servlet:jakarta.servlet-api") { - version { - strictly "5.0.0" - } - } testImplementation("org.springframework.boot:spring-boot-starter-test") diff --git a/framework/webmvc-jetty/build.gradle b/framework/webmvc-jetty/build.gradle index a6bb1c79..7beeb09a 100644 --- a/framework/webmvc-jetty/build.gradle +++ b/framework/webmvc-jetty/build.gradle @@ -15,12 +15,6 @@ dependencies { replacedBy("org.springframework.boot:spring-boot-starter-jetty", "Use Jetty instead of Tomcat") } } - // Downgrade for Jetty, see https://github.com/spring-projects/spring-boot/issues/33044 - implementation("jakarta.servlet:jakarta.servlet-api") { - version { - strictly "5.0.0" - } - } implementation("com.fasterxml.jackson.module:jackson-module-kotlin") implementation("org.jetbrains.kotlin:kotlin-reflect") implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")