From 2be434750d07a205f08bc6c23a1dcbc7e59d34e9 Mon Sep 17 00:00:00 2001
From: Vincent Latombe <vincent@latombe.net>
Date: Tue, 21 Jan 2025 10:10:24 +0100
Subject: [PATCH 1/5] Move existing web.xml to web-fragment.xml under core

---
 .../main/resources/META-INF/web-fragment.xml  | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)
 rename war/src/main/webapp/WEB-INF/web.xml => core/src/main/resources/META-INF/web-fragment.xml (95%)

diff --git a/war/src/main/webapp/WEB-INF/web.xml b/core/src/main/resources/META-INF/web-fragment.xml
similarity index 95%
rename from war/src/main/webapp/WEB-INF/web.xml
rename to core/src/main/resources/META-INF/web-fragment.xml
index 4ef6db9e3fb5..c9acb6e1513c 100644
--- a/war/src/main/webapp/WEB-INF/web.xml
+++ b/core/src/main/resources/META-INF/web-fragment.xml
@@ -23,13 +23,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
-         version="3.1"
-         metadata-complete="true">
-  <display-name>Jenkins v${project.version}</display-name>
-  <description>Build management system</description>
+<web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd"
+              version="3.1">
+  <name>jenkins</name>
 
   <servlet>
     <servlet-name>Stapler</servlet-name>
@@ -97,13 +95,13 @@ THE SOFTWARE.
 	Cache-Control: no-cache for any files behind the security-constraint
 	below.  So if Hudson is on a public server, and you want to only allow
 	authorized users to access it, you may want to pay attention to this.
-	
+
 	See: http://www.nabble.com/No-browser-caching-with-Hudson- -tf4601857.html
-  
+
   <filter>
     <filter-name>change-headers-filter</filter-name>
     <filter-class>hudson.ResponseHeaderFilter</filter-class>
-    <!- The value listed here is for 24 hours.  Increase or decrease as you see 
+    <!- The value listed here is for 24 hours.  Increase or decrease as you see
     fit.  Value is in seconds. Make sure to keep the public option ->
     <init-param>
       <param-name>Cache-Control</param-name>
@@ -205,7 +203,7 @@ THE SOFTWARE.
       <role-name>**</role-name>
     </auth-constraint>
   </security-constraint>
-  
+
   <!-- Disable TRACE method with security constraint (copied from jetty/webdefaults.xml) -->
   <security-constraint>
     <web-resource-collection>
@@ -215,13 +213,13 @@ THE SOFTWARE.
     </web-resource-collection>
     <auth-constraint />
   </security-constraint>
-  
+
   <security-constraint>
     <web-resource-collection>
       <web-resource-name>other</web-resource-name>
       <url-pattern>/*</url-pattern>
     </web-resource-collection>
-    <!-- no security constraint --> 
+    <!-- no security constraint -->
   </security-constraint>
 
   <login-config>
@@ -278,4 +276,4 @@ THE SOFTWARE.
     </cookie-config>
     <!-- Tracking mode is managed by WebAppMain.FORCE_SESSION_TRACKING_BY_COOKIE_PROP -->
   </session-config>
-</web-app>
+</web-fragment>

From 0ce386f9269c99cb25d5bd4198a180f445bd3926 Mon Sep 17 00:00:00 2001
From: Vincent Latombe <vincent@latombe.net>
Date: Tue, 21 Jan 2025 10:10:51 +0100
Subject: [PATCH 2/5] Add the new web.xml

---
 war/src/main/webapp/WEB-INF/web.xml | 32 +++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 war/src/main/webapp/WEB-INF/web.xml

diff --git a/war/src/main/webapp/WEB-INF/web.xml b/war/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000000..5e86c73a222e
--- /dev/null
+++ b/war/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+The MIT License
+
+Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Tom Huybrechts, id:digerata, Yahoo! Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+         version="3.1">
+  <display-name>Jenkins v${project.version}</display-name>
+  <description>Build management system</description>
+</web-app>

From dbb7435592542054f3da2ab147a12a2604d9e3f2 Mon Sep 17 00:00:00 2001
From: Vincent Latombe <vincent@latombe.net>
Date: Tue, 21 Jan 2025 10:17:23 +0100
Subject: [PATCH 3/5] Update JTH to a version supporting web fragments

---
 test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index 50503ad6ca0a..675f1288dd0e 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -178,7 +178,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>2380.vc51ea_a_cf2711</version>
+      <version>2381.v52b_0b_d2e3763</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

From c0025333f414ef9611b61232e20ff0598a39d474 Mon Sep 17 00:00:00 2001
From: Vincent Latombe <vincent@latombe.net>
Date: Wed, 22 Jan 2025 09:07:10 +0100
Subject: [PATCH 4/5] Pick up JTH release

---
 test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index 675f1288dd0e..594caf1542c0 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -178,7 +178,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>2381.v52b_0b_d2e3763</version>
+      <version>2384.va_d3a_58a_4b_df5</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

From 01fdf90a2a49e4a88b27b20e471d4a5808b0e644 Mon Sep 17 00:00:00 2001
From: Vincent Latombe <vincent@latombe.net>
Date: Thu, 23 Jan 2025 10:49:10 +0100
Subject: [PATCH 5/5] Update jth to version with all fixes

---
 test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index 594caf1542c0..8f2d2b223249 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -178,7 +178,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>2384.va_d3a_58a_4b_df5</version>
+      <version>2385.vfe86233d0d36</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>