From 29804adf796edfab5225369a8199659be93fe667 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Tue, 6 Aug 2024 16:34:26 -0700
Subject: [PATCH] [JENKINS-73122] Upgrade Stapler from Jetty 10.x to 12.x (EE
 8)

---
 .github/dependabot.yml                                 |  5 -----
 core/pom.xml                                           | 10 +++++-----
 .../java/org/kohsuke/stapler/test/JettyTestCase.java   |  6 +++---
 jelly/pom.xml                                          | 10 +++++-----
 pom.xml                                                |  9 ++++++++-
 5 files changed, 21 insertions(+), 19 deletions(-)

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 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlet</artifactId>
+      <artifactId>jetty-util</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-util</artifactId>
+      <groupId>org.eclipse.jetty.ee8</groupId>
+      <artifactId>jetty-ee8-servlet</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-webapp</artifactId>
+      <groupId>org.eclipse.jetty.ee8</groupId>
+      <artifactId>jetty-ee8-webapp</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
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 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlet</artifactId>
+      <artifactId>jetty-util</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-util</artifactId>
+      <groupId>org.eclipse.jetty.ee8</groupId>
+      <artifactId>jetty-ee8-servlet</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-webapp</artifactId>
+      <groupId>org.eclipse.jetty.ee8</groupId>
+      <artifactId>jetty-ee8-webapp</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
index 83adc72afa..65402e8fb0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
   <properties>
     <changelist>999999-SNAPSHOT</changelist>
     <scmTag>HEAD</scmTag>
-    <jetty.version>10.0.22</jetty.version>
+    <jetty.version>12.0.12</jetty.version>
     <gitHubRepo>jenkinsci/stapler</gitHubRepo>
     <spotless.check.skip>false</spotless.check.skip>
   </properties>
@@ -56,6 +56,13 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty.ee8</groupId>
+        <artifactId>jetty-ee8-bom</artifactId>
+        <version>${jetty.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>commons-logging</groupId>
         <artifactId>commons-logging</artifactId>