diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 1048e265ec06..13a31c196949 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -16,7 +16,7 @@ updates:
# Provided by Jetty and should be aligned with the version provided by the
# version of Jetty we deliver. See:
# https://github.com/jenkinsci/jenkins/pull/5211
- - dependency-name: "javax.servlet:javax.servlet-api"
+ - dependency-name: "jakarta.servlet:jakarta.servlet-api"
# Jetty Maven Plugin and Winstone should be upgraded in lockstep in order
# to keep their corresponding Jetty versions aligned.
diff --git a/bom/pom.xml b/bom/pom.xml
index 6192bd3f6889..e8cfde625959 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -40,7 +40,7 @@ THE SOFTWARE.
9.3
1.7.36
- 1685.v3b_5035c4ce05
+ 1711.v5b_1b_03f0fcf2
2.4.21
diff --git a/core/pom.xml b/core/pom.xml
index b5f5c83be16f..569d56a60390 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -468,9 +468,9 @@ THE SOFTWARE.
1.1.4c
- javax.servlet
- javax.servlet-api
- 3.1.0
+ jakarta.servlet
+ jakarta.servlet-api
+ 4.0.4
provided
diff --git a/war/pom.xml b/war/pom.xml
index 71dffdc83f6a..ca296d07d98a 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -86,8 +86,8 @@ THE SOFTWARE.
jars that are not needed in war. most of the exclusions should happen in the core, to make IDEs happy, not here.
-->
- javax.servlet.jsp
- javax.servlet.jsp-api
+ jakarta.servlet.jsp
+ jakarta.servlet.jsp-api
@@ -132,7 +132,7 @@ THE SOFTWARE.
org.jenkins-ci
winstone
- 5.25
+ 6.0
test
@@ -172,8 +172,12 @@ THE SOFTWARE.
1.8
+ org.jenkins-ci:commons-jelly
org.jenkins-ci.main:cli
org.jenkins-ci.main:jenkins-core
+ org.kohsuke.stapler:stapler
+ org.kohsuke.stapler:stapler-groovy
+ org.kohsuke.stapler:stapler-jelly
@@ -560,7 +564,7 @@ THE SOFTWARE.
org.eclipse.jetty
jetty-maven-plugin
- 9.4.46.v20220331
+ 10.0.11