From 42443c19c2261abfa9084f410c57b04dad5a5e2a Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Tue, 15 Aug 2023 11:34:16 -0500
Subject: [PATCH 1/3] Cleaning up dependencies on websocket to avoid pulling in
 annotations on websocket-server

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 jetty-websocket/websocket-jetty-server/pom.xml | 2 +-
 jetty-websocket/websocket-jetty-tests/pom.xml  | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/jetty-websocket/websocket-jetty-server/pom.xml b/jetty-websocket/websocket-jetty-server/pom.xml
index d984adf0b3c..e31b9bbb7e1 100644
--- a/jetty-websocket/websocket-jetty-server/pom.xml
+++ b/jetty-websocket/websocket-jetty-server/pom.xml
@@ -37,7 +37,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-annotations</artifactId>
+      <artifactId>jetty-webapp</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
diff --git a/jetty-websocket/websocket-jetty-tests/pom.xml b/jetty-websocket/websocket-jetty-tests/pom.xml
index aa6d3ab6610..b3a7b26ee60 100644
--- a/jetty-websocket/websocket-jetty-tests/pom.xml
+++ b/jetty-websocket/websocket-jetty-tests/pom.xml
@@ -72,6 +72,11 @@
       <artifactId>jetty-jmx</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-annotations</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

From 00e01829cf95bd502cd5fd42581b4293ba27252c Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Tue, 15 Aug 2023 16:14:21 -0500
Subject: [PATCH 2/3] Bump guava to 32.1.2-jre

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f7f3fa00690..28ff2e7b631 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
     <google.errorprone.version>2.15.0</google.errorprone.version>
     <grpc.version>1.49.2</grpc.version>
     <gson.version>2.9.1</gson.version>
-    <guava.version>31.1-jre</guava.version>
+    <guava.version>32.1.2-jre</guava.version>
     <guice.version>5.1.0</guice.version>
     <hamcrest.version>2.2</hamcrest.version>
     <hawtio.version>2.15.2</hawtio.version>

From e33d02625900b617ac3cf9187002faa80a776db3 Mon Sep 17 00:00:00 2001
From: yokotaso <yokotaso.t@gmail.com>
Date: Wed, 16 Aug 2023 09:06:35 +0900
Subject: [PATCH 3/3] chore: Fix javadoc following the source code

---
 .../src/main/java/org/eclipse/jetty/http/UriCompliance.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/UriCompliance.java b/jetty-http/src/main/java/org/eclipse/jetty/http/UriCompliance.java
index e2fde79d828..bb75d8bff42 100644
--- a/jetty-http/src/main/java/org/eclipse/jetty/http/UriCompliance.java
+++ b/jetty-http/src/main/java/org/eclipse/jetty/http/UriCompliance.java
@@ -102,7 +102,8 @@ public final class UriCompliance implements ComplianceViolation.Mode
     /**
      * The default compliance mode that extends <a href="https://tools.ietf.org/html/rfc3986">RFC3986</a> compliance with
      * additional violations to avoid most ambiguous URIs.
-     * This mode does allow {@link Violation#AMBIGUOUS_PATH_SEPARATOR}, but disallows all out {@link Violation}s.
+     * This mode does allow {@link Violation#AMBIGUOUS_PATH_SEPARATOR}, {@link Violation#AMBIGUOUS_PATH_ENCODING},
+     * but disallows all out {@link Violation}s.
      */
     public static final UriCompliance DEFAULT = new UriCompliance("DEFAULT",
         of(Violation.AMBIGUOUS_PATH_SEPARATOR,