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

…20-WebSocketHttpClient
jetty · Oct 15, 2020 · 6cd70ce · 6cd70ce
2 parents 26f4062 + 7bfca25
commit 6cd70ce
Show file tree

Hide file tree

Showing 259 changed files with 3,559 additions and 2,609 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,11 +1,60 @@
-*.sh	eol=lf
+# Shell Scripts
 *.bat	eol=crlf
-*.txt	eol=lf
-*.properties	eol=lf
+*.sh	eol=lf
+
+# Sources
+*.groovy    eol=lf
 *.java	eol=lf
+
+# Configuration
+*.dtd   eol=lf
+*.ini   eol=lf
+*.json  eol=lf
 *.mod	eol=lf
-*.adoc	eol=lf
+*.properties	eol=lf
+*.sql   eol=lf
+*.xsl   eol=lf
+*.xslt  eol=lf
 *.xml	eol=lf
-Jenkinsfile	eol=lf
+*.yaml  eol=lf
+*.yml   eol=lf
+
+# Text / Documentation
+*.adoc	eol=lf
+*.dot   eol=lf
+*.txt	eol=lf
+*.TXT   eol=lf
+*.md    eol=lf
+*.pdf   binary
+
+# Web
+*.gif   binary
+*.htm   eol=lf
+*.html  eol=lf
+*.ico   binary
+*.jar   binary
+*.jpg   binary
+*.jpeg  binary
 *.js    eol=lf
+*.jsp   eol=lf
+*.jspf  eol=lf
+*.png   binary
+*.svg   eol=lf
+*.svgz  binary
+*.tga   binary
+*.tif   binary
+*.tiff  binary
+*.ttf   binary
+*.war   binary
+
+# Build Files
+Jenkinsfile	eol=lf
+
+# Binaries
 *.raw   binary
+*.gz    binary
+*.zip   binary
+*.br    binary
+*.brotli    binary
+*.bz2   binary
+
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -4,7 +4,34 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+    target-branch: "jetty-9.4.x"
+
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "weekly"
+    target-branch: "jetty-9.4.x"
+
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    target-branch: "jetty-10.0.x"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    target-branch: "jetty-10.0.x"
+
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    target-branch: "jetty-11.0.x"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    target-branch: "jetty-11.0.x"
diff --git a/.github/release-config.yml b/.github/release-config.yml
@@ -0,0 +1,61 @@
+# Emoji reference: https://gitmoji.carloscuesta.me/
+categories:
+  - title: ":boom: Breaking changes"
+    labels:
+      - breaking
+  - title: 🚨 Removed
+    label: removed
+  - title: ":tada: Major features and improvements"
+    labels:
+      - major-enhancement
+      - major-rfe
+  - title: 🐛 Major bug fixes
+    labels:
+      - major-bug
+  - title: ⚠️ Deprecated
+    label: deprecated
+  - title: 🚀 New features and improvements
+    labels:
+      - enhancement
+      - feature
+      - rfe
+  - title: 🐛 Bug Fixes
+    labels:
+      - bug
+      - Bug
+      - fix
+      - bugfix
+      - regression
+  - title: ":construction_worker: Changes for plugin developers"
+    labels:
+      - developer
+  # Default label used by Dependabot
+  - title: 📦 Dependency updates
+    label: dependencies
+  - title: 📝 Documentation updates
+    label: documentation
+  - title: 👻 Maintenance
+    labels:
+      - chore
+      - internal
+      - Build
+      - build
+  - title: 🚦 Tests
+    labels:
+      - test
+      - tests
+      - Test
+      - Tests
+exclude-labels:
+  - reverted
+  - no-changelog
+  - skip-changelog
+  - invalid
+
+change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
+# Disable certain characters in title from being interpreted as markdown
+change-title-escapes: '\<*_&#'
+
+template: |
+  <!-- Optional: add a release summary here -->
+  $CHANGES
diff --git a/VERSION.txt b/VERSION.txt
@@ -1,4 +1,53 @@
-jetty-9.4.32-SNAPSHOT
+jetty-9.4.33-SNAPSHOT
+
+jetty-9.4.32.v20200930 - 30 September 2020
+ + 2796 HTTP/2 max local stream count exceeded when request fails
+ + 3766 Introduce HTTP/2 API to batch frames
+ + 3916 multipart/byterange output is invalid to RFC7233
+ + 4809 Set a max number of requests per connection
+ + 4824 WebSocket server outgoing message queue memory growth
+ + 4888 Request getSession() method throws IllegalStateException when Session
+   exists
+ + 4954 Simplify ability to get Byte Counts about requests
+ + 5032 Introduce Listeners to aid in tracking timings within ServletContext
+   and WebApp
+ + 5079 :authority header for IPv6 address not having square brackets
+ + 5103 Proxy sets protocol version to 2.0 instead of 1.1 when accessed from H2
+   client
+ + 5104 AbstractProxyServlet include incorrect protocol version in Via header
+   when accessed over H2
+ + 5105 Graceful shutdown does not wait for resumed requests
+ + 5108 Improve SessionTracker scalability
+ + 5121 Add if (LOG.isDebugEnabled()) in CompressExtension.decompress
+ + 5122 Retrieving websocket connections via jmx
+ + 5129 No jars added when using a folder in extraClasspath of the webapp
+   context xml file
+ + 5147 Set MaxUsageCount with existing connection pool changing the behavior
+ + 5150 Zero connection timeout is not supported in HTTP client with
+   non-blocking connect
+ + 5152 HttpClient should handle unsolicited responses
+ + 5162 DecoratingListener raises a NullPointerException
+ + 5165 Wrong messagesIn count for HttpClient
+ + 5170 NullPointerException in HttpReceiverOverHTTP during WebSocket client
+   Upgrade
+ + 5185 Introduce DoSFilter Listener for Alert messages
+ + 5193 WebSocket unimplemented BINARY message handling can result in TEXT
+   message delivery to fail
+ + 5201 QueuedThreadPool setDetailedDump gives less detail
+ + 5204 SNI does not work with PKIX
+ + 5214 Servlet HEAD doesn't support content-length over Integer.MAX_VALUE
+ + 5217 Review RoundRobinConnectionPool
+ + 5224 HttpServletRequest.getServerName can include port when using
+   ForwardedRequestCustomizer
+ + 5233 Bad/Unsupported HTTP version should return 505 not 400
+ + 5246 GzipHandler's DeflaterPool should be dumpable
+ + 5247 Improve ForwardRequestCustomizer authority priority
+ + 5268 WARN Ignoring eviction setting: 0
+ + 5285 Per RFC7694, if a Content-Encoding isn't recognized, reject with 415
+   Unsupported Media Type
+ + 5362 Default ProxyServlet cannot proxy to https urls
+ + 5365 org.eclipse.jetty.server.Request throws NullPointerException if
+   SessionHandler newHttpSession returns null
 
 jetty-9.4.31.v20200723 - 23 July 2020
  + 1100 JSR356 Encoder#init is not called when created on demand

