From c2bb61edc1034ce000245f913743546e6a71848c Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Mon, 3 Jun 2024 11:47:44 -0700
Subject: [PATCH] Upgrade Jetty from 10.0.20 to 12.0.10 (EE 8)

---
 core/pom.xml                                          | 10 +++++-----
 .../stapler/compression/CompressionFilterTest.java    |  2 +-
 .../java/org/kohsuke/stapler/test/JettyTestCase.java  |  6 +++---
 jelly/pom.xml                                         | 10 +++++-----
 pom.xml                                               | 11 ++++++++++-
 5 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 009336f31..51e343936 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/compression/CompressionFilterTest.java b/core/src/test/java/org/kohsuke/stapler/compression/CompressionFilterTest.java
index e70f6fc4b..06acaacb3 100644
--- a/core/src/test/java/org/kohsuke/stapler/compression/CompressionFilterTest.java
+++ b/core/src/test/java/org/kohsuke/stapler/compression/CompressionFilterTest.java
@@ -12,7 +12,7 @@
 import java.util.zip.GZIPOutputStream;
 import javax.servlet.DispatcherType;
 import org.apache.commons.io.IOUtils;
-import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee8.servlet.ServletContextHandler;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 import org.kohsuke.stapler.test.JettyTestCase;
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 1089d03c7..0041f9c92 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 44b5a2863..4cf07fb05 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 0176aeb44..2188b1195 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,8 +42,10 @@
   <properties>
     <changelist>999999-SNAPSHOT</changelist>
     <scmTag>HEAD</scmTag>
-    <jetty.version>10.0.21</jetty.version>
+    <jetty.version>12.0.10</jetty.version>
     <gitHubRepo>jenkinsci/stapler</gitHubRepo>
+    <!-- TODO JENKINS-73121 until in parent POM -->
+    <maven.compiler.release>17</maven.compiler.release>
     <spotless.check.skip>false</spotless.check.skip>
   </properties>
 
@@ -56,6 +58,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>