From 02cc1ccd5c0b43bf5bec7bf1d6ac4e919c32b0f4 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Sun, 19 May 2024 04:40:24 -0700
Subject: [PATCH] Manage the version of `jakarta.servlet-api` consistently with
 the version of `jakarta.servlet.jsp.jstl-api` (#9288)

---
 bom/pom.xml  | 5 +++++
 core/pom.xml | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index bbbfee8743..f0c33ab765 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -145,6 +145,11 @@ THE SOFTWARE.
         <artifactId>jenkins-stapler-support</artifactId>
         <version>1.1</version>
       </dependency>
+      <dependency>
+        <groupId>jakarta.servlet</groupId>
+        <artifactId>jakarta.servlet-api</artifactId>
+        <version>4.0.4</version>
+      </dependency>
       <dependency>
         <groupId>jakarta.servlet.jsp.jstl</groupId>
         <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 3b12be43fb..61c48e4897 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -443,7 +443,6 @@ THE SOFTWARE.
     <dependency>
       <groupId>jakarta.servlet</groupId>
       <artifactId>jakarta.servlet-api</artifactId>
-      <version>4.0.4</version>
       <scope>provided</scope>
     </dependency>
     <dependency>