Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-…

…qpack-sectionAck

VERSION.txt

@@ -1,4 +1,38 @@
-jetty-10.0.9-SNAPSHOT
+jetty-10.0.10
+
+jetty-10.0.9 - 30 March 2022
+ + 5681 Unrecognized jetty-home/start.jar command line option not reported
+   clearly
+ + 5965 Option --write-module-graph produces wrong .dot file
+ + 6879 Remove jminix (not maintained) module as hawtio provide same features
+ + 7182 jetty.sh start process should remove jetty_state whenever deleting the
+   pid
+ + 7344 Incompatible with jacoco due to shutdown race condition
+ + 7414 QoSFilter.setMaxRequests throws NullPointerException
+ + 7513 Getter/setter type mismatch for mbean attribute file in class
+   org.eclipse.jetty.deploy.PropertiesConfigurationManager
+ + 7517 Some ArrayTrie methods throw StackOverflowError when cointaining a very
+   large entry
+ + 7518 ArrayTrie getBest fails to match the empty string entry in certain
+   cases
+ + 7545 Named arguments do not work in jetty-openid.xml
+ + 7548 Interrupt flag is not always cleared in between requests
+ + 7567 Gzip compression not working for multipart/form-data when added to the
+   allowed list using addIncludedMimeTypes.
+ + 7573 WebSockets - "Unsupported PathParam Type: java.lang.Integer"
+ + 7575 Misleading docs for `HttpClientTransportDynamic`
+ + 7613 Configurations.add(Configuration) results in
+   UnsupportedOperationException
+ + 7615 HttpServletResponse.encodeURL not working for URLs starting with ../
+ + 7617 Logback-access RequestLog not working
+ + 7625 HTTP/3 error against www.google.com
+ + 7677 jetty-maven-plugin - maven internal dependencies included on webapp
+   classloader 
+ + 7683 GZIPContentDecoder ignores setUseInputDirectByteBuffers setting and
+   always uses non-direct buffers (causing GC locking)
+ + 7688 Read data to native memory from HttpInput 
+ + 7748 Allow overriding of url-pattern mapping in ServletContextHandler to
+   allow for regex or uri-template matching
 
 jetty-10.0.8 - 07 February 2022
  + 2504 Expose more WebSocket details in JMX and Server Dump
@@ -21,15 +55,15 @@ jetty-10.0.8 - 07 February 2022
    JETTY_USER
  + 7012 Remove all old geronimo spec jars from jetty-10
  + 7031 ResponseWriter.println(char) does not print newline
- + 7042 Simplify configuration to use different OpenIdConfiguration per webapp.
+ + 7042 Simplify configuration to use different OpenIdConfiguration per webapp
  + 7059 NPE in AllowedResourceAliasChecker.getPath()
  + 7063 Simplify command line use of org.eclipse.jetty.util.Password
  + 7064 Cleanup or clarify `(null)` in output of `--list-config`
  + 7086 WebSocket: java.lang.IllegalStateException: already released
    RetainableByteBuffer
  + 7103 Rework LaF of distro landing page
  + 7107 Client timeout and async close exceptions when setting max duration on
-   pool 
+   pool
  + 7109 Deprecate UnixSocket JNR support
  + 7111 Add support to deprecate jetty-home modules
  + 7113 Improve Unix-Domain client documentation
@@ -40,7 +74,7 @@ jetty-10.0.8 - 07 February 2022
    resources with % in their name
  + 7240 Clarify and javadoc InvocationType
  + 7243 Reset pooled ByteBuffer endianness
- + 7262 Allow the SerlvetHandler.getFilterChain method to be overridden.
+ + 7262 Allow the SerlvetHandler.getFilterChain method to be overridden
  + 7277 Allow override of `ServletRequest.getLocalName()` and `.getLocalPort()`
    in post-intermediary scenarios
  + 7280 Interceptors don't get destroyed in HttpInput
@@ -51,7 +85,7 @@ jetty-10.0.8 - 07 February 2022
    org.eclipse.jetty.server.Server
  + 7327 jetty-slf4j-impl missing from BOM
  + 7348 Slow CONNECT request causes NPE
