Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,284 Commits 65 Branches 460 Tags 355 MiB
Commit Graph

23284 Commits

Author SHA1 Message Date
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
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
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
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
Greg Wilkins 324ab668de
More optional etag gzip fixes for #5979 (#5986) 
* More optional etag gzip fixes for #5979

IF no separator defined, do not add a suffix to an etag.
Some cleanup of the implementation.

* More optional etag gzip fixes for #5979

updates from review
 2021-02-18 17:24:16 +01:00
Joakim Erdfelt a5c8fee872
Merge pull request #5976 from eclipse/jetty-9.4.x-new-header-rules 
Adding requested Rewrite Rule to force request header values
 2021-02-18 07:27:59 -06:00
gregw d392174bb6 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-02-18 14:19:00 +01:00
gregw 1113b15110 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-02-18 14:18:31 +01:00
Joakim Erdfelt 10e531756b
Merge pull request from GHSA-m394-8rww-3jr7 
Use comparator based sort
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: gregw <gregw@webtide.com>

Co-authored-by: gregw <gregw@webtide.com>
 2021-02-18 14:14:38 +01:00
olivier lamy b4cc14834b fix compilation 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2021-02-18 14:36:46 +10:00
olivier lamy e90ffbecba Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-02-18 09:52:07 +10:00
olivier lamy 5857496ef2 fix header 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2021-02-18 09:50:14 +10:00
Olivier Lamy 5eb17a0a66 Issue #5977 do not force Cache-Control header if already set (#5978) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2021-02-18 09:40:30 +10:00
Greg Wilkins 71fb369dc5 Fix #5979 by allowing a configurable etag separator. (#5980) 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2021-02-18 09:39:25 +10:00
olivier lamy 1d5662f841 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2021-02-18 07:44:37 +10:00
Olivier Lamy addfbe81c1
Issue #5977 do not force Cache-Control header if already set (#5978) 
* Issue #5977 do not force Cache-Control header if already set

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2021-02-18 07:29:24 +10:00
Greg Wilkins a8b4927427
Fix #5979 by allowing a configurable etag separator. (#5980) 
* Fix #5979 by allowing a configurable etag separator.

Fix #5979 by allowing a configurable etag separator

* updates from review

* Updates from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2021-02-17 22:19:23 +01:00
Simone Bordet 9b28a4a5c9 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-02-17 19:20:23 +01:00
Simone Bordet 938d7d8e88 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-02-17 19:15:09 +01:00
gregw 97ee0fd527 fixed bad merge 2021-02-17 18:49:37 +01:00
Jan Bartel c3de369a41 Update to Apache Jasper 10.0.2 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2021-02-17 18:39:47 +01:00
Simone Bordet 70d6724d93
Merge pull request #5974 from eclipse/jetty-9.4.x-5973-proxy_client_tls_auth_example 
Fixes #5973 - Proxy client TLS authentication example.
 2021-02-17 18:32:35 +01:00
gregw 349b89d7e4 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: gregw <gregw@webtide.com>
 2021-02-17 18:11:02 +01:00
gregw ea3f3a5b93 Update merge to 10 comment 2021-02-17 18:09:37 +01:00
Greg Wilkins ad6fc62bb5
Cleanup setPathQuery from #5954 (#5981) 
Cleanup setPathQuery from #5954 so that it does not retain an old query if the passed string does not contain a query
 2021-02-17 18:05:12 +01:00
Simone Bordet 19319766ce Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-02-17 17:55:16 +01:00