diff --git a/aggregates/jetty-all-compact3/pom.xml b/aggregates/jetty-all-compact3/pom.xml
@@ -2,14 +2,13 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>9.4.32-SNAPSHOT</version>
+    <version>9.4.33-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.jetty.aggregate</groupId>
   <artifactId>jetty-all-compact3</artifactId>
   <name>Jetty :: Aggregate :: All core Jetty suitable for Java 8 compact 3 profile</name>
-  <url>http://www.eclipse.org/jetty</url>
   <properties>
     <bundle-symbolic-name>${project.groupId}.all.compact3</bundle-symbolic-name>
   </properties>
@@ -87,7 +86,9 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
-          <additionalparam>-Xdoclint:none &#45;&#45;allow-script-in-comments</additionalparam>
+          <!-- up to date javadoc syntax isn't supported under the compact3 limitations -->
+          <additionalOptions>-Xdoclint:none</additionalOptions>
+          <additionalJOption>-Xdoclint:none</additionalJOption>
         </configuration>
         <executions>
           <execution>

diff --git a/aggregates/jetty-all/pom.xml b/aggregates/jetty-all/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>9.4.32-SNAPSHOT</version>
+    <version>9.4.33-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -11,7 +11,6 @@
   <name>Jetty :: Aggregate :: All core Jetty</name>
   <description>UberJar for Core Jetty features</description>
   <packaging>pom</packaging>
-  <url>http://www.eclipse.org/jetty</url>
   <properties>
     <uber-jar>${project.build.directory}/${project.artifactId}-${project.version}-uber.jar</uber-jar>
     <gen-resources-dir>${project.build.directory}/gen-resources</gen-resources-dir>

diff --git a/aggregates/jetty-websocket-all/pom.xml b/aggregates/jetty-websocket-all/pom.xml
@@ -9,7 +9,6 @@
   <groupId>org.eclipse.jetty.aggregate</groupId>
   <artifactId>jetty-websocket-all</artifactId>
   <name>Jetty :: Aggregate :: All WebSocket Server + Client Classes</name>
