diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 8a57a2ba94..23fb10fd0d 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -15,11 +15,6 @@ updates:
# it would be good to update it at some point, but requires significant testing
- dependency-name: "org.codehaus.groovy:groovy-all"
versions: [">=2.5.0"]
- # Must remain within Jetty 10.x until the Jakarta migration is complete; ignore Jetty 11.x updates
- - dependency-name: "org.eclipse.jetty:*"
- versions: [">=11.0.0"]
# Provided by the Web container, so aligned with Jetty.
- dependency-name: "jakarta.servlet:jakarta.servlet-api"
- # Contains incompatible API changes and needs compatibility work.
- dependency-name: "jakarta.servlet.jsp:jakarta.servlet.jsp-api"
- versions: [">=3.0.0"]
diff --git a/core/pom.xml b/core/pom.xml
index 7bb49a6546..202c6ec425 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -136,17 +136,17 @@
org.eclipse.jetty
- jetty-servlet
+ jetty-util
test
- org.eclipse.jetty
- jetty-util
+ org.eclipse.jetty.ee8
+ jetty-ee8-servlet
test
- org.eclipse.jetty
- jetty-webapp
+ org.eclipse.jetty.ee8
+ jetty-ee8-webapp
test
diff --git a/core/src/test/java/org/kohsuke/stapler/test/JettyTestCase.java b/core/src/test/java/org/kohsuke/stapler/test/JettyTestCase.java
index 1089d03c77..0041f9c92e 100644
--- a/core/src/test/java/org/kohsuke/stapler/test/JettyTestCase.java
+++ b/core/src/test/java/org/kohsuke/stapler/test/JettyTestCase.java
@@ -7,14 +7,14 @@
import java.nio.charset.Charset;
import javax.servlet.ServletContext;
import junit.framework.TestCase;
+import org.eclipse.jetty.ee8.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee8.servlet.ServletHolder;
+import org.eclipse.jetty.ee8.webapp.WebAppContext;
import org.eclipse.jetty.http.UriCompliance;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-import org.eclipse.jetty.webapp.WebAppContext;
import org.htmlunit.WebClient;
import org.kohsuke.stapler.Stapler;
import org.kohsuke.stapler.WebApp;
diff --git a/jelly/pom.xml b/jelly/pom.xml
index 44b5a28632..4cf07fb057 100644
--- a/jelly/pom.xml
+++ b/jelly/pom.xml
@@ -67,17 +67,17 @@
org.eclipse.jetty
- jetty-servlet
+ jetty-util
test
- org.eclipse.jetty
- jetty-util
+ org.eclipse.jetty.ee8
+ jetty-ee8-servlet
test
- org.eclipse.jetty
- jetty-webapp
+ org.eclipse.jetty.ee8
+ jetty-ee8-webapp
test
diff --git a/pom.xml b/pom.xml
index a3bc5862ad..3dc7a486d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
999999-SNAPSHOT
HEAD
- 10.0.22
+ 12.0.11
jenkinsci/stapler
false
@@ -56,6 +56,13 @@
pom
import
+
+ org.eclipse.jetty.ee8
+ jetty-ee8-bom
+ ${jetty.version}
+ pom
+ import
+
commons-logging
commons-logging