- + 7351 Large WebSocket payloads with permessage-deflate hang on 10.0.7 
+ + 7351 Large WebSocket payloads with permessage-deflate hang on 10.0.7
  + 7354 Demo jars should not be in jetty-home
  + 7369 Document CustomRequestLog
  + 7375 Some environments require Request scoping during session save
@@ -68,7 +102,7 @@ jetty-9.4.45.v20220203 - 03 February 2022
  + 6497 Replace SameFileAliasChecker
  + 6687 Upgrade Infinispan in all active Jetty branches
  + 6965 Expose Spec `ServerContainer.upgrade()` API
- + 6969 Getting 404 failures when trying to enable `logging-log4j` module.
+ + 6969 Getting 404 failures when trying to enable `logging-log4j` module
  + 6974 Major websocket memory change in 9.4.36
  + 7031 ResponseWriter.println(char) does not print newline
  + 7059 NPE in AllowedResourceAliasChecker.getPath()

apache-jsp/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>10.0.9-SNAPSHOT</version>
+    <version>10.0.10-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

apache-jstl/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>10.0.9-SNAPSHOT</version>
+    <version>10.0.10-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>apache-jstl</artifactId>

build-resources/pom.xml

@@ -7,15 +7,15 @@
     -->
   <groupId>org.eclipse.jetty</groupId>
   <artifactId>build-resources</artifactId>
-  <version>10.0.9-SNAPSHOT</version>
+  <version>10.0.10-SNAPSHOT</version>
   <name>Jetty :: Build Resources</name>
   <packaging>jar</packaging>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <!-- versions for these plugins are not based on parent pom -->
     <maven.deploy.plugin.version>3.0.0-M2</maven.deploy.plugin.version>
-    <maven.javadoc.plugin.version>3.3.2</maven.javadoc.plugin.version>
+    <maven.javadoc.plugin.version>3.4.0</maven.javadoc.plugin.version>
     <maven.remote-resources.plugin.version>1.6.0</maven.remote-resources.plugin.version>
     <maven.surefire.plugin.version>3.0.0-M5</maven.surefire.plugin.version>
   </properties>

demos/demo-async-rest/demo-async-rest-jar/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.demos</groupId>
     <artifactId>demo-async-rest-parent</artifactId>
-    <version>10.0.9-SNAPSHOT</version>
+    <version>10.0.10-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

demos/demo-async-rest/demo-async-rest-server/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.demos</groupId>
     <artifactId>demo-async-rest-parent</artifactId>
-    <version>10.0.9-SNAPSHOT</version>
+    <version>10.0.10-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

demos/demo-async-rest/demo-async-rest-webapp/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.demos</groupId>
     <artifactId>demo-async-rest-parent</artifactId>
-    <version>10.0.9-SNAPSHOT</version>
+    <version>10.0.10-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

demos/demo-async-rest/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.demos</groupId>
     <artifactId>demos-parent</artifactId>
-    <version>10.0.9-SNAPSHOT</version>
+    <version>10.0.10-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

demos/demo-jaas-webapp/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.jetty.demos</groupId>
     <artifactId>demos-parent</artifactId>
-    <version>10.0.9-SNAPSHOT</version>
+    <version>10.0.10-SNAPSHOT</version>
   </parent>
   <artifactId>demo-jaas-webapp</artifactId>
   <name>Demo :: JAAS :: WebApp</name>

demos/demo-jetty-webapp/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.eclipse.jetty.demos</groupId>
     <artifactId>demos-parent</artifactId>
-    <version>10.0.9-SNAPSHOT</version>
+    <version>10.0.10-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

demos/demo-jetty-webapp/src/test/resources/test-realm.properties

@@ -5,7 +5,7 @@
 #  <username>: <password>[,<rolename> ...]
 #
 # Passwords may be clear text, obfuscated or checksummed.  The class 
-# org.eclipse.util.Password should be used to generate obfuscated
+# org.eclipse.jetty.util.security.Password should be used to generate obfuscated
 # passwords or password checksums
 #
 # If DIGEST Authentication is used, the password must be in a recoverable

demos/demo-jndi-webapp/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.jetty.demos</groupId>
     <artifactId>demos-parent</artifactId>
