From d10ebab2720c41ce9f6265442e674456a398a0b6 Mon Sep 17 00:00:00 2001
From: PJ Fanning <pjfanning@users.noreply.github.com>
Date: Tue, 15 Oct 2024 09:28:53 +0100
Subject: [PATCH 1/2] HADOOP-19225. Upgrade to 9.4.56.v20240826 due to
 CVE-2024-8184

---
 LICENSE-binary         | 28 ++++++++++++++--------------
 hadoop-project/pom.xml |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/LICENSE-binary b/LICENSE-binary
index 8f3754267b0f6..3d762dcf6e62a 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -341,20 +341,20 @@ org.apache.solr:solr-solrj:8.11.2
 org.apache.yetus:audience-annotations:0.5.0
 org.apache.zookeeper:zookeeper:3.8.4
 org.codehaus.jettison:jettison:1.5.4
-org.eclipse.jetty:jetty-annotations:9.4.53.v20231009
-org.eclipse.jetty:jetty-http:9.4.53.v20231009
-org.eclipse.jetty:jetty-io:9.4.53.v20231009
-org.eclipse.jetty:jetty-jndi:9.4.53.v20231009
-org.eclipse.jetty:jetty-plus:9.4.53.v20231009
-org.eclipse.jetty:jetty-security:9.4.53.v20231009
-org.eclipse.jetty:jetty-server:9.4.53.v20231009
-org.eclipse.jetty:jetty-servlet:9.4.53.v20231009
-org.eclipse.jetty:jetty-util:9.4.53.v20231009
-org.eclipse.jetty:jetty-util-ajax:9.4.53.v20231009
-org.eclipse.jetty:jetty-webapp:9.4.53.v20231009
-org.eclipse.jetty:jetty-xml:9.4.53.v20231009
-org.eclipse.jetty.websocket:javax-websocket-client-impl:9.4.53.v20231009
-org.eclipse.jetty.websocket:javax-websocket-server-impl:9.4.53.v20231009
+org.eclipse.jetty:jetty-annotations:9.4.56.v20240826
+org.eclipse.jetty:jetty-http:9.4.56.v20240826
+org.eclipse.jetty:jetty-io:9.4.56.v20240826
+org.eclipse.jetty:jetty-jndi:9.4.56.v20240826
+org.eclipse.jetty:jetty-plus:9.4.56.v20240826
+org.eclipse.jetty:jetty-security:9.4.56.v20240826
+org.eclipse.jetty:jetty-server:9.4.56.v20240826
+org.eclipse.jetty:jetty-servlet:9.4.56.v20240826
+org.eclipse.jetty:jetty-util:9.4.56.v20240826
+org.eclipse.jetty:jetty-util-ajax:9.4.56.v20240826
+org.eclipse.jetty:jetty-webapp:9.4.56.v20240826
+org.eclipse.jetty:jetty-xml:9.4.56.v20240826
+org.eclipse.jetty.websocket:javax-websocket-client-impl:9.4.56.v20240826
+org.eclipse.jetty.websocket:javax-websocket-server-impl:9.4.56.v20240826
 org.ehcache:ehcache:3.8.2
 org.ini4j:ini4j:0.5.4
 org.lz4:lz4-java:1.7.1
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 4384ebffcc55a..68dcd3622df50 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -37,7 +37,7 @@
     <!--Whether to proceed to next module if any test failures exist-->
     <maven.test.failure.ignore>true</maven.test.failure.ignore>
     <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
-    <jetty.version>9.4.53.v20231009</jetty.version>
+    <jetty.version>9.4.56.v20240826</jetty.version>
     <test.exclude>_</test.exclude>
     <test.exclude.pattern>_</test.exclude.pattern>
 

From 643ab22d060f164c8fc12ec0cb4156f312a3e45b Mon Sep 17 00:00:00 2001
From: PJ Fanning <pjfanning@users.noreply.github.com>
Date: Tue, 28 Jan 2025 10:48:39 +0100
Subject: [PATCH 2/2] jetty 9.4.57.v20241219

---
 LICENSE-binary         | 28 ++++++++++++++--------------
 hadoop-project/pom.xml |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/LICENSE-binary b/LICENSE-binary
index 3d762dcf6e62a..6ccbc6f322a23 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -341,20 +341,20 @@ org.apache.solr:solr-solrj:8.11.2
 org.apache.yetus:audience-annotations:0.5.0
 org.apache.zookeeper:zookeeper:3.8.4
 org.codehaus.jettison:jettison:1.5.4
-org.eclipse.jetty:jetty-annotations:9.4.56.v20240826
-org.eclipse.jetty:jetty-http:9.4.56.v20240826
-org.eclipse.jetty:jetty-io:9.4.56.v20240826
-org.eclipse.jetty:jetty-jndi:9.4.56.v20240826
-org.eclipse.jetty:jetty-plus:9.4.56.v20240826
-org.eclipse.jetty:jetty-security:9.4.56.v20240826
-org.eclipse.jetty:jetty-server:9.4.56.v20240826
-org.eclipse.jetty:jetty-servlet:9.4.56.v20240826
-org.eclipse.jetty:jetty-util:9.4.56.v20240826
-org.eclipse.jetty:jetty-util-ajax:9.4.56.v20240826
-org.eclipse.jetty:jetty-webapp:9.4.56.v20240826
-org.eclipse.jetty:jetty-xml:9.4.56.v20240826
-org.eclipse.jetty.websocket:javax-websocket-client-impl:9.4.56.v20240826
-org.eclipse.jetty.websocket:javax-websocket-server-impl:9.4.56.v20240826
+org.eclipse.jetty:jetty-annotations:9.4.57.v20241219
+org.eclipse.jetty:jetty-http:9.4.57.v20241219
+org.eclipse.jetty:jetty-io:9.4.57.v20241219
+org.eclipse.jetty:jetty-jndi:9.4.57.v20241219
+org.eclipse.jetty:jetty-plus:9.4.57.v20241219
+org.eclipse.jetty:jetty-security:9.4.57.v20241219
+org.eclipse.jetty:jetty-server:9.4.57.v20241219
+org.eclipse.jetty:jetty-servlet:9.4.57.v20241219
+org.eclipse.jetty:jetty-util:9.4.57.v20241219
+org.eclipse.jetty:jetty-util-ajax:9.4.57.v20241219
+org.eclipse.jetty:jetty-webapp:9.4.57.v20241219
+org.eclipse.jetty:jetty-xml:9.4.57.v20241219
+org.eclipse.jetty.websocket:javax-websocket-client-impl:9.4.57.v20241219
+org.eclipse.jetty.websocket:javax-websocket-server-impl:9.4.57.v20241219
 org.ehcache:ehcache:3.8.2
 org.ini4j:ini4j:0.5.4
 org.lz4:lz4-java:1.7.1
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 68dcd3622df50..b51881d58faaa 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -37,7 +37,7 @@
     <!--Whether to proceed to next module if any test failures exist-->
     <maven.test.failure.ignore>true</maven.test.failure.ignore>
     <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
-    <jetty.version>9.4.56.v20240826</jetty.version>
+    <jetty.version>9.4.57.v20241219</jetty.version>
     <test.exclude>_</test.exclude>
     <test.exclude.pattern>_</test.exclude.pattern>