From 40484a03b0dfa49d7942e3c9d3bce8b2173cfaae Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 9 Nov 2022 20:49:30 +0000 Subject: [PATCH] Configure Jetty smoke tests to use Servlet 5 API --- boot/servlet-jetty/build.gradle | 4 ++++ framework/websocket-jetty/build.gradle | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/boot/servlet-jetty/build.gradle b/boot/servlet-jetty/build.gradle index abe78952..aef7a302 100644 --- a/boot/servlet-jetty/build.gradle +++ b/boot/servlet-jetty/build.gradle @@ -5,6 +5,10 @@ plugins { id 'org.graalvm.buildtools.native' } +configurations.all { + resolutionStrategy.force("jakarta.servlet:jakarta.servlet-api:5.0.0") +} + dependencies { implementation(enforcedPlatform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) implementation("org.springframework.boot:spring-boot-starter-jetty") diff --git a/framework/websocket-jetty/build.gradle b/framework/websocket-jetty/build.gradle index 2783f814..770084ca 100644 --- a/framework/websocket-jetty/build.gradle +++ b/framework/websocket-jetty/build.gradle @@ -5,6 +5,10 @@ plugins { id 'org.graalvm.buildtools.native' } +configurations.all { + resolutionStrategy.force("jakarta.servlet:jakarta.servlet-api:5.0.0") +} + dependencies { implementation(enforcedPlatform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) implementation("org.springframework.boot:spring-boot-starter-websocket")