-    <version>10.0.9-SNAPSHOT</version>
+    <version>10.0.10-SNAPSHOT</version>
   </parent>
   <artifactId>demo-jndi-webapp</artifactId>
   <name>Demo :: JNDI :: WebApp</name>

demos/demo-jsp-webapp/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.eclipse.jetty.demos</groupId>
     <artifactId>demos-parent</artifactId>
-    <version>10.0.9-SNAPSHOT</version>
+    <version>10.0.10-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

demos/demo-mock-resources/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.eclipse.jetty.demos</groupId>
     <artifactId>demos-parent</artifactId>
-    <version>10.0.9-SNAPSHOT</version>
+    <version>10.0.10-SNAPSHOT</version>
   </parent>
   <name>Demo :: Mock Resources</name>
   <artifactId>demo-mock-resources</artifactId>

demos/demo-proxy-webapp/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.eclipse.jetty.demos</groupId>
     <artifactId>demos-parent</artifactId>
-    <version>10.0.9-SNAPSHOT</version>
+    <version>10.0.10-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>demo-proxy-webapp</artifactId>

demos/demo-simple-webapp/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.eclipse.jetty.demos</groupId>
     <artifactId>demos-parent</artifactId>
-    <version>10.0.9-SNAPSHOT</version>
+    <version>10.0.10-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

demos/demo-spec/demo-container-initializer/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.eclipse.jetty.demos</groupId>
     <artifactId>demos-parent</artifactId>
-    <version>10.0.9-SNAPSHOT</version>
+    <version>10.0.10-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>demo-container-initializer</artifactId>

demos/demo-spec/demo-spec-webapp/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.jetty.demos</groupId>
     <artifactId>demos-parent</artifactId>
-    <version>10.0.9-SNAPSHOT</version>
+    <version>10.0.10-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <name>Demo :: Servlet Spec :: Webapp</name>

demos/demo-spec/demo-spec-webapp/src/etc/realm.properties

@@ -5,7 +5,7 @@
 #  <username>: <password>[,<rolename> ...]
 #
 # Passwords may be clear text, obfuscated or checksummed.  The class 
-# org.eclipse.util.Password should be used to generate obfuscated
+# org.eclipse.jetty.util.security.Password should be used to generate obfuscated
 # passwords or password checksums
 #
 # If DIGEST Authentication is used, the password must be in a recoverable

demos/demo-spec/demo-web-fragment/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.eclipse.jetty.demos</groupId>
     <artifactId>demos-parent</artifactId>
-    <version>10.0.9-SNAPSHOT</version>
+    <version>10.0.10-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

demos/demo-spec/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.jetty.demos</groupId>
     <artifactId>demos-parent</artifactId>
-    <version>10.0.9-SNAPSHOT</version>
+    <version>10.0.10-SNAPSHOT</version>
   </parent>
   <name>Demo :: Servlet Spec</name>
   <artifactId>demo-spec</artifactId>

demos/embedded/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.demos</groupId>
     <artifactId>demos-parent</artifactId>
-    <version>10.0.9-SNAPSHOT</version>
+    <version>10.0.10-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>demos-jetty-embedded</artifactId>

demos/embedded/src/main/resources/demo/demo-realm.properties

@@ -5,7 +5,7 @@
 #  <username>: <password>[,<rolename> ...]
 #
 # Passwords may be clear text, obfuscated or checksummed.  The class 
-# org.eclipse.util.Password should be used to generate obfuscated
+# org.eclipse.jetty.util.security.Password should be used to generate obfuscated
 # passwords or password checksums
 #
 # If DIGEST Authentication is used, the password must be in a recoverable

demos/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>10.0.9-SNAPSHOT</version>
+    <version>10.0.10-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

documentation/jetty-asciidoctor-extensions/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.eclipse.jetty.documentation</groupId>
     <artifactId>documentation-parent</artifactId>
-    <version>10.0.9-SNAPSHOT</version>
+    <version>10.0.10-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

documentation/jetty-documentation/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.eclipse.jetty.documentation</groupId>
     <artifactId>documentation-parent</artifactId>
-    <version>10.0.9-SNAPSHOT</version>
+    <version>10.0.10-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

documentation/jetty-documentation/src/main/asciidoc/operations-guide/begin/deploy.adoc

