Skip to content

Commit

Permalink
Merge pull request #6401 from eclipse/release-10.0.5
Browse files Browse the repository at this point in the history 
Merge Release 10.0.5
  • Loading branch information
@joakime
joakime committed Jun 13, 2021
2 parents 1223bb5 + 9d2d1e2 commit 09d6a26
Show file tree
Hide file tree
Showing 150 changed files with 228 additions and 218 deletions.
14 changes: 12 additions & 2 deletions VERSION.txt
View file
@@ -1,4 +1,13 @@
jetty-10.0.5-SNAPSHOT
jetty-10.0.6-SNAPSHOT

jetty-10.0.5 - 11 June 2021
+ 4772 Jetty WebSocket API onMessage annotation does not support partial
messages.
+ 6302 Treat empty path segments are ambiguous.
+ 6329 Regression on graceful shutdown default in Jetty 10
+ 6354 org.slf4j dependency imports osgi packages at 2.0
+ 6379 Reduce contention in all `ByteBufferPool` implementations
+ 6392 Review accidental xml config changes

jetty-10.0.4 - 04 June 2021
+ 5379 Better handling for wrong SNI
Expand Down Expand Up @@ -46,7 +55,8 @@ jetty-10.0.3 - 20 May 2021
+ 6250 Lazily allocate HTTP2Stream data queue
+ 6251 Use CyclicTimeout for HTTP2Streams
+ 6254 Total timeout not enforced for queued requests
+ 6263 Review URI encoding in ConcatServlet & WelcomeFilter (Resolved CVE-2021-28169)
+ 6263 Review URI encoding in ConcatServlet & WelcomeFilter (Resolved
CVE-2021-28169)
+ 6272 Reduce allocation in HttpClient when notifying content listeners
+ 6277 Better handle exceptions thrown from session destroy listener
+ 6280 Copy ServletHolder class/instance properly during startWebapp
Expand Down
2 changes: 1 addition & 1 deletion apache-jsp/pom.xml
View file
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>10.0.5-SNAPSHOT</version>
<version>10.0.6-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion apache-jstl/pom.xml
View file
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>10.0.5-SNAPSHOT</version>
<version>10.0.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apache-jstl</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion build-resources/pom.xml
View file
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>build-resources</artifactId>
<version>10.0.5-SNAPSHOT</version>
<version>10.0.6-SNAPSHOT</version>
<name>Jetty :: Build Resources</name>
<packaging>jar</packaging>

