Merge branch 'jetty:jetty-12.0.x' into jetty-12.0.x

scrat98 · Jun 4, 2024 · c05d32c · c05d32c
2 parents 5f0168b + 8b506b4
commit c05d32c
Show file tree

Hide file tree

Showing 386 changed files with 959 additions and 869 deletions.
diff --git a/.github/ISSUE_TEMPLATE/release-template.md b/.github/ISSUE_TEMPLATE/release-template.md
@@ -1,7 +1,7 @@
 ---
 name: 'Release Process'
 about: 'COMMITTER ONLY: Managing the Jetty release process'
-title: 'Jetty Releases 9.4.x, 10.0.y, 11.0.y'
+title: 'Jetty Releases 9.4.x, 10.0.y, 11.0.y, 12.0.y'
 assignees: ''
 labels: Build
 
@@ -31,10 +31,12 @@ This release process will produce releases:
 - [ ] Verify that branch `jetty-10.0.x` is merged to branch `jetty-11.0.x`.
 - [ ] Assign issue to "build manager", who will stage the releases.
   + [ ] Create and use branches `release/<ver>` to perform version specific release work from.
+  + [ ] Ensure `git fetch --tags` (as we potentially rewrite tag when re staging local tag can be out of sync and this command will fail and so fail the release script)
   + [ ] Ensure `VERSION.txt` additions for each release will be meaningful, descriptive, correct text.
   + [ ] Stage 9.4 release with Java 11.
   + [ ] Stage 10 release with Java 21.
   + [ ] Stage 11 release with Java 21.
