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

…well-known-listing

.github/dependabot.yml

@@ -24,6 +24,8 @@ updates:
         versions: [ ">=1.1.0" ]
       - dependency-name: "org.infinispan:*"
         versions: [ ">=12" ]
+      - dependency-name: "org.jboss.weld.servlet:*"
+        versions: [ ">=4.0.0" ]
 
   - package-ecosystem: "maven"
     directory: "/"

.mvn/jvm.config

@@ -0,0 +1,10 @@
+--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
+--add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
+--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED

Jenkinsfile

@@ -7,12 +7,12 @@ pipeline {
   stages {
     stage("Parallel Stage") {
       parallel {
-        stage("Build / Test - JDK11") {
+        stage("Build / Test - JDK17") {
           agent { node { label 'linux' } }
           steps {
             container('jetty-build') {
               timeout( time: 120, unit: 'MINUTES' ) {
-                mavenBuild( "jdk11", "clean install -Perrorprone", "maven3")
+                mavenBuild( "jdk17", "clean install -Perrorprone", "maven3")
                 // Collect up the jacoco execution results (only on main build)
                 jacoco inclusionPattern: '**/org/eclipse/jetty/**/*.class',
                        exclusionPattern: '' +
@@ -31,19 +31,19 @@ pipeline {
                        execPattern: '**/target/jacoco.exec',
                        classPattern: '**/target/classes',
                        sourcePattern: '**/src/main/java'
-                recordIssues id: "jdk11", name: "Static Analysis jdk11", aggregatingResults: true, enabledForFailure: true, tools: [mavenConsole(), java(), checkStyle(), spotBugs(), pmdParser(), errorProne()]
+                recordIssues id: "jdk17", name: "Static Analysis jdk17", aggregatingResults: true, enabledForFailure: true, tools: [mavenConsole(), java(), checkStyle(), errorProne(), spotBugs()]
               }
             }
           }
         }
 
-        stage("Build / Test - JDK17") {
+        stage("Build / Test - JDK11") {
           agent { node { label 'linux' } }
           steps {
             container( 'jetty-build' ) {
               timeout( time: 120, unit: 'MINUTES' ) {
-                mavenBuild( "jdk17", "clean install -Dspotbugs.skip=true -Djacoco.skip=true", "maven3")
-                recordIssues id: "jdk17", name: "Static Analysis jdk17", aggregatingResults: true, enabledForFailure: true, tools: [mavenConsole(), java(), checkStyle(), spotBugs(), pmdParser()]
+                mavenBuild( "jdk11", "clean install -Dspotbugs.skip=true -Djacoco.skip=true", "maven3")
+                recordIssues id: "jdk11", name: "Static Analysis jdk11", aggregatingResults: true, enabledForFailure: true, tools: [mavenConsole(), java(), checkStyle()]
               }
             }
           }

VERSION.txt

@@ -1,4 +1,95 @@
-jetty-10.0.8-SNAPSHOT
+jetty-10.0.9-SNAPSHOT
+
+jetty-10.0.8 - 07 February 2022
+ + 2504 Expose more WebSocket details in JMX and Server Dump
+ + 4275 Path Normalization/Traversal - Context Matching
+ + 4317 EventSource does not work with GzipHandler
+ + 6017 Property overriding does not work
+ + 6282 SecuredRedirectHandler should probably redirect with 301
+ + 6497 Replace SameFileAliasChecker
+ + 6728 QUIC and HTTP/3
+ + 6730 HTTP3: update Quiche to 0.9.0
+ + 6965 Expose Spec `ServerContainer.upgrade()` API
+ + 6973 Jetty starts consuming CPU that remains high even without any traffic
+ + 6974 Major websocket memory change in 9.4.36
+ + 6980 ELContextCleaner failed because cannot access a member of class
+   javax.el.BeanELResolver with modifiers "private static final"
+ + 6987 jetty-unixdomain-server is missing from jetty-bom
+ + 6990 UnixDomainServerConnector throws misleading exception on invalid socket
+   path
+ + 7008 Problem with jetty.sh start regression 10.0.6 -> 10.0.7 when using
+   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.
+ + 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 
+ + 7109 Deprecate UnixSocket JNR support
+ + 7111 Add support to deprecate jetty-home modules
+ + 7113 Improve Unix-Domain client documentation
+ + 7124 Add default methods on LifeCycle.Listener interface
+ + 7131 Use Charset instead of encoding string where possible
+ + 7157 Multiplexed connection pools retain CLOSED entries
+ + 7160 HttpURI considers %25 to be ambiguous, preventing access to static
+   resources with % in their name
+ + 7240 Clarify and javadoc InvocationType
+ + 7243 Reset pooled ByteBuffer endianness
+ + 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
+ + 7281 EOFs are not passed to interceptors any more - shouldn't they?
+ + 7284 HttpInput reopen/recycle cleanup
+ + 7297 Deprecate log4j 1.x support
+ + 7313 addBean(_attributes); only called in the Convenience constructor of
+   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 
+ + 7354 Demo jars should not be in jetty-home
+ + 7369 Document CustomRequestLog
+ + 7375 Some environments require Request scoping during session save
+ + 7435 Investigate Infinispan transitive dependencies
+ + 7496 Transient 400: Bad Request responses in jetty-9.4.45.v20220128
+ + 7514 Adding InheritedListeners to already-started components can cause
+   IllegalStateException
+ + 7523 Typo in AnnotationConfiguration
+ + 7524 Missing package in JmxConfiguration
+ + 7529 Upgrade quiche to version 0.11.0
+
+jetty-9.4.45.v20220203 - 03 February 2022
+ + 4275 Path Normalization/Traversal - Context Matching
+ + 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.
+ + 6974 Major websocket memory change in 9.4.36
+ + 7031 ResponseWriter.println(char) does not print newline
+ + 7059 NPE in AllowedResourceAliasChecker.getPath()
+ + 7073 Error in parse parameter in broken UTF-8 encoding
+ + 7078 CompressionPools are not shared between multiple contexts for 9.4
+   WebSocket
+ + 7107 Client timeout and async close exceptions when setting max duration on
+   pool
+ + 7124 Add default methods on LifeCycle.Listener interface
+ + 7157 Multiplexed connection pools retain CLOSED entries
+ + 7243 Reset pooled ByteBuffer endianness
+ + 7266 Wrong ALPN jars are selected for newer versions of JDK8
+ + 7271 It is necessary to set MAX_CAPACITY to ArrayTernaryTrie/ArrayTrie
+ + 7277 Allow override of `ServletRequest.getLocalName()` and `.getLocalPort()`
+   in post-intermediary scenarios
+ + 7297 Deprecate log4j 1.x support
+ + 7348 Slow CONNECT request causes NPE
+ + 7375 Some environments require Request scoping during session save
+ + 7435 Investigate Infinispan transitive dependencies
+ + 7440 ContextHandler.getAliasChecks() breaks Spring Boot
+ + 7496 Transient 400: Bad Request responses in jetty-9.4.45.v20220128
 
 jetty-10.0.7 - 06 October 2021
  + 3514 Use interpolation of versions from pom in mod files
@@ -13,15 +104,15 @@ jetty-10.0.7 - 06 October 2021
    active modules
  + 6487 Expose ServletHolder getter in ServletHandler$ChainEnd for auditing
    libraries to use
- + 6489 Some URI valid compliance modes cannot be set in .ini file.
+ + 6489 Some URI valid compliance modes cannot be set in .ini file
  + 6491 onDataAvailable() not called when HttpParser is closed prematurely
  + 6497 Replace SameFileAliasChecker
- + 6520 Error page has HTML error when writePoweredBy is enabled.
+ + 6520 Error page has HTML error when writePoweredBy is enabled
  + 6544 Using jetty.gzip.excludedMimeTypeList property results in an error
  + 6545 image/webp MIME type support
  + 6552 FileBufferedInterceptor.dispose not working due to locked file
  + 6553 Review usage of Authentication.UNAUTHENTICATED in SecurityHandler
- + 6554 Allow creation of DefaultIdentityService without realmName.
+ + 6554 Allow creation of DefaultIdentityService without realmName
  + 6556 MemcachedSessionDataMap needs to set the context classloader before
    serialization/deseriazliation.
  + 6558 Allow to configure return type in JSON array parsing
@@ -36,7 +127,7 @@ jetty-10.0.7 - 06 October 2021
  + 6617 Add basic auth support for OpenId token endpoint (client_secret_basic)
  + 6618 ID token `azp` claim should not be required if `aud` is single value
    array
- + 6642 WebSocket handling of Connection: upgrade,close.
+ + 6642 WebSocket handling of Connection: upgrade,close
  + 6646 Deadlock in HTTP2Flusher when using a small thread pool due to
    incorrect InvocableType
  + 6652 Improve ReservedThreadExecutor dump
@@ -57,6 +148,32 @@ jetty-10.0.7 - 06 October 2021
  + 6883 Welcome file redirects do not honor the relativeRedirectAllowed option
  + 6938 module-info.java file do not use the canonical order for the elements
 
+jetty-9.4.44.v20210927 - 27 September 2021
+ + 3514 Use interpolation of versions from pom in mod files
+ + 6369 Increment default jetty.http2.rateControl.maxEventsPerSecond
+ + 6372 Review socket options configuration
+ + 6487 Expose ServletHolder getter in ServletHandler$ChainEnd for auditing
+   libraries to use
+ + 6491 onDataAvailable() not called when HttpParser is closed prematurely
+ + 6520 Error page has HTML error when writePoweredBy is enabled
+ + 6545 image/webp MIME type support
+ + 6553 Review usage of Authentication.UNAUTHENTICATED in SecurityHandler
+ + 6554 Allow creation of DefaultIdentityService without realmName
+ + 6558 Allow to configure return type in JSON array parsing
+ + 6562 HttpOutput.write(ByteBuffer buffer)
+ + 6603 HTTP/2 max local stream count exceeded
+ + 6617 Add basic auth support for OpenId token endpoint (client_secret_basic)
+ + 6618 ID token `azp` claim should not be required if `aud` is single value
+   array
+ + 6652 Improve ReservedThreadExecutor dump
+ + 6671 Update to apache jsp 8.5.70
+ + 6772 Update to asm 9.2
+ + 6853 Remove pack200 plugins
+ + 6860 Correct IPv6 format
+ + 6869 Correct Content-Type within HTML error pages
+ + 6870 Encode control characters in URIUtil.encodePath
+ + 6883 Welcome file redirects do not honor the relativeRedirectAllowed option
+
 jetty-10.0.6 - 29 June 2021
  + 6375 Always check XML `Set` elements with `property` attribute
  + 6382 HttpClient TimeoutException message reports transient values

apache-jsp/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>10.0.8-SNAPSHOT</version>
+    <version>10.0.9-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.8-SNAPSHOT</version>
+    <version>10.0.9-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.8-SNAPSHOT</version>
+  <version>10.0.9-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.1</maven.javadoc.plugin.version>
+    <maven.javadoc.plugin.version>3.3.2</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.8-SNAPSHOT</version>
+    <version>10.0.9-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.8-SNAPSHOT</version>
+    <version>10.0.9-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.8-SNAPSHOT</version>
+    <version>10.0.9-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.8-SNAPSHOT</version>
+    <version>10.0.9-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.8-SNAPSHOT</version>
+    <version>10.0.9-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.8-SNAPSHOT</version>
+    <version>10.0.9-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

demos/demo-jndi-webapp/pom.xml

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

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.8-SNAPSHOT</version>
+    <version>10.0.9-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.8-SNAPSHOT</version>
+    <version>10.0.9-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.8-SNAPSHOT</version>
+    <version>10.0.9-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>demos-jetty-embedded</artifactId>