Commit Graph

23284 Commits

Author SHA1 Message Date
Ludovic Orban 04cb3f3736
Merge pull request #5926 from eclipse/jetty-10.0.x-tck-run-12-servlet-upgrade
Implementation of HttpServletRequest.upgrade
2021-02-03 13:11:50 +01:00
Ludovic Orban 421ed6bf8d implementation of HttpServletRequest.upgrade
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-02-03 13:10:38 +01:00
gregw 25cbe652a0 Fix #5605 Unblock non container Threads
reorder
2021-02-03 11:27:25 +01:00
gregw a100d80d26 Fix #5605 Unblock non container Threads
Don't consumeAll before upgrade
2021-02-03 11:03:02 +01:00
Joakim Erdfelt 67fceccdee
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-02-02 12:20:47 -06:00
Joakim Erdfelt 4b568264f1
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-02-02 12:17:10 -06:00
Joakim Erdfelt 5ad9bc9b3d
Merge pull request #5669 from eclipse/dependabot/maven/jetty-9.4.x/org.eclipse.jetty.toolchain-jetty-version-maven-plugin-2.7
Bump jetty-version-maven-plugin from 2.6 to 2.7
2021-02-02 12:15:53 -06:00
gregw a110fc3468 Fix #5605 Unblock non container Threads
test and fixes for the write side.
2021-02-02 17:55:15 +01:00
gregw 0d85c7d220 Fix #5605 Unblock non container Threads
test and fixes for the write side.
2021-02-02 17:49:17 +01:00
gregw b3268eb3b5 Fix #5605 Unblock non container Threads
Ensure that HttpInput is always closed to EOF, EarlyEOF or Error, so that non container threads doing blocking reads
will not block forever, even if late.   Delay recycling of HttpInput until next request is received.
2021-02-02 16:33:32 +01:00
Joakim Erdfelt 4f8bbeff3e
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-02-02 09:00:20 -06:00
Joakim Erdfelt b16313b1c8
Merge pull request #5876 from eclipse/jetty-10.0.x-logging-jmx-dynamic
Issue #5872 - JMX DynamicMBean for jetty-slf4j-impl
2021-02-02 08:59:48 -06:00
Joakim Erdfelt ace1277ecb
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-02-02 08:58:50 -06:00
Joakim Erdfelt 4444e15d6e
Reducing build timeout from 4 hours to 2 hours
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-02-02 08:58:17 -06:00
gregw 9cc7be4842 Fix #5605 Unblock non container Threads
Ensure that HttpInput is always closed to EOF, EarlyEOF or Error, so that non container threads doing blocking reads
will not block forever, even if late.   Delay recycling of HttpInput until next request is received.
2021-02-02 14:03:38 +01:00
Lachlan Roberts 2ac50130d6 Issue #5868 - allow request attributes to be set during websocket handshake
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-02-02 17:48:11 +11:00
Jan Bartel 2b259354f2 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-02-01 17:21:05 +01:00
Jan Bartel 49098e6302 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-02-01 17:15:35 +01:00
Jan Bartel 4bf250fbaa
Jetty 9.4.x 5859 classloader leak queuedthreadpool (#5894)
* Issue #5859 Fix Classloader leak from QueuedThreadPool

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-02-01 16:58:02 +01:00
olivier lamy 82195e2c5a Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-02-01 10:14:41 +10:00
olivier lamy 5b97d91f59 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2021-02-01 10:12:39 +10:00
Olivier Lamy efbd1813ff
force properties encoding when filtering resources (#5929)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-02-01 10:11:09 +10:00
Simone Bordet 2f766632b3 Fixes #5924 - Javadoc build triggers maven error
Fixed javadoc generation error.
Apparently, this is caused by a doxia dependency of asciidoctor-maven-plugin
that transitively pulls in Apache HttpClient, but at an older version
that causes this error:

Exception in thread “main” java.lang.NoSuchMethodError: ‘org.apache.http.HttpHost org.apache.http.client.utils.URIUtils.extractHost(java.net.URI)’

Adding Apache HttpClient as an explicit dependency of the asciidoctor-maven-plugin
works around the issue.

Co-authored-by: olivier lamy <oliver.lamy@gmail.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-01 00:32:24 +01:00
Simone Bordet f4323a3e3f Improvements to the Jetty documentation.
Moved documentation examples back into jetty-documentation module.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-01 00:24:13 +01:00
Joakim Erdfelt ed77b06165
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-01-30 10:13:20 -06:00
Joakim Erdfelt 17958ef79d
Issue #5924 - Disabling javadoc module (again)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-30 10:12:50 -06:00
olivier lamy eca4fbcd98 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-01-29 12:50:50 +10:00
olivier lamy f80792f377 version from pom interpolation and fix mvn central url
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-01-29 12:50:23 +10:00
olivier lamy 8d776fc589 fix version
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-01-29 12:48:54 +10:00
olivier lamy 453f4e91e8 fix servlet api artifactId
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-01-29 12:43:14 +10:00
Joakim Erdfelt 62b10a01f0
Fixing version fallout from last merge. 2021-01-28 16:16:00 -06:00
Joakim Erdfelt a6804ed207
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-01-28 16:10:23 -06:00
Joakim Erdfelt 8c34fdd4ca
Merge pull request #5928 from eclipse/jetty-10.0.x-5924-asciidoc-breakout
Issue #5924 - Reorganized jetty-documentation
2021-01-28 16:08:32 -06:00
Joakim Erdfelt 6a5e1d3961
Merge pull request #5927 from eclipse/jetty-10.0.x-5942-enable-javadoc
Issue #5924 - Enable javadoc module again
2021-01-28 16:07:52 -06:00
Joakim Erdfelt 618bff71e2
Issue #5924 - Reorganized jetty-documentation
* New top level /documentation/
  Which is a parent pom
* Existing /jetty-documentation/ moved to new
  /documentation/jetty-documentation/ location
* New /documentation/jetty-asciidoctor-extensions/ project
  Created from the java code in the old
  /jetty-documentation/src/main/ tree
* Referencing new jetty-asciidoctor-extensions project
  in asciidoc plugin on /documentation/jetty-documentation/pom.xml
* All projects in /documentation/ are now on
  org.eclipse.jetty.documentation groupId

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-28 10:49:21 -06:00
Joakim Erdfelt f2fe26ffcd
Issue #5924 - Enable javadoc module again
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-28 10:10:26 -06:00
olivier lamy 3576909019 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-01-28 10:57:19 +10:00
Jesse McConnell fb4ecf09e9
#5924 remove odd jetty-documentation dependency busting javadoc generation (#5925) 2021-01-28 10:56:21 +10:00
Joakim Erdfelt bf90ce2435
Issue #5942 - Disable javadoc module as it breaks the jenkins build.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-27 18:11:26 -06:00
Joakim Erdfelt 95797039bb
Disable javadoc module as it breaks the jenkins build. (See issue 5924)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-27 15:29:40 -06:00
Joakim Erdfelt aca497072e
Merge pull request #5921 from eclipse/jetty-10.0.x-cleanup-demo-embedded
Cleaning up demos/embedded
2021-01-27 13:33:38 -06:00
Joakim Erdfelt fb6a148e9c
Disable javadoc module as it breaks the jenkins build. (See issue 5924)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-27 13:33:14 -06:00
Joakim Erdfelt cd4c046988
Restore javadoc module + Upgrade errorprone
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-27 12:03:42 -06:00
Greg Wilkins 5497eb5017 TCK work around for #5803
TCK work around for #5803

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-01-27 13:49:15 +01:00
Jan Bartel 1d70c2cb33
Issue #5901 Update to jakarta.servlet.api 5.0.2 (#5919)
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-01-27 09:13:07 +01:00
Jan Bartel 15801ae332 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-01-27 09:12:34 +01:00
Jan Bartel 4c44d83b45
Issue #5901 Update to javax.servlet.api 4.0.6. (#5918)
This brings in a change to the javax.servlet.api module-info
to open the javax.servlet.resources package to all modules,
so that the dtds and xsds can be retrieved as resources, either
from the context Classloader.getResource, or
from the ServletContext.class.getResource.

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-01-27 09:06:14 +01:00
olivier lamy f189967128 temporary remove this as it is causing failure....
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-01-27 15:44:27 +10:00
Joakim Erdfelt fcbbf8ab55
Cleaning up demos/embedded
+ Removing JettyHome.java
+ Removing JettyDemoBase.java
+ Introducing JettyDemos.java to find
  content in the /demos/ directory

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-26 12:57:49 -06:00
Simone Bordet 1f6c25cfb1 Improvements to the Jetty documentation.
Fixed HTTP/2 example and documentation of the programming guide.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-26 18:29:25 +01:00