diff --git a/build.gradle b/build.gradle
index 2f734615f29..6d47cd22ed6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3544,7 +3544,8 @@ project(':connect:runtime') {
 
     // We use this library to generate OpenAPI docs for the REST API, but we don't want or need it at compile
     // or run time. So, we add it to a separate configuration, which we use later on during docs generation
-    swagger libs.swaggerJaxrs2
+    swagger libs.jakartaServletApi
+    swagger libs.jaxrs2Jakarta
 
     testImplementation project(':clients').sourceSets.test.output
     testImplementation project(':core')
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 37677869afb..e6722b62eb6 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -80,6 +80,7 @@ versions += [
   jaxAnnotation: "1.3.2",
   jaxb: "2.3.1",
   jakartaRs: "3.1.0",
+  jakartaServletApi: "6.1.0",
   jfreechart: "1.0.0",
   jopt: "5.0.4",
   jose4j: "0.9.4",
@@ -166,6 +167,8 @@ libs += [
   jaxAnnotationApi: "javax.annotation:javax.annotation-api:$versions.jaxAnnotation",
   jaxbApi: "javax.xml.bind:jaxb-api:$versions.jaxb",
   jakartaRsApi: "jakarta.ws.rs:jakarta.ws.rs-api:$versions.jakartaRs",
+  jakartaServletApi: "jakarta.servlet:jakarta.servlet-api:$versions.jakartaServletApi",
+  jaxrs2Jakarta: "io.swagger.core.v3:swagger-jaxrs2-jakarta:$swaggerVersion",
   javassist: "org.javassist:javassist:$versions.javassist",
   jettyServer: "org.eclipse.jetty:jetty-server:$versions.jetty",
   jettyClient: "org.eclipse.jetty:jetty-client:$versions.jetty",
@@ -231,7 +234,6 @@ libs += [
   snappy: "org.xerial.snappy:snappy-java:$versions.snappy",
   spotbugs: "com.github.spotbugs:spotbugs-annotations:$versions.spotbugs",
   swaggerAnnotations: "io.swagger.core.v3:swagger-annotations:$swaggerVersion",
-  swaggerJaxrs2: "io.swagger.core.v3:swagger-jaxrs2:$swaggerVersion",
   zookeeper: "org.apache.zookeeper:zookeeper:$versions.zookeeper",
   jfreechart: "jfreechart:jfreechart:$versions.jfreechart",
   mavenArtifact: "org.apache.maven:maven-artifact:$versions.mavenArtifact",