Expand Down
2 changes: 1 addition & 1 deletion demos/demo-async-rest/demo-async-rest-jar/pom.xml
View file
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>demo-async-rest-parent</artifactId>
<version>10.0.5-SNAPSHOT</version>
<version>10.0.6-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion demos/demo-async-rest/demo-async-rest-server/pom.xml
View file
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>demo-async-rest-parent</artifactId>
<version>10.0.5-SNAPSHOT</version>
<version>10.0.6-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion demos/demo-async-rest/demo-async-rest-webapp/pom.xml
View file
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>demo-async-rest-parent</artifactId>
<version>10.0.5-SNAPSHOT</version>
<version>10.0.6-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion demos/demo-async-rest/pom.xml
View file
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>demos-parent</artifactId>
<version>10.0.5-SNAPSHOT</version>
<version>10.0.6-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion demos/demo-jaas-webapp/pom.xml
View file
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>demos-parent</artifactId>
<version>10.0.5-SNAPSHOT</version>
<version>10.0.6-SNAPSHOT</version>
</parent>
<artifactId>demo-jaas-webapp</artifactId>
<name>Demo :: JAAS :: WebApp</name>
Expand Down
2 changes: 1 addition & 1 deletion demos/demo-jetty-webapp/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>demos-parent</artifactId>
<version>10.0.5-SNAPSHOT</version>
<version>10.0.6-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion demos/demo-jndi-webapp/pom.xml
View file
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>demos-parent</artifactId>
<version>10.0.5-SNAPSHOT</version>
<version>10.0.6-SNAPSHOT</version>
</parent>
<artifactId>demo-jndi-webapp</artifactId>
<name>Demo :: JNDI :: WebApp</name>
Expand Down
2 changes: 1 addition & 1 deletion demos/demo-jsp-webapp/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>demos-parent</artifactId>
<version>10.0.5-SNAPSHOT</version>
<version>10.0.6-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion demos/demo-mock-resources/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>demos-parent</artifactId>
<version>10.0.5-SNAPSHOT</version>
<version>10.0.6-SNAPSHOT</version>
</parent>
<name>Demo :: Mock Resources</name>
<artifactId>demo-mock-resources</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion demos/demo-proxy-webapp/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>demos-parent</artifactId>
<version>10.0.5-SNAPSHOT</version>
<version>10.0.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>demo-proxy-webapp</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion demos/demo-simple-webapp/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>demos-parent</artifactId>
<version>10.0.5-SNAPSHOT</version>
<version>10.0.6-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion demos/demo-spec/demo-container-initializer/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>demos-parent</artifactId>
<version>10.0.5-SNAPSHOT</version>
<version>10.0.6-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>demo-container-initializer</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion demos/demo-spec/demo-spec-webapp/pom.xml
View file
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>demos-parent</artifactId>
<version>10.0.5-SNAPSHOT</version>
<version>10.0.6-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<name>Demo :: Servlet Spec :: Webapp</name>
Expand Down
2 changes: 1 addition & 1 deletion demos/demo-spec/demo-web-fragment/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>demos-parent</artifactId>
<version>10.0.5-SNAPSHOT</version>
<version>10.0.6-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion demos/demo-spec/pom.xml
View file
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>demos-parent</artifactId>
<version>10.0.5-SNAPSHOT</version>
<version>10.0.6-SNAPSHOT</version>
</parent>
<name>Demo :: Servlet Spec</name>
<artifactId>demo-spec</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion demos/embedded/pom.xml
View file
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>demos-parent</artifactId>
<version>10.0.5-SNAPSHOT</version>
<version>10.0.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>demos-jetty-embedded</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion demos/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>10.0.5-SNAPSHOT</version>
<version>10.0.6-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion documentation/jetty-asciidoctor-extensions/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty.documentation</groupId>
<artifactId>documentation-parent</artifactId>
<version>10.0.5-SNAPSHOT</version>
<version>10.0.6-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion documentation/jetty-documentation/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty.documentation</groupId>
<artifactId>documentation-parent</artifactId>
<version>10.0.5-SNAPSHOT</version>
<version>10.0.6-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion documentation/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>10.0.5-SNAPSHOT</version>
<version>10.0.6-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion javadoc/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>10.0.5-SNAPSHOT</version>
<version>10.0.6-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion jetty-alpn/jetty-alpn-client/pom.xml
View file
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-parent</artifactId>
<version>10.0.5-SNAPSHOT</version>
<version>10.0.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-alpn-client</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jetty-alpn/jetty-alpn-conscrypt-client/pom.xml
View file
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-parent</artifactId>
<version>10.0.5-SNAPSHOT</version>
<version>10.0.6-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion jetty-alpn/jetty-alpn-conscrypt-server/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-parent</artifactId>
<version>10.0.5-SNAPSHOT</version>
<version>10.0.6-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion jetty-alpn/jetty-alpn-java-client/pom.xml
View file
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-parent</artifactId>
<version>10.0.5-SNAPSHOT</version>
<version>10.0.6-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion jetty-alpn/jetty-alpn-java-server/pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-parent</artifactId>
<version>10.0.5-SNAPSHOT</version>
<version>10.0.6-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion jetty-alpn/jetty-alpn-server/pom.xml
View file
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-parent</artifactId>
<version>10.0.5-SNAPSHOT</version>
<version>10.0.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-alpn-server</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jetty-alpn/pom.xml
View file
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>10.0.5-SNAPSHOT</version>
<version>10.0.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-alpn-parent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jetty-annotations/pom.xml
View file
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>10.0.5-SNAPSHOT</version>
<version>10.0.6-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion jetty-ant/pom.xml
View file
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>10.0.5-SNAPSHOT</version>
<version>10.0.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-ant</artifactId>
Expand Down

0 comments on commit 09d6a26

Please sign in to comment.