-  <url>http://www.eclipse.org/jetty</url>
   <build>
     <sourceDirectory>${project.build.directory}/sources</sourceDirectory>
     <plugins>
@@ -66,7 +65,7 @@
                 <manifest></manifest>
                 <manifestEntries>
                   <mode>development</mode>
-                  <url>http://eclipse.org/jetty</url>
+                  <url>https://eclipse.org/jetty</url>
                   <Built-By>${user.name}</Built-By>
                   <package>org.eclipse.jetty</package>
                   <Bundle-License>https://raw.githubusercontent.com/eclipse/jetty.project/master/NOTICE.txt</Bundle-License>

diff --git a/apache-jsp/pom.xml b/apache-jsp/pom.xml
@@ -2,12 +2,11 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>9.4.32-SNAPSHOT</version>
+    <version>9.4.33-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>apache-jsp</artifactId>
   <name>Jetty :: Apache JSP Implementation</name>
-  <url>http://www.eclipse.org/jetty</url>
   <packaging>jar</packaging>
   <properties>
     <bundle-symbolic-name>${project.groupId}.apache-jsp</bundle-symbolic-name>

diff --git a/apache-jstl/pom.xml b/apache-jstl/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>9.4.32-SNAPSHOT</version>
+    <version>9.4.33-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>apache-jstl</artifactId>

diff --git a/build-resources/pom.xml b/build-resources/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.jetty</groupId>
   <artifactId>build-resources</artifactId>
-  <version>9.4.32-SNAPSHOT</version>
+  <version>9.4.33-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Jetty :: Build Resources</name>
 

diff --git a/examples/async-rest/async-rest-jar/pom.xml b/examples/async-rest/async-rest-jar/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>example-async-rest</artifactId>
-    <version>9.4.32-SNAPSHOT</version>
+    <version>9.4.33-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/examples/async-rest/async-rest-webapp/pom.xml b/examples/async-rest/async-rest-webapp/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>example-async-rest</artifactId>
-    <version>9.4.32-SNAPSHOT</version>
+    <version>9.4.33-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/examples/async-rest/pom.xml b/examples/async-rest/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.examples</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>9.4.32-SNAPSHOT</version>
+    <version>9.4.33-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/examples/embedded/pom.xml b/examples/embedded/pom.xml
@@ -2,15 +2,14 @@
   <parent>
     <groupId>org.eclipse.jetty.examples</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>9.4.32-SNAPSHOT</version>
+    <version>9.4.33-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.jetty</groupId>
   <artifactId>example-jetty-embedded</artifactId>
   <name>Example :: Jetty Embedded</name>
   <description>Jetty Embedded Examples</description>
-  <url>http://www.eclipse.org/jetty</url>
   <properties>
     <bundle-symbolic-name>${project.groupId}.embedded</bundle-symbolic-name>
   </properties>

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>9.4.32-SNAPSHOT</version>
+    <version>9.4.33-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/jetty-alpn/jetty-alpn-client/pom.xml b/jetty-alpn/jetty-alpn-client/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-alpn-parent</artifactId>
-    <version>9.4.32-SNAPSHOT</version>
+    <version>9.4.33-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-alpn-client</artifactId>

diff --git a/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml b/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-alpn-parent</artifactId>
-    <version>9.4.32-SNAPSHOT</version>
+    <version>9.4.33-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/...ypt-client/src/test/java/org/eclipse/jetty/alpn/java/client/ConscryptHTTP2ClientTest.java b/...ypt-client/src/test/java/org/eclipse/jetty/alpn/java/client/ConscryptHTTP2ClientTest.java
@@ -60,7 +60,7 @@ public void testConscryptHTTP2Client() throws Exception
         Security.insertProviderAt(new OpenSSLProvider(), 1);
         SslContextFactory sslContextFactory = new SslContextFactory.Client();
         sslContextFactory.setProvider("Conscrypt");
-        Conscrypt.setDefaultHostnameVerifier((hostname, session) -> true);
+        Conscrypt.setDefaultHostnameVerifier((certs, hostname, session) -> true);
 
         HTTP2Client client = new HTTP2Client();
         try

diff --git a/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml b/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-alpn-parent</artifactId>
-    <version>9.4.32-SNAPSHOT</version>
+    <version>9.4.33-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>