Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x

jetty · Jun 4, 2024 · 3776b6c · 3776b6c
2 parents dc28714 + 5d4c778
commit 3776b6c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/VERSION.txt b/VERSION.txt
@@ -291,11 +291,13 @@ jetty-12.0.1 - 29 August 2023
  + 10411 Review deployment of Jetty Context XML files
  + 10416 EE9 Copies HttpFields in response
 
-jetty-9.4.54.v20240208 - 08 February 2024
- + 1256 DoSFilter leaks USER_AUTH entries
- + 11259 HTTP/2 connection not closed after idle timeout when TCP congested
-   (CVE-2024-22201)
- + 11389 Strip default ports on ws/wss scheme uris too
+jetty-11.0.21 - 14 May 2024
+ + 10805 Jetty response with an invalid HTTP2 packet if the client set the
+   hpack table size as 0
+ + 11527 Reduce ByteBuffer churning in HttpOutput
+ + 11634 Socks5Proxy does not support IP addresses with IP segments above 127
+ + 11656 Upgrade jetty-quiche-native to version 0.21.0
+ + 11782 HttpExchange retained by HttpSenderOverHTTP which caused memory leak
 
 jetty-11.0.20 - 29 January 2024
  + 11081 Dropped WebSocket messages due to race condition in WebSocket frame
@@ -307,6 +309,12 @@ jetty-11.0.20 - 29 January 2024
  + 11273 Support BSD expr in startup script
  + 11349 Update quiche to 0.20.0
 
+jetty-9.4.54.v20240208 - 08 February 2024
+ + 1256 DoSFilter leaks USER_AUTH entries
+ + 11259 HTTP/2 connection not closed after idle timeout when TCP congested
+   (CVE-2024-22201)
+ + 11389 Strip default ports on ws/wss scheme uris too
+
 jetty-11.0.19 - 15 December 2023
  + 9900 Improve `Request.getBeginNanoTime()` accuracy
  + 10812 jetty-deploy has unnecessary dependency on awaitility/hamcrest pulled

diff --git a/build/scripts/release-jetty.sh b/build/scripts/release-jetty.sh
@@ -92,7 +92,7 @@ DEPLOY_OPTS="-DskipTests -Dasciidoctor.skip=false -Dmaven.build.cache.enabled=fa
 # DEPLOY_OPTS="$DEPLOY_OPTS -DaltDeploymentRepository=intarget::default::file://$ALT_DEPLOY_DIR/"
 
 # Uncomment for Java 1.7
-export MAVEN_OPTS="-Xmx2g"
+export MAVEN_OPTS="-Xmx4g"
 
 echo ""
 echo "-----------------------------------------------"

diff --git a/documentation/jetty/modules/ROOT/pages/index.adoc b/documentation/jetty/modules/ROOT/pages/index.adoc
@@ -11,7 +11,7 @@
 // ========================================================================
 //
 
-= Eclipse Jetty
+= Eclipse Jetty {page-version}
 
 This section of the site contains the documentation for {page-component-title} {page-version}.