@@ -42,7 +42,7 @@ mywebapp.war
 <1> Publicly accessible resources such as `+*.html+`, `+*.jsp+`, `+*.css+`, `+*.js+` files, etc. are placed in `+*.war+` or in sub-directories of the `+*.war+`.
 <2> `WEB-INF` is a special directory used to store anything related to the web application that must not be publicly accessible, but may be accessed by other resources.
 <3> `WEB-INF/classes` stores the web application compiled `+*.class+` files
-<4> `WEB-INF/classes` stores the web application `+*.jar+` files
+<4> `WEB-INF/lib` stores the web application `+*.jar+` files
 <5> `WEB-INF/web.xml` is the web application deployment descriptor defines the components and the configuration of your web application.
 ====
 

documentation/jetty-documentation/src/main/asciidoc/programming-guide/client/http/client-http-transport.adoc

@@ -156,9 +156,12 @@ The dynamic transport, however, has been implemented to support multiple transpo
 include::../../{doc_code}/org/eclipse/jetty/docs/programming/client/http/HTTPClientDocs.java[tag=dynamicH1H2]
 ----
 
-IMPORTANT: The order in which the protocols are specified to `HttpClientTransportDynamic` indicates what is the client preference.
-If the protocol is negotiated via ALPN, it is the server that decides what is the protocol to use for the communication, regardless of the client preference.
-If the protocol is not negotiated, the client preference is honored.
+NOTE: The order in which the protocols are specified to `HttpClientTransportDynamic` indicates what is the client preference.
+
+IMPORTANT: When using TLS (i.e. URIs with the `https` scheme), the application protocol is _negotiated_ between client and server via ALPN, and it is the server that decides what is the application protocol to use for the communication, regardless of the client preference.
+
+When clear-text communication is used (i.e. URIs with the `http` scheme) there is no application protocol negotiation, and therefore the application must know _a priori_ whether the server supports the protocol or not.
+For example, if the server only supports clear-text HTTP/2, and `HttpClientTransportDynamic` is configured as in the example above, the client will send, by default, a clear-text HTTP/1.1 request to a clear-text HTTP/2 only server, which will result in a communication failure.
 
 Provided that the server supports both HTTP/1.1 and HTTP/2 clear-text, client applications can explicitly hint the version they want to use:
 
@@ -167,13 +170,13 @@ Provided that the server supports both HTTP/1.1 and HTTP/2 clear-text, client ap
 include::../../{doc_code}/org/eclipse/jetty/docs/programming/client/http/HTTPClientDocs.java[tag=dynamicClearText]
 ----
 
-In case of TLS encrypted communication using the HTTPS scheme, things are a little more complicated.
+In case of TLS encrypted communication using the `https` scheme, things are a little more complicated.
 
-If the client application explicitly specifies the HTTP version, then ALPN is not used on the client.
+If the client application explicitly specifies the HTTP version, then ALPN is not used by the client.
 By specifying the HTTP version explicitly, the client application has prior-knowledge of what HTTP version the server supports, and therefore ALPN is not needed.
 If the server does not support the HTTP version chosen by the client, then the communication will fail.
 
-If the client application does not explicitly specify the HTTP version, then ALPN will be used on the client.
+If the client application does not explicitly specify the HTTP version, then ALPN will be used by the client.
 If the server also supports ALPN, then the protocol will be negotiated via ALPN and the server will choose the protocol to use.
 If the server does not support ALPN, the client will try to use the first protocol configured in `HttpClientTransportDynamic`, and the communication may succeed or fail depending on whether the server supports the protocol chosen by the client.
 

documentation/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>10.0.9-SNAPSHOT</version>
+    <version>10.0.10-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

javadoc/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>10.0.9-SNAPSHOT</version>
+    <version>10.0.10-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

jetty-alpn/jetty-alpn-client/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-alpn-parent</artifactId>
-    <version>10.0.9-SNAPSHOT</version>
+    <version>10.0.10-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-alpn-client</artifactId>

jetty-alpn/jetty-alpn-conscrypt-client/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-alpn-parent</artifactId>
-    <version>10.0.9-SNAPSHOT</version>
+    <version>10.0.10-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>