+  + [ ] Stage 12 release with Java 22. 
   + [ ] Push release branches `release/<ver>` to to https://github.com/eclipse/jetty.project
   + [ ] Push release tags `jetty-<ver>` to https://github.com/eclipse/jetty.project
   + [ ] Edit a draft release (for each Jetty release) in GitHub (https://github.com/eclipse/jetty.project/releases). Content is generated with the "changelog tool".

diff --git a/VERSION.txt b/VERSION.txt
@@ -1,4 +1,37 @@
-jetty-12.0.10-SNAPSHOT
+jetty-12.0.11-SNAPSHOT
+
+jetty-12.0.10 - 30 May 2024
+ + 1470 Replace Timer use with Jetty Scheduler
+ + 9177 Add JVM info and OS info to Dumpable.dump()
+ + 9778 Jetty 12 - Remove WriteFlusher.Listener
+ + 11072 Jetty 12: CompleteCallbackHandler
+ + 11507 org.eclipse.jetty.util.Attributes.getAttribute() should specify return
+   type if no match is found
+ + 11659 HTTP Fields with OWS (Optional WhiteSpace) in value are not properly
+   parsed in Jetty 12
+ + 11736 Issue with Response OutputStream#close() rethrowing same EofException
+   instance
+ + 11745 Issue while adding Module for Persistent HTTP Sessions: Google Cloud
+   DataStore
+ + 11748 Unexpected HTTP Response Status Code: 404 Not Found
+ + 11756 ChunkAccumulator not working with empty chunks
+ + 11760 request.getHttpURI().getScheme() is null on FORWARD dispatched
+   request, causing NPE
+ + 11761 Update documentation for #10077
+ + 11763 Race condition in QoSHandler
+ + 11766 Ensure ReadListener is nulled out when AsyncContext is completed.
+ + 11767 Backward compat API WebAppContext.getServerClassMatcher() is not
+   updating the WebAppClassloader 
+ + 11776 NPE from `org.eclipse.jetty.ee8.nested.Request.getRequestURL`
+ + 11778 jetty-http-spi does not properly provide SPI for modules
+ + 11791 How to configure Jetty Server v12 ee10 for serving multiple static
+   resources in the same base directory?
+ + 11792 StdErrAppender should detect exception circular references
+ + 11800 client: Allow AsyncContentListener.onContent to throw checked
+   Exceptions
+ + 11811 getHeaderNames should return header name once also when request has it
+   in different case
+ + 11851 jetty-ee8-websocket-javax-server export not honoured
 
 jetty-12.0.9 - 03 May 2024
  + 5944 Introduce alias --files for --download
@@ -291,11 +324,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 +342,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/build-resources/pom.xml b/build/build-resources/pom.xml
@@ -8,7 +8,7 @@
     -->
   <groupId>org.eclipse.jetty</groupId>
   <artifactId>build-resources</artifactId>
-  <version>12.0.10-SNAPSHOT</version>
+  <version>12.0.11-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Build :: Resources</name>
 

diff --git a/build/pom.xml b/build/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>12.0.10-SNAPSHOT</version>
+    <version>12.0.11-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.jetty.build</groupId>
   <artifactId>build</artifactId>

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/...tty-documentation/src/main/asciidoc/operations-guide/sessions/session-base.adoc b/...tty-documentation/src/main/asciidoc/operations-guide/sessions/session-base.adoc
@@ -31,7 +31,7 @@ This uniquely identifies the jetty server instance and is applied to the `Sessio
 You can either provide a value for this property, or you can allow Jetty to try and synthesize a `workerName` - the latter option is _only_ advisable in the case of a single, non-clustered deployment.
 There are two ways a default `workerName` can be synthesized:
 
-* if running on Google AppEngine, the `workerName` will be formed by concatenating the values of the environment variables `JETTY_WORKER_INSTANCE` and `GAE_MODULE_INSTANCE`
+* if running on Google AppEngine, the `workerName` will be formed by concatenating the values of the environment variables `JETTY_WORKER_INSTANCE` and `GAE_INSTANCE`
 * otherwise, the `workerName` will be formed by concatenating the environment variable `JETTY_WORKER_INSTANCE` and the literal `0`.
 
 So, if you're not running on Google AppEngine, and you haven't configured one, the workerName will always be: `node0`.

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}.
 

diff --git a/documentation/jetty/modules/code/examples/pom.xml b/documentation/jetty/modules/code/examples/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.jetty.documentation</groupId>
     <artifactId>documentation</artifactId>
-    <version>12.0.10-SNAPSHOT</version>
+    <version>12.0.11-SNAPSHOT</version>
     <relativePath>../../../../pom.xml</relativePath>
   </parent>
   <artifactId>code-examples</artifactId>

diff --git a/documentation/jetty/pom.xml b/documentation/jetty/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.jetty.documentation</groupId>
     <artifactId>documentation</artifactId>
-    <version>12.0.10-SNAPSHOT</version>
+    <version>12.0.11-SNAPSHOT</version>
   </parent>
   <artifactId>jetty</artifactId>
   <packaging>pom</packaging>

diff --git a/documentation/pom.xml b/documentation/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>12.0.10-SNAPSHOT</version>
+    <version>12.0.11-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.jetty.documentation</groupId>
   <artifactId>documentation</artifactId>

diff --git a/javadoc/pom.xml b/javadoc/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>12.0.10-SNAPSHOT</version>
+    <version>12.0.11-SNAPSHOT</version>
   </parent>
   <artifactId>javadoc</artifactId>
   <packaging>jar</packaging>

diff --git a/jetty-core/jetty-alpn/jetty-alpn-client/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-alpn</artifactId>
-    <version>12.0.10-SNAPSHOT</version>
+    <version>12.0.11-SNAPSHOT</version>
   </parent>
   <artifactId>jetty-alpn-client</artifactId>
   <name>Core :: ALPN :: Client</name>

diff --git a/jetty-core/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-alpn</artifactId>
-    <version>12.0.10-SNAPSHOT</version>
+    <version>12.0.11-SNAPSHOT</version>
   </parent>
   <artifactId>jetty-alpn-conscrypt-client</artifactId>
   <name>Core :: ALPN :: Conscrypt Client</name>

diff --git a/jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-alpn</artifactId>
-    <version>12.0.10-SNAPSHOT</version>
+    <version>12.0.11-SNAPSHOT</version>
   </parent>
   <artifactId>jetty-alpn-conscrypt-server</artifactId>
   <name>Core :: ALPN :: Conscrypt Server</name>

diff --git a/jetty-core/jetty-alpn/jetty-alpn-java-client/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-java-client/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-alpn</artifactId>
-    <version>12.0.10-SNAPSHOT</version>
+    <version>12.0.11-SNAPSHOT</version>
   </parent>
   <artifactId>jetty-alpn-java-client</artifactId>
   <name>Core :: ALPN :: Java Client</name>

diff --git a/jetty-core/jetty-alpn/jetty-alpn-java-server/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-java-server/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-alpn</artifactId>
-    <version>12.0.10-SNAPSHOT</version>
+    <version>12.0.11-SNAPSHOT</version>
   </parent>
   <artifactId>jetty-alpn-java-server</artifactId>
   <name>Core :: ALPN :: Java Server</name>

diff --git a/jetty-core/jetty-alpn/jetty-alpn-server/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-server/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-alpn</artifactId>
-    <version>12.0.10-SNAPSHOT</version>
+    <version>12.0.11-SNAPSHOT</version>
   </parent>
   <artifactId>jetty-alpn-server</artifactId>
   <name>Core :: ALPN :: Server</name>

diff --git a/jetty-core/jetty-alpn/pom.xml b/jetty-core/jetty-alpn/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-core</artifactId>
-    <version>12.0.10-SNAPSHOT</version>
+    <version>12.0.11-SNAPSHOT</version>
   </parent>
   <artifactId>jetty-alpn</artifactId>
   <packaging>pom</packaging>