From 799b0c8796f7905fd3b6ec8764ada22f86d99a28 Mon Sep 17 00:00:00 2001
From: Nihal Jain <nihaljain@apache.org>
Date: Wed, 12 Mar 2025 01:33:43 +0530
Subject: [PATCH 01/12] HBASE-XXXX Add a jetty 12 module with EE8

---
 hbase-shaded-jetty-ee8/pom.xml | 262 +++++++++++++++++++++++++++++++++
 pom.xml                        |   3 +
 2 files changed, 265 insertions(+)
 create mode 100644 hbase-shaded-jetty-ee8/pom.xml

diff --git a/hbase-shaded-jetty-ee8/pom.xml b/hbase-shaded-jetty-ee8/pom.xml
new file mode 100644
index 0000000..6d706a5
--- /dev/null
+++ b/hbase-shaded-jetty-ee8/pom.xml
@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <!--
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+  ON MVN COMPILE NOT WORKING
+
+  If you wondering why 'mvn compile' does not work building HBase
+  (in particular, if you are doing it for the first time), instead do
+  'mvn package'.  If you are interested in the full story, see
+  https://issues.apache.org/jira/browse/HBASE-6795.
+
+-->
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.hbase.thirdparty</groupId>
+    <artifactId>hbase-thirdparty</artifactId>
+    <version>${revision}</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <artifactId>hbase-shaded-jetty-ee8</artifactId>
+  <name>Apache HBase Relocated (Shaded) Jetty Libs: EE8</name>
+  <description>Pulls down Jetty, relocates it and makes a far jar.</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
+      <version>${jetty12.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.ee8</groupId>
+      <artifactId>jetty-ee8-servlet</artifactId>
+      <version>${jetty12.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.eclipse.jetty</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.ee8</groupId>
+      <artifactId>jetty-ee8-security</artifactId>
+      <version>${jetty12.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.ee8</groupId>
+      <artifactId>jetty-ee8-nested</artifactId>
+      <version>${jetty12.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-http</artifactId>
+      <version>${jetty12.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <version>${jetty12.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-io</artifactId>
+      <version>${jetty12.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-jmx</artifactId>
+      <version>${jetty12.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.ee8</groupId>
+      <artifactId>jetty-ee8-webapp</artifactId>
+      <version>${jetty12.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util-ajax</artifactId>
+      <version>${jetty12.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>${servlet4-api.version}</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-clean-plugin</artifactId>
+        <configuration>
+          <filesets>
+            <fileset>
+              <directory>${basedir}</directory>
+              <includes>
+                <include>dependency-reduced-pom.xml</include>
+              </includes>
+            </fileset>
+          </filesets>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <phase>package</phase>
+            <configuration>
+              <shadeSourcesContent>true</shadeSourcesContent>
+              <createSourcesJar>true</createSourcesJar>
+              <relocations>
+                <relocation>
+                  <pattern>org.eclipse.jetty</pattern>
+                  <shadedPattern>${rename.offset}.org.eclipse.jetty</shadedPattern>
+                </relocation>
+                <!--
+                This is for relocating the blacklist in
+                org.eclipse.jetty.webapp.WebAppContext.__dftServerClasses,
+                where we have a '-' in front of the class name
+                -->
+                <relocation>
+                  <pattern>-org.eclipse.jetty</pattern>
+                  <shadedPattern>-${rename.offset}.org.eclipse.jetty</shadedPattern>
+                </relocation>
+              </relocations>
+              <artifactSet>
+                <excludes>
+                  <!--
+                      Anything added here needs to be excluded from the jar that pulls it in
+                      also else we give an odd signal in the META-INF/DEPENDENCIES that we
+                      produce. See below for how to exclusion of transitive dependencies.
+                    -->
+                  <exclude>javax.servlet:javax.servlet-api</exclude>
+                  <exclude>org.slf4j:slf4j-api</exclude>
+                  <!-- On the "next" build, exclude a lingering shaded jar if it exists (user did not `clean`).
+                    Maven will happily pick up the previous shaded jar and try to include that in the N+1th build
+                    if we don't exclude it. This will result in a failure in the ServicesResourceTransformer claiming
+                    that we've already packaged a services file once. -->
+                  <exclude>org.apache.hbase.thirdparty:hbase-shaded-jetty</exclude>
+                </excludes>
+              </artifactSet>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
+                  <addHeader>false</addHeader>
+                </transformer>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+              </transformers>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <!--
+          The webdefault.xml contains some jetty servlet classes which should also be relocated
+          -->
+          <execution>
+            <id>relocate-web-xml</id>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <phase>package</phase>
+            <configuration>
+              <target>
+                <echo message="unjar"/>
+                <unzip dest="${project.build.directory}/unpacked/" src="${project.build.directory}/${project.artifactId}-${project.version}.jar"/>
+                <echo message="Replace content in webdefault-ee8.xml"/>
+                <replace file="${project.build.directory}/unpacked/${rename.offset.dir}/org/eclipse/jetty/ee8/webapp/webdefault-ee8.xml">
+                  <replacetoken>org.eclipse.jetty</replacetoken>
+                  <replacevalue>${rename.offset}.org.eclipse.jetty</replacevalue>
+                </replace>
+                <echo message="Redo jar"/>
+                <jar basedir="${project.build.directory}/unpacked" destfile="${project.build.directory}/${project.artifactId}-${project.version}.jar"/>
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/pom.xml b/pom.xml
index 89fe06d..ce96a35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,6 +100,7 @@
     <module>hbase-shaded-gson</module>
     <module>hbase-shaded-miscellaneous</module>
     <module>hbase-shaded-jetty</module>
+    <module>hbase-shaded-jetty-ee8</module>
     <module>hbase-shaded-jersey</module>
     <module>hbase-shaded-jackson-jaxrs-json-provider</module>
     <module>hbase-noop-htrace</module>
@@ -139,7 +140,9 @@
     <error_prone_annotations.version>2.36.0</error_prone_annotations.version>
     <gson.version>2.11.0</gson.version>
     <jetty.version>9.4.56.v20240826</jetty.version>
+    <jetty12.version>12.0.16</jetty12.version>
     <servlet-api.version>3.1.0</servlet-api.version>
+    <servlet4-api.version>4.0.1</servlet4-api.version>
     <jersey.version>2.46</jersey.version>
     <jakarta.inject.version>2.6.1</jakarta.inject.version>
     <jakarta.ws.rs-api.version>2.1.6</jakarta.ws.rs-api.version>

From 57e7fd53b56a2036945b8c56aac0cca5332f6dda Mon Sep 17 00:00:00 2001
From: Nihal Jain <nihaljain@apache.org>
Date: Thu, 27 Mar 2025 17:35:06 +0530
Subject: [PATCH 02/12] HBASE-XXXX Add a jetty 12 module with EE8

---
 hbase-shaded-jetty-ee8/pom.xml | 2 +-
 pom.xml                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hbase-shaded-jetty-ee8/pom.xml b/hbase-shaded-jetty-ee8/pom.xml
index 6d706a5..ac09d42 100644
--- a/hbase-shaded-jetty-ee8/pom.xml
+++ b/hbase-shaded-jetty-ee8/pom.xml
@@ -233,7 +233,7 @@
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <!--
-          The webdefault.xml contains some jetty servlet classes which should also be relocated
+          The webdefault-ee8.xml contains some jetty servlet classes which should also be relocated
           -->
           <execution>
             <id>relocate-web-xml</id>
diff --git a/pom.xml b/pom.xml
index ce96a35..0fdd813 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,7 +140,7 @@
     <error_prone_annotations.version>2.36.0</error_prone_annotations.version>
     <gson.version>2.11.0</gson.version>
     <jetty.version>9.4.56.v20240826</jetty.version>
-    <jetty12.version>12.0.16</jetty12.version>
+    <jetty12.version>12.0.18</jetty12.version>
     <servlet-api.version>3.1.0</servlet-api.version>
     <servlet4-api.version>4.0.1</servlet4-api.version>
     <jersey.version>2.46</jersey.version>

From 08307f08e70ca27fca21a05a5d31c7db71fe6370 Mon Sep 17 00:00:00 2001
From: Nihal Jain <nihaljain@apache.org>
Date: Thu, 27 Mar 2025 20:14:13 +0530
Subject: [PATCH 03/12] Make changes to test EE8 + EE9 in single module

---
 .../pom.xml                                   | 99 ++++++++++++++-----
 pom.xml                                       |  2 +-
 2 files changed, 77 insertions(+), 24 deletions(-)
 rename {hbase-shaded-jetty-ee8 => hbase-shaded-jetty-12-plus}/pom.xml (81%)

diff --git a/hbase-shaded-jetty-ee8/pom.xml b/hbase-shaded-jetty-12-plus/pom.xml
similarity index 81%
rename from hbase-shaded-jetty-ee8/pom.xml
rename to hbase-shaded-jetty-12-plus/pom.xml
index ac09d42..5999cdb 100644
--- a/hbase-shaded-jetty-ee8/pom.xml
+++ b/hbase-shaded-jetty-12-plus/pom.xml
@@ -35,8 +35,8 @@
     <version>${revision}</version>
     <relativePath>..</relativePath>
   </parent>
-  <artifactId>hbase-shaded-jetty-ee8</artifactId>
-  <name>Apache HBase Relocated (Shaded) Jetty Libs: EE8</name>
+  <artifactId>hbase-shaded-jetty-12-plus</artifactId>
+  <name>Apache HBase Relocated (Shaded) Jetty 12+ Libs</name>
   <description>Pulls down Jetty, relocates it and makes a far jar.</description>
   <dependencies>
     <dependency>
@@ -51,14 +51,21 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.ee8</groupId>
-      <artifactId>jetty-ee8-servlet</artifactId>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-http</artifactId>
       <version>${jetty12.version}</version>
       <exclusions>
         <exclusion>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>servlet-api</artifactId>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
         </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <version>${jetty12.version}</version>
+      <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>
           <artifactId>slf4j-api</artifactId>
@@ -66,8 +73,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.ee8</groupId>
-      <artifactId>jetty-ee8-security</artifactId>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-io</artifactId>
       <version>${jetty12.version}</version>
       <exclusions>
         <exclusion>
@@ -77,8 +84,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.ee8</groupId>
-      <artifactId>jetty-ee8-nested</artifactId>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-jmx</artifactId>
       <version>${jetty12.version}</version>
       <exclusions>
         <exclusion>
@@ -89,7 +96,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-http</artifactId>
+      <artifactId>jetty-util-ajax</artifactId>
       <version>${jetty12.version}</version>
       <exclusions>
         <exclusion>
@@ -99,10 +106,14 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-util</artifactId>
+      <groupId>org.eclipse.jetty.ee8</groupId>
+      <artifactId>jetty-ee8-servlet</artifactId>
       <version>${jetty12.version}</version>
       <exclusions>
+        <exclusion>
+          <groupId>org.eclipse.jetty</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
         <exclusion>
           <groupId>org.slf4j</groupId>
           <artifactId>slf4j-api</artifactId>
@@ -110,8 +121,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-io</artifactId>
+      <groupId>org.eclipse.jetty.ee8</groupId>
+      <artifactId>jetty-ee8-security</artifactId>
       <version>${jetty12.version}</version>
       <exclusions>
         <exclusion>
@@ -121,8 +132,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-jmx</artifactId>
+      <groupId>org.eclipse.jetty.ee8</groupId>
+      <artifactId>jetty-ee8-nested</artifactId>
       <version>${jetty12.version}</version>
       <exclusions>
         <exclusion>
@@ -142,11 +153,17 @@
         </exclusion>
       </exclusions>
     </dependency>
+
+    <!-- TODO Added here just for testing purpose, Drop before merge? -->
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-util-ajax</artifactId>
+      <groupId>org.eclipse.jetty.ee9</groupId>
+      <artifactId>jetty-ee9-servlet</artifactId>
       <version>${jetty12.version}</version>
       <exclusions>
+        <exclusion>
+          <groupId>org.eclipse.jetty</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
         <exclusion>
           <groupId>org.slf4j</groupId>
           <artifactId>slf4j-api</artifactId>
@@ -154,9 +171,37 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>${servlet4-api.version}</version>
+      <groupId>org.eclipse.jetty.ee9</groupId>
+      <artifactId>jetty-ee9-security</artifactId>
+      <version>${jetty12.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.ee9</groupId>
+      <artifactId>jetty-ee9-nested</artifactId>
+      <version>${jetty12.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.ee9</groupId>
+      <artifactId>jetty-ee9-webapp</artifactId>
+      <version>${jetty12.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
   <build>
@@ -214,7 +259,7 @@
                     Maven will happily pick up the previous shaded jar and try to include that in the N+1th build
                     if we don't exclude it. This will result in a failure in the ServicesResourceTransformer claiming
                     that we've already packaged a services file once. -->
-                  <exclude>org.apache.hbase.thirdparty:hbase-shaded-jetty</exclude>
+                  <exclude>org.apache.hbase.thirdparty:hbase-shaded-jetty-12-plus</exclude>
                 </excludes>
               </artifactSet>
               <transformers>
@@ -250,6 +295,14 @@
                   <replacetoken>org.eclipse.jetty</replacetoken>
                   <replacevalue>${rename.offset}.org.eclipse.jetty</replacevalue>
                 </replace>
+
+                <!-- TODO Added here just for testing purpose, Drop before merge? -->
+                <echo message="Replace content in webdefault-ee9.xml"/>
+                <replace file="${project.build.directory}/unpacked/${rename.offset.dir}/org/eclipse/jetty/ee9/webapp/webdefault-ee9.xml">
+                  <replacetoken>org.eclipse.jetty</replacetoken>
+                  <replacevalue>${rename.offset}.org.eclipse.jetty</replacevalue>
+                </replace>
+
                 <echo message="Redo jar"/>
                 <jar basedir="${project.build.directory}/unpacked" destfile="${project.build.directory}/${project.artifactId}-${project.version}.jar"/>
               </target>
diff --git a/pom.xml b/pom.xml
index 0fdd813..418d0e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,7 @@
     <module>hbase-shaded-gson</module>
     <module>hbase-shaded-miscellaneous</module>
     <module>hbase-shaded-jetty</module>
-    <module>hbase-shaded-jetty-ee8</module>
+    <module>hbase-shaded-jetty-12-plus</module>
     <module>hbase-shaded-jersey</module>
     <module>hbase-shaded-jackson-jaxrs-json-provider</module>
     <module>hbase-noop-htrace</module>

From 03408a5e076e7f6b0a55e32fd6da2a4f9c808e19 Mon Sep 17 00:00:00 2001
From: Nihal Jain <nihaljain@apache.org>
Date: Fri, 28 Mar 2025 13:52:06 +0530
Subject: [PATCH 04/12] Break into core, core + EE8 and core  + EE9; Also bump
 shade plugin as otherwise getting error when including core into sub module

---
 hbase-shaded-jetty-12-plus-core/pom.xml       | 179 ++++++++++++++++
 .../pom.xml                                   | 145 ++-----------
 hbase-shaded-jetty-12-plus-ee9/pom.xml        | 196 ++++++++++++++++++
 pom.xml                                       |   7 +-
 4 files changed, 393 insertions(+), 134 deletions(-)
 create mode 100644 hbase-shaded-jetty-12-plus-core/pom.xml
 rename {hbase-shaded-jetty-12-plus => hbase-shaded-jetty-12-plus-ee8}/pom.xml (61%)
 create mode 100644 hbase-shaded-jetty-12-plus-ee9/pom.xml

diff --git a/hbase-shaded-jetty-12-plus-core/pom.xml b/hbase-shaded-jetty-12-plus-core/pom.xml
new file mode 100644
index 0000000..67841b4
--- /dev/null
+++ b/hbase-shaded-jetty-12-plus-core/pom.xml
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <!--
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+  ON MVN COMPILE NOT WORKING
+
+  If you wondering why 'mvn compile' does not work building HBase
+  (in particular, if you are doing it for the first time), instead do
+  'mvn package'.  If you are interested in the full story, see
+  https://issues.apache.org/jira/browse/HBASE-6795.
+
+-->
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.hbase.thirdparty</groupId>
+    <artifactId>hbase-thirdparty</artifactId>
+    <version>${revision}</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <artifactId>hbase-shaded-jetty-12-plus-core</artifactId>
+  <name>Apache HBase Relocated (Shaded) Jetty 12+ Libs: Core</name>
+  <description>Pulls down Jetty core, relocates it and makes a far jar.</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
+      <version>${jetty12.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-http</artifactId>
+      <version>${jetty12.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <version>${jetty12.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-io</artifactId>
+      <version>${jetty12.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-jmx</artifactId>
+      <version>${jetty12.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util-ajax</artifactId>
+      <version>${jetty12.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-clean-plugin</artifactId>
+        <configuration>
+          <filesets>
+            <fileset>
+              <directory>${basedir}</directory>
+              <includes>
+                <include>dependency-reduced-pom.xml</include>
+              </includes>
+            </fileset>
+          </filesets>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <phase>package</phase>
+            <configuration>
+              <shadeSourcesContent>true</shadeSourcesContent>
+              <createSourcesJar>true</createSourcesJar>
+              <relocations>
+                <relocation>
+                  <pattern>org.eclipse.jetty</pattern>
+                  <shadedPattern>${rename.offset}.org.eclipse.jetty</shadedPattern>
+                </relocation>
+                <!--
+                This is for relocating the blacklist in
+                org.eclipse.jetty.webapp.WebAppContext.__dftServerClasses,
+                where we have a '-' in front of the class name
+                -->
+                <relocation>
+                  <pattern>-org.eclipse.jetty</pattern>
+                  <shadedPattern>-${rename.offset}.org.eclipse.jetty</shadedPattern>
+                </relocation>
+              </relocations>
+              <artifactSet>
+                <excludes>
+                  <!--
+                     Anything added here needs to be excluded from the jar that pulls it in
+                     also else we give an odd signal in the META-INF/DEPENDENCIES that we
+                     produce. See below for how to exclusion of transitive dependencies.
+                   -->
+                  <exclude>org.slf4j:slf4j-api</exclude>
+                 <!-- On the "next" build, exclude a lingering shaded jar if it exists (user did not `clean`).
+                   Maven will happily pick up the previous shaded jar and try to include that in the N+1th build
+                   if we don't exclude it. This will result in a failure in the ServicesResourceTransformer claiming
+                   that we've already packaged a services file once. -->
+                  <exclude>org.apache.hbase.thirdparty:hbase-shaded-jetty-12-plus-core</exclude>
+                </excludes>
+              </artifactSet>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
+                  <addHeader>false</addHeader>
+                </transformer>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+              </transformers>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/hbase-shaded-jetty-12-plus/pom.xml b/hbase-shaded-jetty-12-plus-ee8/pom.xml
similarity index 61%
rename from hbase-shaded-jetty-12-plus/pom.xml
rename to hbase-shaded-jetty-12-plus-ee8/pom.xml
index 5999cdb..22288df 100644
--- a/hbase-shaded-jetty-12-plus/pom.xml
+++ b/hbase-shaded-jetty-12-plus-ee8/pom.xml
@@ -35,75 +35,14 @@
     <version>${revision}</version>
     <relativePath>..</relativePath>
   </parent>
-  <artifactId>hbase-shaded-jetty-12-plus</artifactId>
-  <name>Apache HBase Relocated (Shaded) Jetty 12+ Libs</name>
-  <description>Pulls down Jetty, relocates it and makes a far jar.</description>
+  <artifactId>hbase-shaded-jetty-12-plus-ee8</artifactId>
+  <name>Apache HBase Relocated (Shaded) Jetty 12+ Libs: EE8</name>
+  <description>Pulls down Jetty EE8, relocates it and makes a far jar.</description>
   <dependencies>
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-server</artifactId>
-      <version>${jetty12.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-http</artifactId>
-      <version>${jetty12.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-util</artifactId>
-      <version>${jetty12.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-io</artifactId>
-      <version>${jetty12.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-jmx</artifactId>
-      <version>${jetty12.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-util-ajax</artifactId>
-      <version>${jetty12.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
+      <groupId>org.apache.hbase.thirdparty</groupId>
+      <artifactId>hbase-shaded-jetty-12-plus-core</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.ee8</groupId>
@@ -153,56 +92,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-
-    <!-- TODO Added here just for testing purpose, Drop before merge? -->
-    <dependency>
-      <groupId>org.eclipse.jetty.ee9</groupId>
-      <artifactId>jetty-ee9-servlet</artifactId>
-      <version>${jetty12.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>servlet-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.ee9</groupId>
-      <artifactId>jetty-ee9-security</artifactId>
-      <version>${jetty12.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.ee9</groupId>
-      <artifactId>jetty-ee9-nested</artifactId>
-      <version>${jetty12.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.ee9</groupId>
-      <artifactId>jetty-ee9-webapp</artifactId>
-      <version>${jetty12.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -235,6 +124,9 @@
                 <relocation>
                   <pattern>org.eclipse.jetty</pattern>
                   <shadedPattern>${rename.offset}.org.eclipse.jetty</shadedPattern>
+                  <excludes>
+                    <exclude>org.apache.hbase.thirdparty:hbase-shaded-jetty-12-plus-core</exclude>
+                  </excludes>
                 </relocation>
                 <!--
                 This is for relocating the blacklist in
@@ -249,17 +141,16 @@
               <artifactSet>
                 <excludes>
                   <!--
-                      Anything added here needs to be excluded from the jar that pulls it in
-                      also else we give an odd signal in the META-INF/DEPENDENCIES that we
-                      produce. See below for how to exclusion of transitive dependencies.
-                    -->
-                  <exclude>javax.servlet:javax.servlet-api</exclude>
+                     Anything added here needs to be excluded from the jar that pulls it in
+                     also else we give an odd signal in the META-INF/DEPENDENCIES that we
+                     produce. See below for how to exclusion of transitive dependencies.
+                   -->
                   <exclude>org.slf4j:slf4j-api</exclude>
                   <!-- On the "next" build, exclude a lingering shaded jar if it exists (user did not `clean`).
                     Maven will happily pick up the previous shaded jar and try to include that in the N+1th build
                     if we don't exclude it. This will result in a failure in the ServicesResourceTransformer claiming
                     that we've already packaged a services file once. -->
-                  <exclude>org.apache.hbase.thirdparty:hbase-shaded-jetty-12-plus</exclude>
+                  <exclude>org.apache.hbase.thirdparty:hbase-shaded-jetty-12-plus-e8</exclude>
                 </excludes>
               </artifactSet>
               <transformers>
@@ -295,14 +186,6 @@
                   <replacetoken>org.eclipse.jetty</replacetoken>
                   <replacevalue>${rename.offset}.org.eclipse.jetty</replacevalue>
                 </replace>
-
-                <!-- TODO Added here just for testing purpose, Drop before merge? -->
-                <echo message="Replace content in webdefault-ee9.xml"/>
-                <replace file="${project.build.directory}/unpacked/${rename.offset.dir}/org/eclipse/jetty/ee9/webapp/webdefault-ee9.xml">
-                  <replacetoken>org.eclipse.jetty</replacetoken>
-                  <replacevalue>${rename.offset}.org.eclipse.jetty</replacevalue>
-                </replace>
-
                 <echo message="Redo jar"/>
                 <jar basedir="${project.build.directory}/unpacked" destfile="${project.build.directory}/${project.artifactId}-${project.version}.jar"/>
               </target>
diff --git a/hbase-shaded-jetty-12-plus-ee9/pom.xml b/hbase-shaded-jetty-12-plus-ee9/pom.xml
new file mode 100644
index 0000000..ee19693
--- /dev/null
+++ b/hbase-shaded-jetty-12-plus-ee9/pom.xml
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <!--
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+  ON MVN COMPILE NOT WORKING
+
+  If you wondering why 'mvn compile' does not work building HBase
+  (in particular, if you are doing it for the first time), instead do
+  'mvn package'.  If you are interested in the full story, see
+  https://issues.apache.org/jira/browse/HBASE-6795.
+
+-->
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.hbase.thirdparty</groupId>
+    <artifactId>hbase-thirdparty</artifactId>
+    <version>${revision}</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <artifactId>hbase-shaded-jetty-12-plus-ee9</artifactId>
+  <name>Apache HBase Relocated (Shaded) Jetty 12+ Libs: EE9</name>
+  <description>Pulls down Jetty EE9, relocates it and makes a far jar.</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.hbase.thirdparty</groupId>
+      <artifactId>hbase-shaded-jetty-12-plus-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.ee9</groupId>
+      <artifactId>jetty-ee9-servlet</artifactId>
+      <version>${jetty12.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.eclipse.jetty</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.ee9</groupId>
+      <artifactId>jetty-ee9-security</artifactId>
+      <version>${jetty12.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.ee9</groupId>
+      <artifactId>jetty-ee9-nested</artifactId>
+      <version>${jetty12.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.ee9</groupId>
+      <artifactId>jetty-ee9-webapp</artifactId>
+      <version>${jetty12.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-clean-plugin</artifactId>
+        <configuration>
+          <filesets>
+            <fileset>
+              <directory>${basedir}</directory>
+              <includes>
+                <include>dependency-reduced-pom.xml</include>
+              </includes>
+            </fileset>
+          </filesets>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <phase>package</phase>
+            <configuration>
+              <shadeSourcesContent>true</shadeSourcesContent>
+              <createSourcesJar>true</createSourcesJar>
+              <relocations>
+                <relocation>
+                  <pattern>org.eclipse.jetty</pattern>
+                  <shadedPattern>${rename.offset}.org.eclipse.jetty</shadedPattern>
+                </relocation>
+                <!--
+                This is for relocating the blacklist in
+                org.eclipse.jetty.webapp.WebAppContext.__dftServerClasses,
+                where we have a '-' in front of the class name
+                -->
+                <relocation>
+                  <pattern>-org.eclipse.jetty</pattern>
+                  <shadedPattern>-${rename.offset}.org.eclipse.jetty</shadedPattern>
+                </relocation>
+              </relocations>
+              <artifactSet>
+                <excludes>
+                  <!--
+                     Anything added here needs to be excluded from the jar that pulls it in
+                     also else we give an odd signal in the META-INF/DEPENDENCIES that we
+                     produce. See below for how to exclusion of transitive dependencies.
+                   -->
+                  <exclude>org.slf4j:slf4j-api</exclude>
+                  <!-- On the "next" build, exclude a lingering shaded jar if it exists (user did not `clean`).
+                    Maven will happily pick up the previous shaded jar and try to include that in the N+1th build
+                    if we don't exclude it. This will result in a failure in the ServicesResourceTransformer claiming
+                    that we've already packaged a services file once. -->
+                  <exclude>org.apache.hbase.thirdparty:hbase-shaded-jetty-12-plus-ee9</exclude>
+                </excludes>
+              </artifactSet>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
+                  <addHeader>false</addHeader>
+                </transformer>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+              </transformers>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <!--
+          The webdefault-ee9.xml contains some jetty servlet classes which should also be relocated
+          -->
+          <execution>
+            <id>relocate-web-xml</id>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <phase>package</phase>
+            <configuration>
+              <target>
+                <echo message="unjar"/>
+                <unzip dest="${project.build.directory}/unpacked/" src="${project.build.directory}/${project.artifactId}-${project.version}.jar"/>
+                <echo message="Replace content in webdefault-ee9.xml"/>
+                <replace file="${project.build.directory}/unpacked/${rename.offset.dir}/org/eclipse/jetty/ee9/webapp/webdefault-ee9.xml">
+                  <replacetoken>org.eclipse.jetty</replacetoken>
+                  <replacevalue>${rename.offset}.org.eclipse.jetty</replacevalue>
+                </replace>
+
+                <echo message="Redo jar"/>
+                <jar basedir="${project.build.directory}/unpacked" destfile="${project.build.directory}/${project.artifactId}-${project.version}.jar"/>
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/pom.xml b/pom.xml
index 418d0e7..45628ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,9 @@
     <module>hbase-shaded-gson</module>
     <module>hbase-shaded-miscellaneous</module>
     <module>hbase-shaded-jetty</module>
-    <module>hbase-shaded-jetty-12-plus</module>
+    <module>hbase-shaded-jetty-12-plus-core</module>
+    <module>hbase-shaded-jetty-12-plus-ee8</module>
+    <module>hbase-shaded-jetty-12-plus-ee9</module>
     <module>hbase-shaded-jersey</module>
     <module>hbase-shaded-jackson-jaxrs-json-provider</module>
     <module>hbase-noop-htrace</module>
@@ -142,7 +144,6 @@
     <jetty.version>9.4.56.v20240826</jetty.version>
     <jetty12.version>12.0.18</jetty12.version>
     <servlet-api.version>3.1.0</servlet-api.version>
-    <servlet4-api.version>4.0.1</servlet4-api.version>
     <jersey.version>2.46</jersey.version>
     <jakarta.inject.version>2.6.1</jakarta.inject.version>
     <jakarta.ws.rs-api.version>2.1.6</jakarta.ws.rs-api.version>
@@ -243,7 +244,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-shade-plugin</artifactId>
-          <version>3.5.0</version>
+          <version>3.5.2</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>

From 42fa791201113a9915a0558a3e998f3881676143 Mon Sep 17 00:00:00 2001
From: Nihal Jain <nihaljain@apache.org>
Date: Fri, 28 Mar 2025 14:20:49 +0530
Subject: [PATCH 05/12] Use excludes during shading to remove duplicate core's
 code in EEX modules

---
 hbase-shaded-jetty-12-plus-core/pom.xml | 20 ++++++++++++++++++++
 hbase-shaded-jetty-12-plus-ee8/pom.xml  | 19 +++++++++++--------
 hbase-shaded-jetty-12-plus-ee9/pom.xml  | 16 +++++++++++-----
 pom.xml                                 |  2 +-
 4 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/hbase-shaded-jetty-12-plus-core/pom.xml b/hbase-shaded-jetty-12-plus-core/pom.xml
index 67841b4..8e9894a 100644
--- a/hbase-shaded-jetty-12-plus-core/pom.xml
+++ b/hbase-shaded-jetty-12-plus-core/pom.xml
@@ -105,6 +105,26 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-security</artifactId>
+      <version>${jetty12.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-session</artifactId>
+      <version>${jetty12.version}</version>
+    </dependency>
+  <dependency>
+    <groupId>org.eclipse.jetty</groupId>
+    <artifactId>jetty-ee</artifactId>
+    <version>${jetty12.version}</version>
+  </dependency>
+    <dependency>
+    <groupId>org.eclipse.jetty</groupId>
+    <artifactId>jetty-xml</artifactId>
+    <version>${jetty12.version}</version>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
diff --git a/hbase-shaded-jetty-12-plus-ee8/pom.xml b/hbase-shaded-jetty-12-plus-ee8/pom.xml
index 22288df..1460711 100644
--- a/hbase-shaded-jetty-12-plus-ee8/pom.xml
+++ b/hbase-shaded-jetty-12-plus-ee8/pom.xml
@@ -39,11 +39,6 @@
   <name>Apache HBase Relocated (Shaded) Jetty 12+ Libs: EE8</name>
   <description>Pulls down Jetty EE8, relocates it and makes a far jar.</description>
   <dependencies>
-    <dependency>
-      <groupId>org.apache.hbase.thirdparty</groupId>
-      <artifactId>hbase-shaded-jetty-12-plus-core</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.ee8</groupId>
       <artifactId>jetty-ee8-servlet</artifactId>
@@ -124,9 +119,6 @@
                 <relocation>
                   <pattern>org.eclipse.jetty</pattern>
                   <shadedPattern>${rename.offset}.org.eclipse.jetty</shadedPattern>
-                  <excludes>
-                    <exclude>org.apache.hbase.thirdparty:hbase-shaded-jetty-12-plus-core</exclude>
-                  </excludes>
                 </relocation>
                 <!--
                 This is for relocating the blacklist in
@@ -146,6 +138,17 @@
                      produce. See below for how to exclusion of transitive dependencies.
                    -->
                   <exclude>org.slf4j:slf4j-api</exclude>
+                  <!--Exclude jetty core jars: we get a shaded version in adjacent module. -->
+                  <exclude>org.eclipse.jetty:jetty-server</exclude>
+                  <exclude>org.eclipse.jetty:jetty-http</exclude>
+                  <exclude>org.eclipse.jetty:jetty-util</exclude>
+                  <exclude>org.eclipse.jetty:jetty-io</exclude>
+                  <exclude>org.eclipse.jetty:jetty-jmx</exclude>
+                  <exclude>org.eclipse.jetty:jetty-util-ajax</exclude>
+                  <exclude>org.eclipse.jetty:jetty-security</exclude>
+                  <exclude>org.eclipse.jetty:jetty-session</exclude>
+                  <exclude>org.eclipse.jetty:jetty-ee</exclude>
+                  <exclude>org.eclipse.jetty:jetty-xml</exclude>
                   <!-- On the "next" build, exclude a lingering shaded jar if it exists (user did not `clean`).
                     Maven will happily pick up the previous shaded jar and try to include that in the N+1th build
                     if we don't exclude it. This will result in a failure in the ServicesResourceTransformer claiming
diff --git a/hbase-shaded-jetty-12-plus-ee9/pom.xml b/hbase-shaded-jetty-12-plus-ee9/pom.xml
index ee19693..f1f530a 100644
--- a/hbase-shaded-jetty-12-plus-ee9/pom.xml
+++ b/hbase-shaded-jetty-12-plus-ee9/pom.xml
@@ -39,11 +39,6 @@
   <name>Apache HBase Relocated (Shaded) Jetty 12+ Libs: EE9</name>
   <description>Pulls down Jetty EE9, relocates it and makes a far jar.</description>
   <dependencies>
-    <dependency>
-      <groupId>org.apache.hbase.thirdparty</groupId>
-      <artifactId>hbase-shaded-jetty-12-plus-core</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.ee9</groupId>
       <artifactId>jetty-ee9-servlet</artifactId>
@@ -143,6 +138,17 @@
                      produce. See below for how to exclusion of transitive dependencies.
                    -->
                   <exclude>org.slf4j:slf4j-api</exclude>
+                  <!--Exclude jetty core jars: we get a shaded version in adjacent module. -->
+                  <exclude>org.eclipse.jetty:jetty-server</exclude>
+                  <exclude>org.eclipse.jetty:jetty-http</exclude>
+                  <exclude>org.eclipse.jetty:jetty-util</exclude>
+                  <exclude>org.eclipse.jetty:jetty-io</exclude>
+                  <exclude>org.eclipse.jetty:jetty-jmx</exclude>
+                  <exclude>org.eclipse.jetty:jetty-util-ajax</exclude>
+                  <exclude>org.eclipse.jetty:jetty-security</exclude>
+                  <exclude>org.eclipse.jetty:jetty-session</exclude>
+                  <exclude>org.eclipse.jetty:jetty-ee</exclude>
+                  <exclude>org.eclipse.jetty:jetty-xml</exclude>
                   <!-- On the "next" build, exclude a lingering shaded jar if it exists (user did not `clean`).
                     Maven will happily pick up the previous shaded jar and try to include that in the N+1th build
                     if we don't exclude it. This will result in a failure in the ServicesResourceTransformer claiming
diff --git a/pom.xml b/pom.xml
index 45628ad..79eb5ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -244,7 +244,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-shade-plugin</artifactId>
-          <version>3.5.2</version>
+          <version>3.5.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>

From c1df751f9adab24b1c0a40a9e95ba5ed5b1b8086 Mon Sep 17 00:00:00 2001
From: Nihal Jain <nihaljain@apache.org>
Date: Fri, 28 Mar 2025 14:39:11 +0530
Subject: [PATCH 06/12] Add all core deps as transitive in eeX and fix sl4j
 exclusions

---
 hbase-shaded-jetty-12-plus-core/pom.xml |  24 +++++
 hbase-shaded-jetty-12-plus-ee8/pom.xml  | 133 ++++++++++++++++++++++--
 hbase-shaded-jetty-12-plus-ee9/pom.xml  | 133 ++++++++++++++++++++++--
 3 files changed, 268 insertions(+), 22 deletions(-)

diff --git a/hbase-shaded-jetty-12-plus-core/pom.xml b/hbase-shaded-jetty-12-plus-core/pom.xml
index 8e9894a..530d3b4 100644
--- a/hbase-shaded-jetty-12-plus-core/pom.xml
+++ b/hbase-shaded-jetty-12-plus-core/pom.xml
@@ -109,21 +109,45 @@
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-security</artifactId>
       <version>${jetty12.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-session</artifactId>
       <version>${jetty12.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   <dependency>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-ee</artifactId>
     <version>${jetty12.version}</version>
+    <exclusions>
+      <exclusion>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+      </exclusion>
+    </exclusions>
   </dependency>
     <dependency>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-xml</artifactId>
     <version>${jetty12.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
   <build>
diff --git a/hbase-shaded-jetty-12-plus-ee8/pom.xml b/hbase-shaded-jetty-12-plus-ee8/pom.xml
index 1460711..e17f4eb 100644
--- a/hbase-shaded-jetty-12-plus-ee8/pom.xml
+++ b/hbase-shaded-jetty-12-plus-ee8/pom.xml
@@ -87,6 +87,128 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <!-- List to dependencies which are part of core and we want to avoid bundling,
+    hence keeping as provided here -->
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
+      <version>${jetty12.version}</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-http</artifactId>
+      <version>${jetty12.version}</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <version>${jetty12.version}</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-io</artifactId>
+      <version>${jetty12.version}</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-jmx</artifactId>
+      <version>${jetty12.version}</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util-ajax</artifactId>
+      <version>${jetty12.version}</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-security</artifactId>
+      <version>${jetty12.version}</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-session</artifactId>
+      <version>${jetty12.version}</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-ee</artifactId>
+      <version>${jetty12.version}</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-xml</artifactId>
+      <version>${jetty12.version}</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -138,17 +260,6 @@
                      produce. See below for how to exclusion of transitive dependencies.
                    -->
                   <exclude>org.slf4j:slf4j-api</exclude>
-                  <!--Exclude jetty core jars: we get a shaded version in adjacent module. -->
-                  <exclude>org.eclipse.jetty:jetty-server</exclude>
-                  <exclude>org.eclipse.jetty:jetty-http</exclude>
-                  <exclude>org.eclipse.jetty:jetty-util</exclude>
-                  <exclude>org.eclipse.jetty:jetty-io</exclude>
-                  <exclude>org.eclipse.jetty:jetty-jmx</exclude>
-                  <exclude>org.eclipse.jetty:jetty-util-ajax</exclude>
-                  <exclude>org.eclipse.jetty:jetty-security</exclude>
-                  <exclude>org.eclipse.jetty:jetty-session</exclude>
-                  <exclude>org.eclipse.jetty:jetty-ee</exclude>
-                  <exclude>org.eclipse.jetty:jetty-xml</exclude>
                   <!-- On the "next" build, exclude a lingering shaded jar if it exists (user did not `clean`).
                     Maven will happily pick up the previous shaded jar and try to include that in the N+1th build
                     if we don't exclude it. This will result in a failure in the ServicesResourceTransformer claiming
diff --git a/hbase-shaded-jetty-12-plus-ee9/pom.xml b/hbase-shaded-jetty-12-plus-ee9/pom.xml
index f1f530a..42c8583 100644
--- a/hbase-shaded-jetty-12-plus-ee9/pom.xml
+++ b/hbase-shaded-jetty-12-plus-ee9/pom.xml
@@ -87,6 +87,128 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <!-- List to dependencies which are part of core and we want to avoid bundling,
+    hence keeping as provided here -->
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
+      <version>${jetty12.version}</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-http</artifactId>
+      <version>${jetty12.version}</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <version>${jetty12.version}</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-io</artifactId>
+      <version>${jetty12.version}</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-jmx</artifactId>
+      <version>${jetty12.version}</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util-ajax</artifactId>
+      <version>${jetty12.version}</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-security</artifactId>
+      <version>${jetty12.version}</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-session</artifactId>
+      <version>${jetty12.version}</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-ee</artifactId>
+      <version>${jetty12.version}</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-xml</artifactId>
+      <version>${jetty12.version}</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -138,17 +260,6 @@
                      produce. See below for how to exclusion of transitive dependencies.
                    -->
                   <exclude>org.slf4j:slf4j-api</exclude>
-                  <!--Exclude jetty core jars: we get a shaded version in adjacent module. -->
-                  <exclude>org.eclipse.jetty:jetty-server</exclude>
-                  <exclude>org.eclipse.jetty:jetty-http</exclude>
-                  <exclude>org.eclipse.jetty:jetty-util</exclude>
-                  <exclude>org.eclipse.jetty:jetty-io</exclude>
-                  <exclude>org.eclipse.jetty:jetty-jmx</exclude>
-                  <exclude>org.eclipse.jetty:jetty-util-ajax</exclude>
-                  <exclude>org.eclipse.jetty:jetty-security</exclude>
-                  <exclude>org.eclipse.jetty:jetty-session</exclude>
-                  <exclude>org.eclipse.jetty:jetty-ee</exclude>
-                  <exclude>org.eclipse.jetty:jetty-xml</exclude>
                   <!-- On the "next" build, exclude a lingering shaded jar if it exists (user did not `clean`).
                     Maven will happily pick up the previous shaded jar and try to include that in the N+1th build
                     if we don't exclude it. This will result in a failure in the ServicesResourceTransformer claiming

From 9115dd9fba0edfa68b6d661da5f0439847772c1d Mon Sep 17 00:00:00 2001
From: Nihal Jain <nihaljain@apache.org>
Date: Fri, 28 Mar 2025 14:49:28 +0530
Subject: [PATCH 07/12] Remove redundant exclusion for deps with provided scope

---
 hbase-shaded-jetty-12-plus-ee8/pom.xml | 60 --------------------------
 hbase-shaded-jetty-12-plus-ee9/pom.xml | 60 --------------------------
 2 files changed, 120 deletions(-)

diff --git a/hbase-shaded-jetty-12-plus-ee8/pom.xml b/hbase-shaded-jetty-12-plus-ee8/pom.xml
index e17f4eb..e6b3c3d 100644
--- a/hbase-shaded-jetty-12-plus-ee8/pom.xml
+++ b/hbase-shaded-jetty-12-plus-ee8/pom.xml
@@ -94,120 +94,60 @@
       <artifactId>jetty-server</artifactId>
       <version>${jetty12.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-http</artifactId>
       <version>${jetty12.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
       <version>${jetty12.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-io</artifactId>
       <version>${jetty12.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-jmx</artifactId>
       <version>${jetty12.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util-ajax</artifactId>
       <version>${jetty12.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-security</artifactId>
       <version>${jetty12.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-session</artifactId>
       <version>${jetty12.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-ee</artifactId>
       <version>${jetty12.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-xml</artifactId>
       <version>${jetty12.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
   </dependencies>
   <build>
diff --git a/hbase-shaded-jetty-12-plus-ee9/pom.xml b/hbase-shaded-jetty-12-plus-ee9/pom.xml
index 42c8583..dab598e 100644
--- a/hbase-shaded-jetty-12-plus-ee9/pom.xml
+++ b/hbase-shaded-jetty-12-plus-ee9/pom.xml
@@ -94,120 +94,60 @@
       <artifactId>jetty-server</artifactId>
       <version>${jetty12.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-http</artifactId>
       <version>${jetty12.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
       <version>${jetty12.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-io</artifactId>
       <version>${jetty12.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-jmx</artifactId>
       <version>${jetty12.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util-ajax</artifactId>
       <version>${jetty12.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-security</artifactId>
       <version>${jetty12.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-session</artifactId>
       <version>${jetty12.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-ee</artifactId>
       <version>${jetty12.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-xml</artifactId>
       <version>${jetty12.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
   </dependencies>
   <build>

From 164165dc710da09d041ddb4304e70a122a91c41a Mon Sep 17 00:00:00 2001
From: Nihal Jain <nihaljain@apache.org>
Date: Fri, 28 Mar 2025 17:26:57 +0530
Subject: [PATCH 08/12] Rename property jetty12.version to
 jetty-12-plus.version

---
 hbase-shaded-jetty-12-plus-core/pom.xml | 20 +++++++++---------
 hbase-shaded-jetty-12-plus-ee8/pom.xml  | 28 ++++++++++++-------------
 hbase-shaded-jetty-12-plus-ee9/pom.xml  | 28 ++++++++++++-------------
 pom.xml                                 |  2 +-
 4 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/hbase-shaded-jetty-12-plus-core/pom.xml b/hbase-shaded-jetty-12-plus-core/pom.xml
index 530d3b4..70c70fd 100644
--- a/hbase-shaded-jetty-12-plus-core/pom.xml
+++ b/hbase-shaded-jetty-12-plus-core/pom.xml
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-http</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-io</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>
@@ -86,7 +86,7 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-jmx</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>
@@ -97,7 +97,7 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util-ajax</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>
@@ -108,7 +108,7 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-security</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>
@@ -119,7 +119,7 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-session</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>
@@ -130,7 +130,7 @@
   <dependency>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-ee</artifactId>
-    <version>${jetty12.version}</version>
+    <version>${jetty-12-plus.version}</version>
     <exclusions>
       <exclusion>
         <groupId>org.slf4j</groupId>
@@ -141,7 +141,7 @@
     <dependency>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-xml</artifactId>
-    <version>${jetty12.version}</version>
+    <version>${jetty-12-plus.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>
diff --git a/hbase-shaded-jetty-12-plus-ee8/pom.xml b/hbase-shaded-jetty-12-plus-ee8/pom.xml
index e6b3c3d..5d23f94 100644
--- a/hbase-shaded-jetty-12-plus-ee8/pom.xml
+++ b/hbase-shaded-jetty-12-plus-ee8/pom.xml
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>org.eclipse.jetty.ee8</groupId>
       <artifactId>jetty-ee8-servlet</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.eclipse.jetty</groupId>
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>org.eclipse.jetty.ee8</groupId>
       <artifactId>jetty-ee8-security</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>org.eclipse.jetty.ee8</groupId>
       <artifactId>jetty-ee8-nested</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>
@@ -79,7 +79,7 @@
     <dependency>
       <groupId>org.eclipse.jetty.ee8</groupId>
       <artifactId>jetty-ee8-webapp</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>
@@ -92,61 +92,61 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-http</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-io</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-jmx</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util-ajax</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-security</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-session</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-ee</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-xml</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/hbase-shaded-jetty-12-plus-ee9/pom.xml b/hbase-shaded-jetty-12-plus-ee9/pom.xml
index dab598e..75831bb 100644
--- a/hbase-shaded-jetty-12-plus-ee9/pom.xml
+++ b/hbase-shaded-jetty-12-plus-ee9/pom.xml
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>org.eclipse.jetty.ee9</groupId>
       <artifactId>jetty-ee9-servlet</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.eclipse.jetty</groupId>
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>org.eclipse.jetty.ee9</groupId>
       <artifactId>jetty-ee9-security</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>org.eclipse.jetty.ee9</groupId>
       <artifactId>jetty-ee9-nested</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>
@@ -79,7 +79,7 @@
     <dependency>
       <groupId>org.eclipse.jetty.ee9</groupId>
       <artifactId>jetty-ee9-webapp</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>
@@ -92,61 +92,61 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-http</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-io</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-jmx</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util-ajax</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-security</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-session</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-ee</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-xml</artifactId>
-      <version>${jetty12.version}</version>
+      <version>${jetty-12-plus.version}</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/pom.xml b/pom.xml
index 79eb5ca..815e294 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,7 +142,7 @@
     <error_prone_annotations.version>2.36.0</error_prone_annotations.version>
     <gson.version>2.11.0</gson.version>
     <jetty.version>9.4.56.v20240826</jetty.version>
-    <jetty12.version>12.0.18</jetty12.version>
+    <jetty-12-plus.version>12.0.18</jetty-12-plus.version>
     <servlet-api.version>3.1.0</servlet-api.version>
     <jersey.version>2.46</jersey.version>
     <jakarta.inject.version>2.6.1</jakarta.inject.version>

From f823caecefa808cda3b900927f789843d68e068f Mon Sep 17 00:00:00 2001
From: Nihal Jain <nihaljain@apache.org>
Date: Tue, 1 Apr 2025 12:08:02 +0530
Subject: [PATCH 09/12] Remove EE9 demo module

---
 hbase-shaded-jetty-12-plus-ee9/pom.xml | 253 -------------------------
 pom.xml                                |   1 -
 2 files changed, 254 deletions(-)
 delete mode 100644 hbase-shaded-jetty-12-plus-ee9/pom.xml

diff --git a/hbase-shaded-jetty-12-plus-ee9/pom.xml b/hbase-shaded-jetty-12-plus-ee9/pom.xml
deleted file mode 100644
index 75831bb..0000000
--- a/hbase-shaded-jetty-12-plus-ee9/pom.xml
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-  ON MVN COMPILE NOT WORKING
-
-  If you wondering why 'mvn compile' does not work building HBase
-  (in particular, if you are doing it for the first time), instead do
-  'mvn package'.  If you are interested in the full story, see
-  https://issues.apache.org/jira/browse/HBASE-6795.
-
--->
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.hbase.thirdparty</groupId>
-    <artifactId>hbase-thirdparty</artifactId>
-    <version>${revision}</version>
-    <relativePath>..</relativePath>
-  </parent>
-  <artifactId>hbase-shaded-jetty-12-plus-ee9</artifactId>
-  <name>Apache HBase Relocated (Shaded) Jetty 12+ Libs: EE9</name>
-  <description>Pulls down Jetty EE9, relocates it and makes a far jar.</description>
-  <dependencies>
-    <dependency>
-      <groupId>org.eclipse.jetty.ee9</groupId>
-      <artifactId>jetty-ee9-servlet</artifactId>
-      <version>${jetty-12-plus.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>servlet-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.ee9</groupId>
-      <artifactId>jetty-ee9-security</artifactId>
-      <version>${jetty-12-plus.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.ee9</groupId>
-      <artifactId>jetty-ee9-nested</artifactId>
-      <version>${jetty-12-plus.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.ee9</groupId>
-      <artifactId>jetty-ee9-webapp</artifactId>
-      <version>${jetty-12-plus.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <!-- List to dependencies which are part of core and we want to avoid bundling,
-    hence keeping as provided here -->
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-server</artifactId>
-      <version>${jetty-12-plus.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-http</artifactId>
-      <version>${jetty-12-plus.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-util</artifactId>
-      <version>${jetty-12-plus.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-io</artifactId>
-      <version>${jetty-12-plus.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-jmx</artifactId>
-      <version>${jetty-12-plus.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-util-ajax</artifactId>
-      <version>${jetty-12-plus.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-security</artifactId>
-      <version>${jetty-12-plus.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-session</artifactId>
-      <version>${jetty-12-plus.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-ee</artifactId>
-      <version>${jetty-12-plus.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-xml</artifactId>
-      <version>${jetty-12-plus.version}</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <configuration>
-          <filesets>
-            <fileset>
-              <directory>${basedir}</directory>
-              <includes>
-                <include>dependency-reduced-pom.xml</include>
-              </includes>
-            </fileset>
-          </filesets>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <shadeSourcesContent>true</shadeSourcesContent>
-              <createSourcesJar>true</createSourcesJar>
-              <relocations>
-                <relocation>
-                  <pattern>org.eclipse.jetty</pattern>
-                  <shadedPattern>${rename.offset}.org.eclipse.jetty</shadedPattern>
-                </relocation>
-                <!--
-                This is for relocating the blacklist in
-                org.eclipse.jetty.webapp.WebAppContext.__dftServerClasses,
-                where we have a '-' in front of the class name
-                -->
-                <relocation>
-                  <pattern>-org.eclipse.jetty</pattern>
-                  <shadedPattern>-${rename.offset}.org.eclipse.jetty</shadedPattern>
-                </relocation>
-              </relocations>
-              <artifactSet>
-                <excludes>
-                  <!--
-                     Anything added here needs to be excluded from the jar that pulls it in
-                     also else we give an odd signal in the META-INF/DEPENDENCIES that we
-                     produce. See below for how to exclusion of transitive dependencies.
-                   -->
-                  <exclude>org.slf4j:slf4j-api</exclude>
-                  <!-- On the "next" build, exclude a lingering shaded jar if it exists (user did not `clean`).
-                    Maven will happily pick up the previous shaded jar and try to include that in the N+1th build
-                    if we don't exclude it. This will result in a failure in the ServicesResourceTransformer claiming
-                    that we've already packaged a services file once. -->
-                  <exclude>org.apache.hbase.thirdparty:hbase-shaded-jetty-12-plus-ee9</exclude>
-                </excludes>
-              </artifactSet>
-              <transformers>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
-                  <addHeader>false</addHeader>
-                </transformer>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-              </transformers>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <!--
-          The webdefault-ee9.xml contains some jetty servlet classes which should also be relocated
-          -->
-          <execution>
-            <id>relocate-web-xml</id>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <target>
-                <echo message="unjar"/>
-                <unzip dest="${project.build.directory}/unpacked/" src="${project.build.directory}/${project.artifactId}-${project.version}.jar"/>
-                <echo message="Replace content in webdefault-ee9.xml"/>
-                <replace file="${project.build.directory}/unpacked/${rename.offset.dir}/org/eclipse/jetty/ee9/webapp/webdefault-ee9.xml">
-                  <replacetoken>org.eclipse.jetty</replacetoken>
-                  <replacevalue>${rename.offset}.org.eclipse.jetty</replacevalue>
-                </replace>
-
-                <echo message="Redo jar"/>
-                <jar basedir="${project.build.directory}/unpacked" destfile="${project.build.directory}/${project.artifactId}-${project.version}.jar"/>
-              </target>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/pom.xml b/pom.xml
index 815e294..1b38eb6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,7 +102,6 @@
     <module>hbase-shaded-jetty</module>
     <module>hbase-shaded-jetty-12-plus-core</module>
     <module>hbase-shaded-jetty-12-plus-ee8</module>
-    <module>hbase-shaded-jetty-12-plus-ee9</module>
     <module>hbase-shaded-jersey</module>
     <module>hbase-shaded-jackson-jaxrs-json-provider</module>
     <module>hbase-noop-htrace</module>

From 912107fc4a123aa28a0c00c7bbb517653de327d4 Mon Sep 17 00:00:00 2001
From: Nihal Jain <nihaljain@apache.org>
Date: Thu, 24 Apr 2025 22:47:26 +0530
Subject: [PATCH 10/12] Fix typo

---
 hbase-shaded-jetty-12-plus-ee8/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hbase-shaded-jetty-12-plus-ee8/pom.xml b/hbase-shaded-jetty-12-plus-ee8/pom.xml
index 5d23f94..e6cf5e6 100644
--- a/hbase-shaded-jetty-12-plus-ee8/pom.xml
+++ b/hbase-shaded-jetty-12-plus-ee8/pom.xml
@@ -204,7 +204,7 @@
                     Maven will happily pick up the previous shaded jar and try to include that in the N+1th build
                     if we don't exclude it. This will result in a failure in the ServicesResourceTransformer claiming
                     that we've already packaged a services file once. -->
-                  <exclude>org.apache.hbase.thirdparty:hbase-shaded-jetty-12-plus-e8</exclude>
+                  <exclude>org.apache.hbase.thirdparty:hbase-shaded-jetty-12-plus-ee8</exclude>
                 </excludes>
               </artifactSet>
               <transformers>

From 2286207e82875fdc2824581cba71bd96450913c9 Mon Sep 17 00:00:00 2001
From: Nihal Jain <nihaljain@apache.org>
Date: Wed, 30 Apr 2025 12:00:04 +0530
Subject: [PATCH 11/12] Update pom.xml

Bump to latest jetty
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1b38eb6..0389172 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,7 @@
     <error_prone_annotations.version>2.36.0</error_prone_annotations.version>
     <gson.version>2.11.0</gson.version>
     <jetty.version>9.4.56.v20240826</jetty.version>
-    <jetty-12-plus.version>12.0.18</jetty-12-plus.version>
+    <jetty-12-plus.version>12.0.19</jetty-12-plus.version>
     <servlet-api.version>3.1.0</servlet-api.version>
     <jersey.version>2.46</jersey.version>
     <jakarta.inject.version>2.6.1</jakarta.inject.version>

From 3180b12a34feb34075c039f869367b1569df7c97 Mon Sep 17 00:00:00 2001
From: Nihal Jain <nihaljain@apache.org>
Date: Fri, 9 May 2025 17:21:25 +0530
Subject: [PATCH 12/12] Bump to jetty 12.0.20 which brings in fix for
 https://github.com/jetty/jetty.project/issues/12958 - Discrepancy between
 Jetty 9 and Jetty 12 when setting the base resource to a path containing ..

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

diff --git a/pom.xml b/pom.xml
index 0389172..ccbf515 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,7 @@
     <error_prone_annotations.version>2.36.0</error_prone_annotations.version>
     <gson.version>2.11.0</gson.version>
     <jetty.version>9.4.56.v20240826</jetty.version>
-    <jetty-12-plus.version>12.0.19</jetty-12-plus.version>
+    <jetty-12-plus.version>12.0.20</jetty-12-plus.version>
     <servlet-api.version>3.1.0</servlet-api.version>
     <jersey.version>2.46</jersey.version>
     <jakarta.inject.version>2.6.1</jakarta.inject.version>