Commit Graph

23310 Commits

Author SHA1 Message Date
gregw 24458cb2ec Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-02-23 13:12:00 +01:00
gregw 522bb4e3e9 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: gregw <gregw@webtide.com>
2021-02-23 13:10:00 +01:00
gregw 8ea5b47a3b Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: gregw <gregw@webtide.com>
2021-02-23 13:09:28 +01:00
gregw 16241d7fcb Efficiency improvements for #5977
Improve efficiency for non wrapped response for cache-contro
2021-02-23 13:09:02 +01:00
gregw 3100f2c158 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: gregw <gregw@webtide.com>
2021-02-23 13:07:56 +01:00
gregw fdb54fa2fb Efficiency improvements for #5977
Improve efficiency for non wrapped response for cache-contro
2021-02-23 13:06:50 +01:00
Greg Wilkins c0b0f80567
Efficiency improvements for #5977 (#5998)
Improve efficiency for non wrapped response for cache-contro
2021-02-23 12:56:22 +01:00
olivier lamy a58c8469fe Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-02-23 10:45:36 +10:00
olivier lamy 0f32e264a2 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2021-02-23 10:38:05 +10:00
olivier lamy b836c2fda3 add test for fix containsHeader test when it is not instance of Response, Issue #5977 was partially fixed
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-02-23 10:32:00 +10:00
olivier lamy 38ef4009b9 fix containsHeader test when it is not instance of Response, Issue #5977 was partially fixed
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-02-23 10:01:53 +10:00
Joakim Erdfelt 9c4100af0f
Merge remote-tracking branch 'origin/release-11.0.1' into jetty-11.0.x 2021-02-22 11:19:16 -06:00
Joakim Erdfelt da735fec3d
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-02-22 11:19:07 -06:00
Joakim Erdfelt 9effce7558
Merge remote-tracking branch 'origin/release-10.0.1' into jetty-10.0.x 2021-02-22 11:17:22 -06:00
Joakim Erdfelt 08b4487363
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-02-22 11:16:53 -06:00
Lachlan Roberts 0ca67d5492 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-02-22 21:36:20 +11:00
Lachlan 4d67b30785
Merge pull request #5952 from eclipse/jetty-10.0.x-5828-JavaxWebSocketHttpClient
Issue #5828 - allow HttpClient to be used with JavaxWebSocketClientContainerProvider
2021-02-22 09:41:34 +11:00
Joakim Erdfelt 3f0f57cefc Updating to version 11.0.2-SNAPSHOT 2021-02-19 16:20:48 -06:00
Joakim Erdfelt e98092c179 Updating to version 11.0.1 2021-02-19 16:02:24 -06:00
Joakim Erdfelt 0b4d82db11
Merge pull request #5993 from eclipse/jetty-11.0.x-5992-complete-change-glassfish-jstl
Issue #5992 Change more modules to glassfish-jstl
2021-02-19 15:46:49 -06:00
Jan Bartel 4ff96f6a87 Issue #5992 Change more modules to glassfish-jstl
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-02-19 20:55:49 +01:00
Joakim Erdfelt 8ed8dc62e3 Updating to version 10.0.2-SNAPSHOT 2021-02-19 13:06:42 -06:00
Joakim Erdfelt d0bfd9145d Updating to version 10.0.1 2021-02-19 12:43:50 -06:00
Simone Bordet c7d942fefa Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-19 18:39:53 +01:00
Simone Bordet d425c9722c Improvements to the Jetty documentation.
Restructured the programming guide.
Added collapsible TOC.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-19 18:37:12 +01:00
Simone Bordet a495539f53 Improvements to the Jetty documentation.
Added the custom module section.
Shortened titles to better fit the TOC.
Enlarged content from 62.5em to 80em.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-19 16:50:37 +01:00
Joakim Erdfelt ea2a76ed3b Updating to version 9.4.38-SNAPSHOT 2021-02-19 09:44:28 -06:00
Joakim Erdfelt 27afab2bd3 Updating to version 9.4.37.v20210219 2021-02-19 09:03:57 -06:00
Simone Bordet 80f4254f32 Fixed javadocs referencing javax.servlet.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-19 14:48:21 +01:00
olivier lamy 5c584958da Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-02-19 20:57:16 +10:00
olivier lamy 5fee0123d3 restore file deleted by mistake 40b42c9388
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-02-19 20:56:31 +10:00
Jan Bartel 5d5c8a2f76 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-02-19 10:33:02 +01:00
Jan Bartel 3a32a80b9c
Unify the handling of ServletContainerInitializers (#5959)
* Unify ServletContainerInitializer handling.

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-02-19 10:20:27 +01:00
Lachlan Roberts cee44ff642 JavaxWebSocketClientContainerProvider getContainer should remain protected.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-02-19 19:56:36 +11:00
olivier lamy ecb9254069 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-02-19 09:38:43 +10:00
olivier lamy ddec50eb2e Merge branch 'jetty-9.4.x' into jetty-10.0.x 2021-02-19 09:36:54 +10:00
olivier lamy 0423ad36c1 use jackson-databind 2.9.10.7
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-02-19 09:33:59 +10:00
Joakim Erdfelt 399e64875e
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-02-18 16:09:32 -06:00
Joakim Erdfelt 40b42c9388
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-02-18 16:09:11 -06:00
Joakim Erdfelt bbcae23774
Merge pull request #5494 from eclipse/jetty-9.4.x-5492-java-features-start-properties
Issue #5492 - Adding java.features.* start properties
2021-02-18 16:04:39 -06:00
Joakim Erdfelt 8e5625d143
javax -> jakarta namespace change 2021-02-18 11:46:20 -06:00
Joakim Erdfelt adac033742
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-02-18 11:41:36 -06:00
Joakim Erdfelt 5f93169fcf
Correcting license headers
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-02-18 11:41:19 -06:00
Joakim Erdfelt 98518c96fe
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-02-18 11:39:59 -06:00
Joakim Erdfelt 37b6acb74e
Fixing bad merge
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-02-18 11:39:28 -06:00
Joakim Erdfelt 91cb3c06eb
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-02-18 11:28:39 -06:00
Joakim Erdfelt 7abd46032b
Merge pull request #5947 from eclipse/jetty-9.4.x-dependency-ant-in-antrun
Updating ant version in our maven plugin usages
2021-02-18 11:28:03 -06:00
Joakim Erdfelt f2bed1368b
Issue #5492 - changed from review
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-02-18 11:14:54 -06:00
Joakim Erdfelt 2aa1a68079
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-5492-java-features-start-properties 2021-02-18 10:55:34 -06:00
gregw bb5fefdaeb Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: gregw <gregw@webtide.com>
2021-02-18 17:44:46 +01:00