Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Simone Bordet 2023-08-17 17:02:13 +02:00
parent 7f0b7d5e11 e33d026259
commit 939f1362f6
No known key found for this signature in database
GPG Key ID: 1677D141BCF3584D
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jetty-http/src/main/java/org/eclipse/jetty/http/UriCompliance.java
View File

@ -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 * 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. * 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", public static final UriCompliance DEFAULT = new UriCompliance("DEFAULT",
of(Violation.AMBIGUOUS_PATH_SEPARATOR, of(Violation.AMBIGUOUS_PATH_SEPARATOR,

2
jetty-websocket/websocket-jetty-server/pom.xml
View File

@ -37,7 +37,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-annotations</artifactId> <artifactId>jetty-webapp</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>

5
jetty-websocket/websocket-jetty-tests/pom.xml
View File

@ -72,6 +72,11 @@
<artifactId>jetty-jmx</artifactId> <artifactId>jetty-jmx</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-annotations</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>

2
pom.xml
View File

@ -47,7 +47,7 @@
<google.errorprone.version>2.15.0</google.errorprone.version> <google.errorprone.version>2.15.0</google.errorprone.version>
<grpc.version>1.49.2</grpc.version> <grpc.version>1.49.2</grpc.version>
<gson.version>2.9.1</gson.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> <guice.version>5.1.0</guice.version>
<hamcrest.version>2.2</hamcrest.version> <hamcrest.version>2.2</hamcrest.version>
<hawtio.version>2.15.2</hawtio.version> <hawtio.version>2.15.2</hawtio.version>