From 32a2391d3a610659849228674382446321932f38 Mon Sep 17 00:00:00 2001
From: Gian Merlino <gianmerlino@gmail.com>
Date: Fri, 21 Nov 2025 14:14:37 -0800
Subject: [PATCH 1/4] Upgrade Jetty to 12.0.30.

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

diff --git a/pom.xml b/pom.xml
index c87f229cd4c6..781ce4bc3e49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,7 @@
         <guava.version>32.1.3-jre</guava.version>
         <guice.version>5.1.0</guice.version>
         <hamcrest.version>2.2</hamcrest.version>
-        <jetty.version>12.0.25</jetty.version>
+        <jetty.version>12.0.30</jetty.version>
         <jersey.version>1.19.4</jersey.version>
         <jackson.version>2.19.2</jackson.version>
         <codehaus.jackson.version>1.9.13</codehaus.jackson.version>

From 880a34d6ebc5b8692780ac5f382e2669fc125d3b Mon Sep 17 00:00:00 2001
From: Gian Merlino <gianmerlino@gmail.com>
Date: Fri, 21 Nov 2025 14:37:10 -0800
Subject: [PATCH 2/4] Update licenses.yaml.

---
 licenses.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/licenses.yaml b/licenses.yaml
index f1faf44d24e9..7a477f15e674 100644
--- a/licenses.yaml
+++ b/licenses.yaml
@@ -2132,7 +2132,7 @@ name: Jetty
 license_category: binary
 module: java-core
 license_name: Eclipse Public License 2.0
-version: 12.0.25
+version: 12.0.30
 libraries:
   - org.eclipse.jetty: jetty-alpn-client
   - org.eclipse.jetty: jetty-client

From f65feb8551547fae4ee6aabc7bf429e5b2eceb50 Mon Sep 17 00:00:00 2001
From: Gian Merlino <gianmerlino@gmail.com>
Date: Fri, 21 Nov 2025 15:07:58 -0800
Subject: [PATCH 3/4] Fix license format.

---
 licenses.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/licenses.yaml b/licenses.yaml
index 7a477f15e674..3b7a95c02e27 100644
--- a/licenses.yaml
+++ b/licenses.yaml
@@ -2131,7 +2131,7 @@ notices:
 name: Jetty
 license_category: binary
 module: java-core
-license_name: Eclipse Public License 2.0
+license_name: EPL-2.0
 version: 12.0.30
 libraries:
   - org.eclipse.jetty: jetty-alpn-client

From c2de471cd33a10896d7ac785ee379ce14e4f1ed2 Mon Sep 17 00:00:00 2001
From: Gian Merlino <gianmerlino@gmail.com>
Date: Fri, 21 Nov 2025 15:45:07 -0800
Subject: [PATCH 4/4] Specify EPL-2.0 a different way.

---
 distribution/bin/check-licenses.py | 1 +
 licenses.yaml                      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/distribution/bin/check-licenses.py b/distribution/bin/check-licenses.py
index 23d99a68f6e0..7f373b11a946 100755
--- a/distribution/bin/check-licenses.py
+++ b/distribution/bin/check-licenses.py
@@ -288,6 +288,7 @@ def build_compatible_license_names():
     compatible_licenses['Eclipse Public License, Version 2.0'] = 'Eclipse Public License 2.0'
     compatible_licenses['Eclipse Public License v2.0'] = 'Eclipse Public License 2.0'
     compatible_licenses['EPL 2.0'] = 'Eclipse Public License 2.0'
+    compatible_licenses['EPL-2.0'] = 'Eclipse Public License 2.0'
 
     compatible_licenses['Eclipse Distribution License 1.0'] = 'Eclipse Distribution License 1.0'
     compatible_licenses['Eclipse Distribution License - v 1.0'] = 'Eclipse Distribution License 1.0'
diff --git a/licenses.yaml b/licenses.yaml
index 3b7a95c02e27..7a477f15e674 100644
--- a/licenses.yaml
+++ b/licenses.yaml
@@ -2131,7 +2131,7 @@ notices:
 name: Jetty
 license_category: binary
 module: java-core
-license_name: EPL-2.0
+license_name: Eclipse Public License 2.0
 version: 12.0.30
 libraries:
   - org.eclipse.jetty: jetty-alpn-client