From ccf544e914bbda0680ee28750da59cca23526271 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Sat, 25 Jun 2022 08:59:34 -0700
Subject: [PATCH 1/7] Testing Jetty 10

---
 war/pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/war/pom.xml b/war/pom.xml
index 18171674aa9f..d91e3dbde7ea 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -138,7 +138,8 @@ THE SOFTWARE.
       <groupId>org.jenkins-ci</groupId>
       <artifactId>winstone</artifactId>
       <!-- Make sure to keep jetty-maven-plugin elsewhere in this file in sync with the Jetty release in Winstone -->
-      <version>5.25</version>
+      <!-- TODO https://github.com/jenkinsci/winstone/pull/181 -->
+      <version>6.0-rc723.85cb_40656494</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -499,7 +500,7 @@ THE SOFTWARE.
       <plugin>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
-        <version>9.4.46.v20220331</version>
+        <version>10.0.11</version>
         <configuration>
           <!--
             Reload webapp when you hit ENTER. (See JETTY-282 for more)

From de527a76c223daee7d6cf6d38d685813ed91037d Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Wed, 29 Jun 2022 16:15:13 -0700
Subject: [PATCH 2/7] Released version of Winstone

---
 war/pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/war/pom.xml b/war/pom.xml
index 560d6bf55d6e..bd9289d5aef4 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -138,8 +138,7 @@ THE SOFTWARE.
       <groupId>org.jenkins-ci</groupId>
       <artifactId>winstone</artifactId>
       <!-- Make sure to keep jetty-maven-plugin elsewhere in this file in sync with the Jetty release in Winstone -->
-      <!-- TODO https://github.com/jenkinsci/winstone/pull/181 -->
-      <version>6.0-rc723.85cb_40656494</version>
+      <version>6.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

From 036ef77e3701d34c7797bdd9e092c41aee911241 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Wed, 29 Jun 2022 16:41:42 -0700
Subject: [PATCH 3/7] Update Servlet API

---
 core/pom.xml | 6 +++---
 war/pom.xml  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 7ea13c2057ca..03c2a0031cba 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -468,9 +468,9 @@ THE SOFTWARE.
       <version>1.1.4c</version>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>4.0.4</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/war/pom.xml b/war/pom.xml
index bd9289d5aef4..292dcfbd824d 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.
         -->
         <exclusion>
-          <groupId>javax.servlet.jsp</groupId>
-          <artifactId>javax.servlet.jsp-api</artifactId>
+          <groupId>jakarta.servlet.jsp</groupId>
+          <artifactId>jakarta.servlet.jsp-api</artifactId>
         </exclusion>
         <!-- Stapler 1.195 fails to declare this as optional, and the 1.1 version lacks a license: -->
         <exclusion>

From a6266d19eaeb16deef5cefdc2e0f4637d5fbecec Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Wed, 29 Jun 2022 16:43:05 -0700
Subject: [PATCH 4/7] Update Dependabot

---
 .github/dependabot.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 69f351ca5ceb..2a767d73afee 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.

From d2eed60159723a330f9b53a4876e3b0654a4e652 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Wed, 29 Jun 2022 17:17:21 -0700
Subject: [PATCH 5/7] Use incremental of Stapler

---
 bom/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index f070d681f9a8..65449a80f11d 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -40,7 +40,8 @@ THE SOFTWARE.
   <properties>
     <asm.version>9.3</asm.version>
     <slf4jVersion>1.7.36</slf4jVersion>
-    <stapler.version>1685.v3b_5035c4ce05</stapler.version>
+    <!-- TODO https://github.com/jenkinsci/stapler/pull/305 -->
+    <stapler.version>1711.v4179001cc874</stapler.version>
     <groovy.version>2.4.21</groovy.version>
   </properties>
 

From 4656c068083b0d43e6a8f2deb926a076cea11ba2 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Thu, 30 Jun 2022 09:09:38 -0700
Subject: [PATCH 6/7] Use released version of Stapler

---
 bom/pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 65449a80f11d..7d5717e77258 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -40,8 +40,7 @@ THE SOFTWARE.
   <properties>
     <asm.version>9.3</asm.version>
     <slf4jVersion>1.7.36</slf4jVersion>
-    <!-- TODO https://github.com/jenkinsci/stapler/pull/305 -->
-    <stapler.version>1711.v4179001cc874</stapler.version>
+    <stapler.version>1711.v5b_1b_03f0fcf2</stapler.version>
     <groovy.version>2.4.21</groovy.version>
   </properties>
 

From 2e87a661e84b8ce9495b3fba5a1c8f28dfd9286f Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Sun, 3 Jul 2022 16:17:40 -0700
Subject: [PATCH 7/7] Add Stapler/Jelly excludes

---
 war/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/war/pom.xml b/war/pom.xml
index ed34048aef9b..ca296d07d98a 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -172,8 +172,12 @@ THE SOFTWARE.
                 <enforceBytecodeVersion>
                   <maxJdkVersion>1.8</maxJdkVersion>
                   <excludes>
+                    <exclude>org.jenkins-ci:commons-jelly</exclude>
                     <exclude>org.jenkins-ci.main:cli</exclude>
                     <exclude>org.jenkins-ci.main:jenkins-core</exclude>
+                    <exclude>org.kohsuke.stapler:stapler</exclude>
+                    <exclude>org.kohsuke.stapler:stapler-groovy</exclude>
+                    <exclude>org.kohsuke.stapler:stapler-jelly</exclude>
                   </excludes>
                 </enforceBytecodeVersion>
               </rules>