Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

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,

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>

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>

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>