Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,067 Commits 67 Branches 465 Tags 359 MiB
Commit Graph

2460 Commits

Author SHA1 Message Date
gregw 1768bd898f Fix #5739 Remove distribution from doco 
Mostly mechanical fixes
 2020-12-02 09:16:29 +01:00
Lachlan Roberts b26cda59d9 fix locations of some jmh benchmarks 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-12-01 15:56:23 +11:00
gregw 1333bbc55c Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-30 17:35:56 +01:00
gregw 69b3c37717 remove test rather than disable 
Signed-off-by: gregw <gregw@webtide.com>
 2020-11-30 17:35:37 +01:00
gregw 20f6dc1ace Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-30 17:33:21 +01:00
gregw 7e9b050050 disable test accidentally added for #5737 
Signed-off-by: gregw <gregw@webtide.com>
 2020-11-30 17:23:10 +01:00
Jan Bartel 7b77a532a8 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-30 14:42:18 +01:00
gregw b4e2ad0df7 added CVE 
Signed-off-by: gregw <gregw@webtide.com>
 2020-11-30 14:23:45 +01:00
Jan Bartel 5ad130515f
Issue #5713 Remove dependency on derby (#5728) 
* Issue #5713 Remove dependency on derby

Signed-off-by: Jan Bartel <janb@webtide.com>

* use the mariadb client version from the property

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

Co-authored-by: olivier lamy <oliver.lamy@gmail.com>
 2020-11-30 14:22:50 +01:00
Simone Bordet 8c465ac76d Fixed tests and code after merge of #5310 from 9.4.x. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-11-27 13:53:06 +01:00
Joakim Erdfelt fe0a4f624e
Merge remote-tracking branch 'origin/release-9.4.35' into jetty-9.4.x 2020-11-25 15:56:09 -06:00
dependabot[bot] 36d7a90930
Bump geronimo-atinject_1.0_spec from 1.1 to 1.2 (#5666) 
Bumps geronimo-atinject_1.0_spec from 1.1 to 1.2.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-25 10:58:07 +01:00
gregw 0a70cba8ae Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: gregw <gregw@webtide.com>
 2020-11-24 18:36:24 +01:00
Greg Wilkins 9f82ca0a80
Use File.list and File.walk within a try with resource (#5718) 
* Use File.list and File.walk within a try with resource

The API contract of File.list and File.walk requires them to be closed after use.

* Fix from review

Left out filter

* Fix from review

Factored out deleteFile with better debug

* Fix from review

Can delete files whilst walking

* Fix from review

Restored sweepFile
fixed minor code suggestions
 2020-11-24 18:12:42 +01:00
olivier lamy ba7d1b6377 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-11-24 09:42:14 +10:00
Olivier Lamy 429bec57a4
Issue #5644 Remove all profiles for session tests (#5703) 
* remote session tests are now executed per default, new profile to exclude then no-remote-session-tests

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* remove this no-remote-session-tests profile just use skipTests to skip that

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-11-24 09:38:30 +10:00
Joakim Erdfelt e8683cba9f Updating to version 9.4.36-SNAPSHOT 2020-11-20 16:05:27 -06:00
Joakim Erdfelt bdc54f03a5 Updating to version 9.4.35.v20201120 2020-11-20 15:05:50 -06:00
Simone Bordet 8edb5cfc24 Issue #5691 - HttpInput may skip setting fill interest. 
Code cleanups and logging improvements.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-11-20 16:50:24 +01:00
Simone Bordet 7726c2ebcb Code cleanup to fix checkstyle issue. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-11-19 17:34:20 +01:00
Joakim Erdfelt 901a17d197
Issue #5605 - Adding more comments 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-11-19 10:24:36 -06:00
Joakim Erdfelt a6d432e9e3
Issue #5605 - Adding more comments and fixing logging 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-11-19 10:19:31 -06:00
Simone Bordet 88c03ac1dc Issue #5605 - java.io.IOException: unconsumed input during http request parsing. 
Fixed test after merge.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-11-19 16:47:36 +01:00
Simone Bordet d4feb4f29d Removed unused code. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-11-19 16:08:31 +01:00
Simone Bordet 3a44648e46 Code cleanup. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-11-19 15:21:58 +01:00
olivier lamy 8eb9522775 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-11-19 21:36:37 +10:00
Joakim Erdfelt 5f6e72d2ed
Issue #5605 - Adding more gzip consume all tests 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-11-18 11:42:40 -06:00
gregw f37ad023a8 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: gregw <gregw@webtide.com>
 2020-11-18 11:20:48 +01:00
Greg Wilkins 14f94f738d
Issue #5605 unconsumed input on sendError (#5637) 
* Issue #5605 unconsumed input on sendError

Add Connection:close if content can't be consumed during a sendError. Processed after the request has returned to the container.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Update from review

 + Add close on all uncommitted requests when content cannot be consumed.

* Update from review

 + fixed comment
 + space comma

* Only consume input in COMPLETE if response is >=200 (ie not an upgrade or similar)

* Updated to be less adventurous

I do not think it was valid to always consumeAll in COMPLETE as this could break upgrades with both 101s and 200s
Instead I have reverted to having this consumeAll logic only:
 + in sendError once control has passed back to the container and we are about to generate an error page.
 + in front of all the sendRedirection that we do without calling the application first.

Extra tests also added

* Updated to be less adventurous

reverted test

* Testcase for odd sendError(400) issue.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

* Fix for odd sendError(400) issue.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

* Testcase for odd sendError(400) issue.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

* Always try to consumeAll on all requests

* Refinements after testing in 10

* Refinements after testing in 10

Fixed test

* Fixed comment from review

* Updates from review

+ added redirect methods that consumeAll
+ ensureContentConsumedOrConnectionClose renamed to ensureConsumeAllOrNotPersistent
+ ensureConsumeAllOrNotPersistent now handles HTTP/1.0 and HTTP/1.1 differently

* better consumeAll implementation

* update from review

 + better javadoc
 + filter out keep-alive
 + added more tests

* update from review

 + better javadoc

* update from review

 + fixed form redirection test for http 1.0 and 1.1

* update from review

 + HttpGenerator removes keep-alive if close present
 + Use isRedirection

Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
 2020-11-18 10:40:05 +01:00
Joakim Erdfelt e9c6c942ea
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-17 09:12:50 -06:00
Joakim Erdfelt 1448444c65
Merge pull request #5560 from eclipse/jetty-9.4.x-5539-statisticsservlet-output 
Issue #5539 - Proper StatisticsServlet output format via content negotiation
 2020-11-17 08:52:34 -06:00
Jan Bartel ac6444f6ff
Issue #5272 Clean up LoginServices and LoginModules (#5641) 
* Issue #5272 Clean up LoginServices and LoginModules

Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-11-17 15:40:12 +01:00
olivier lamy 8dd980d256 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-11-17 16:32:07 +10:00
Olivier Lamy 48b89f9394
use @Testcontainers to disable test if docker not available (#5678) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-11-17 16:20:16 +10:00
olivier lamy 35ace7787b Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-11-17 12:02:31 +10:00
Olivier Lamy 213ac63d2c
Enable gcloud testing in docker (#5651) 
* Enable "gcloud" profile for gcloud session testing.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

* use docker image as google datastore

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* fix project id

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* all tests pass here

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* do not trim stack trace

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* Try distinguishing between localhost and non-localhost

Signed-off-by: Jan Bartel <janb@webtide.com>

* add some debug

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* remove non needed pom content

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

Co-authored-by: Jan Bartel <janb@webtide.com>
 2020-11-17 11:13:22 +10:00
Joakim Erdfelt 314c65fb14
Issue #5539 - Adding StatisticsServlet tests in test-distribution 
+ Updating module definition for JSON

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-11-16 12:31:28 -06:00
Joakim Erdfelt d3f275ad4b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-16 09:58:46 -06:00
Joakim Erdfelt 7f86f5e9ad
Merge pull request #5663 from eclipse/dependabot/maven/jetty-9.4.x/openwebbeans.version-2.0.20 
Bump openwebbeans.version from 2.0.19 to 2.0.20
 2020-11-16 09:58:24 -06:00
Simone Bordet 36d8289dee Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-11-16 16:39:53 +01:00
dependabot[bot] 991e23d80b
Bump openwebbeans.version from 2.0.19 to 2.0.20 
Bumps `openwebbeans.version` from 2.0.19 to 2.0.20.

Updates `openwebbeans-web` from 2.0.19 to 2.0.20
- [Release notes](https://github.com/apache/openwebbeans/releases)
- [Commits](https://github.com/apache/openwebbeans/commits/openwebbeans-2.0.20)

Updates `openwebbeans-jetty9` from 2.0.19 to 2.0.20
- [Release notes](https://github.com/apache/openwebbeans/releases)
- [Commits](https://github.com/apache/openwebbeans/commits/openwebbeans-2.0.20)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-16 14:05:10 +00:00
Lachlan Roberts 8ff545f696 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5320-WebSocketHttpClient2 2020-11-12 09:42:48 +11:00
Simone Bordet a308881fab Fixes #5633 - Allow to configure HttpClient request authority. 
Introduced HttpDestination.send(Request, Response.CompleteListener) to send a request using the given destination.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-11-11 17:13:00 +01:00
Lachlan 23f75a395b
Merge pull request #5599 from eclipse/jetty-9.4.x-XML-Review 
Fixes to XML formatting and comments.
 2020-11-11 13:55:26 +11:00
Joakim Erdfelt 9e22260377
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-10 12:12:39 -06:00
Joakim Erdfelt 21c27f6370
Fixing checkstyle violations 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-11-10 06:33:04 -06:00
dependabot[bot] 949a89c15b
Bump geronimo-interceptor_1.2_spec from 1.1 to 1.2 (#5632) 
Bumps geronimo-interceptor_1.2_spec from 1.1 to 1.2.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-10 16:34:46 +10:00
dependabot[bot] deef0b4e30
Bump geronimo-jcdi_2.0_spec from 1.1 to 1.3 (#5607) 
Bumps geronimo-jcdi_2.0_spec from 1.1 to 1.3.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-10 14:26:52 +10:00
Lachlan Roberts bd553d98e5 fixing badly formatted XML comments 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-09 23:51:35 +11:00
Lachlan Roberts 4c172b5bbb Fix xml <Ref/> tags using id instead of refid. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-09 23:30:36 +11:00
Lachlan Roberts 80a824854b Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5320-WebSocketHttpClient2 2020-11-09 15:17:22 +11:00
Joakim Erdfelt e59b7c2750
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-04 13:24:50 -06:00
Joakim Erdfelt 2fd895a6dc
Merge pull request #5570 from eclipse/dependency/jetty-9.4.x/org.infinispan.protostream-protostream-4.3.4.Final 
Bump protostream from 4.2.2.Final to 4.3.4.Final
 2020-11-04 13:19:52 -06:00
Joakim Erdfelt 71ad5447a4
Merge remote-tracking branch 'origin/release-9.4.34' into jetty-9.4.x 2020-11-04 10:24:21 -06:00
Joakim Erdfelt 4f8707390e
Adding required gson dependency to test-infinispan-sessions 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-11-04 10:09:15 -06:00
Lachlan Roberts 416579a690 fix formatting in DistributionTests 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-04 22:24:19 +11:00
Lachlan Roberts fc4e263f93 Add module and configuration for websocket-client provided to webapp. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-04 22:22:13 +11:00
Joakim Erdfelt 2c43fbf37b
Bump protostream from 4.2.2.Final to 4.3.4.Final 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-11-03 14:08:58 -06:00
Ludovic Orban 814dc69803 Get rid of addContent() by making produceContent() return Content instead. 
Make EOF and errors be special content.
Transition to a much simplified FSM by using the needContent() / produceContent() model.
Implement blocking on top of async, this way there is only one FSM.
(Milestone 6)

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2020-11-03 17:30:25 +01:00
Ludovic Orban a4258ec9c0 Merge all HttpInput* impls into a single class, push all differences to HttpChannel* impls (Milestone 5) 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2020-11-03 17:30:25 +01:00
Joakim Erdfelt 40bde46b13
Bump maven-antrun-plugin from 1.8 to 3.0.0 
+ and update configuration/task to configuration/target

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-11-03 08:46:27 -06:00
Joakim Erdfelt 167eded4cf
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-03 08:33:33 -06:00
Joakim Erdfelt ba577ba972
Merge pull request #5508 from eclipse/dependabot/maven/jetty-9.4.x/org.mariadb.jdbc-mariadb-java-client-2.7.0 
Bump mariadb-java-client from 2.6.0 to 2.7.0
 2020-11-03 07:44:56 -06:00
Lachlan Roberts 8d21bb7b63 Issue #5320 - fix the XmlHttpClientProvider for jetty 10, re-enable tests 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-03 17:17:27 +11:00
Joakim Erdfelt edaadff55b Updating to version 9.4.35-SNAPSHOT 2020-11-02 09:04:51 -06:00
Lachlan Roberts 1b5747cbbe Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-03 01:17:31 +11:00
Joakim Erdfelt e46af88704 Updating to version 9.4.34.v20201102 2020-11-02 08:03:51 -06:00
Lachlan 12f3c450dc
Merge pull request #5374 from eclipse/jetty-9.4.x-5320-WebSocketHttpClient 
Issue #5320 - using jetty-websocket-httpclient.xml within webapp
 2020-11-03 00:30:09 +11:00
Lachlan Roberts 60c56d8856 changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-02 23:43:42 +11:00
Simone Bordet 40fd98d6a9 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-11-02 10:47:03 +01:00
Simone Bordet a1b3d3319d
Merge pull request #5491 from eclipse/jetty-9.4.x-5488-jetty-dir.css 
Fixes #5488 - jetty-dir.css not found when using JPMS.
 2020-11-02 10:40:19 +01:00
dependabot[bot] 40acf60936
Bump geronimo-annotation_1.3_spec from 1.1 to 1.3 (#5552) 
Bumps geronimo-annotation_1.3_spec from 1.1 to 1.3.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-02 19:31:04 +10:00
dependabot[bot] e70e995f0c
Bump openwebbeans.version from 2.0.18 to 2.0.19 (#5551) 
Bumps `openwebbeans.version` from 2.0.18 to 2.0.19.

Updates `openwebbeans-web` from 2.0.18 to 2.0.19
- [Release notes](https://github.com/apache/openwebbeans/releases)
- [Commits](https://github.com/apache/openwebbeans/commits)

Updates `openwebbeans-jetty9` from 2.0.18 to 2.0.19
- [Release notes](https://github.com/apache/openwebbeans/releases)
- [Commits](https://github.com/apache/openwebbeans/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-02 19:30:29 +10:00
dependabot[bot] 2f295c126f
Bump mariadb-java-client from 2.6.0 to 2.7.0 
Bumps [mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 2.6.0 to 2.7.0.
- [Release notes](https://github.com/mariadb-corporation/mariadb-connector-j/releases)
- [Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mariadb-corporation/mariadb-connector-j/compare/2.6.0...2.7.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-30 18:18:43 +00:00
Lachlan Roberts 59883af8bf update version to 9.4.34-SNAPSHOT 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-30 15:00:38 +11:00
Lachlan Roberts 3c3fcc311e Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-5320-WebSocketHttpClient 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-30 12:43:31 +11:00
Joakim Erdfelt 1ad6ebabb6
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-28 15:45:50 -05:00
Joakim Erdfelt 3b8e7c143d
Bump maven.resolver.version from 1.3.1 to 1.6.1 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-28 13:31:42 -05:00
dependabot[bot] 0342bf517e
Bump geronimo-jcdi_2.0_spec from 1.2 to 1.3 
Bumps geronimo-jcdi_2.0_spec from 1.2 to 1.3.

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-26 06:23:26 +00:00
Simone Bordet 4a4a73df2e Fixes #5488 - jetty-dir.css not found when using JPMS. 
Moved jetty-dir.css from jetty-util to jetty-server,
so that it can be found by ResourceHandler when using JPMS.

Updated DefaultServlet to call a ResourceHandler method
to retrieve the stylesheet.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-10-22 16:48:27 +02:00
Joakim Erdfelt e726eefb0b Updating to version 9.4.34-SNAPSHOT 2020-10-20 18:55:39 -05:00
Joakim Erdfelt 1be6875565 Updating to version 9.4.33.v20201020 2020-10-20 18:28:51 -05:00
dependabot[bot] 5eeae2ad5c
Bump jsp-api from 2.1 to 2.2 (#5462) 
Bumps jsp-api from 2.1 to 2.2.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-10-19 20:42:15 +10:00
Joakim Erdfelt 1e9c736692
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-16 17:51:32 -05:00
Joakim Erdfelt e6fb4c3ac4 More fixes to allow project to build on Windows 10 2020-10-16 16:45:25 -05:00
Joakim Erdfelt e12c3ce50b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-16 08:11:42 -05:00
Joakim Erdfelt 369940c8b6
Issue #5451 - Proper use of WorkDir 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-16 06:43:12 -05:00
Lachlan c95fc2a3dc
Merge pull request #5295 from eclipse/jetty-10.0.x-5287-CompressionPool 
Issue #5287 - rework CompressionPool to use the jetty-util pool
 2020-10-16 17:12:36 +11:00
Lachlan Roberts 5800f4605f Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-16 15:37:24 +11:00
olivier lamy 6f98b136cf fix tests 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-10-16 13:46:08 +10:00
Joakim Erdfelt fdd880b66b
Issue #5451 - Cleanup of temp file cleanup. 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-15 18:10:38 -05:00
Joakim Erdfelt 9ad6beb805
Merge pull request from GHSA-g3wg-6mcf-8jj6 2020-10-16 01:06:08 +02:00
Lachlan Roberts 4cb475c97d Issue #5320 - also test WebSocketClient on server from WEB-INF/lib 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-15 16:15:57 +11:00
Lachlan Roberts 6cd70ce136 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-5320-WebSocketHttpClient 2020-10-15 14:12:21 +11:00
Lachlan Roberts 608a895aab Issue #5287 - make default CompressionPool capacity 1024 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-14 22:28:26 +11:00
Lachlan Roberts ef816fcc42 DeflaterPoolBenchmark should manage lifecycle of the CompressionPool 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-14 22:28:26 +11:00
Lachlan Roberts 21576f2312 Issue #5287 - fix usages of new CompressionPool 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-14 22:28:26 +11:00
Lachlan Roberts 26f4062d93 Parameterize testWebsocketClientInWebapp over both http and https 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-14 16:35:58 +11:00
Simone Bordet 1cd15e8d85
Fixes #5379 - Better handling for wrong SNI. (#5398) 
* Fixes #5379 - Better handling for wrong SNI.

Reworked the SNI logic.
Added support for IP addresses in the SAN extension of certificates in the X509 class.
Fixed keystores to have CN=localhost and SAN with ip=127.0.0.1 and ip=[::1].
Fixed tests that were not using the correct Host header.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-10-12 15:48:53 +02:00
Joakim Erdfelt dfa076fdb5
Merge pull request #5403 from eclipse/jetty-10.0.x-5401-move-httptester 
Move HttpTester to jetty-http
 2020-10-12 06:14:44 -05:00
dependabot[bot] 2919d565db
Bump geronimo-jcdi_2.0_spec from 1.1 to 1.2 
Bumps geronimo-jcdi_2.0_spec from 1.1 to 1.2.

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-12 06:22:46 +00:00
Joakim Erdfelt fc45286bab
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-09 13:36:42 -05:00
Joakim Erdfelt 72c5ed0ff7
Bumping gcloud from 1.0.0 to 1.105.0 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-08 14:59:34 -05:00
Joakim Erdfelt 345484929c
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-08 08:53:15 -05:00
Joakim Erdfelt c2655295ac
Eliminating no-longer relevant comment 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-08 08:50:37 -05:00
Joakim Erdfelt fe03a3e6c2
Bump OpenWebBeans from 2.0.11 to 2.0.18 
+ Brings in ServletContainerInitializer fix from 2.0.12

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-08 07:31:20 -05:00
Joakim Erdfelt 857e888e8b
Issue #5401 - Move HttpTester to jetty-http 
+ leaving jetty-http-tools alone

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-07 14:50:31 -05:00
Jan Bartel 6ddbec3c62
Issue #5394 Fix injection for quickstart (#5396) 
* Issue #5394 Fix injection for quickstart

Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-10-06 13:43:41 +02:00
Joakim Erdfelt 76eac0eeee
Merge pull request #5389 from eclipse/dependabot/maven/jetty-10.0.x/org.apache.geronimo.specs-geronimo-atinject_1.0_spec-1.2 
Bump geronimo-atinject_1.0_spec from 1.1 to 1.2
 2020-10-05 05:36:53 -05:00
dependabot[bot] 47c2f060eb
Bump javax.servlet-api from 3.1.0 to 4.0.1 
Bumps [javax.servlet-api](https://github.com/javaee/servlet-spec) from 3.1.0 to 4.0.1.
- [Release notes](https://github.com/javaee/servlet-spec/releases)
- [Commits](https://github.com/javaee/servlet-spec/compare/3.1.0...4.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-05 06:25:42 +00:00
dependabot[bot] d987a0d94d
Bump geronimo-atinject_1.0_spec from 1.1 to 1.2 
Bumps geronimo-atinject_1.0_spec from 1.1 to 1.2.

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-05 06:25:38 +00:00
Lachlan Roberts 27a0879798 dont run WebsocketClientInWebapp test with JPMS 2020-10-02 15:39:49 +10:00
Lachlan Roberts 5b96f6f984 Issue #5320 - Run jetty-websocket-httpclient.xml with server class access. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-01 12:38:17 +10:00
Joakim Erdfelt 85e257fc98 Updating to version 9.4.33-SNAPSHOT 2020-09-30 11:53:09 -05:00
Joakim Erdfelt de97d26f7b Updating to version 9.4.32.v20200930 2020-09-30 11:03:24 -05:00
Joakim Erdfelt 1233ae108e
Fixing bad html links 2020-09-30 09:23:35 -05:00
Lachlan Roberts 00f05cb94e Issue #5320 - reproduce failure to load httpClient for WebSocketClient in webapp 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-09-30 15:11:05 +10:00
Joakim Erdfelt b22ce9c044
Reorg of /demos/ with focus on demo-spec downstream dependencies. (#5367) 
* Reorg of /demos/ with focus on spec modules
* Reworking demo-mock-resources into /demos/ proper
* Removing old /tests/ modules that no longer have a reason for existing.
* Making demo-mock-resources a formal module
* demo-jndi and demo-spec now depend on it
* Restoring jetty-maven-plugin config lost in demo-jetty-webapp
* Fixing jetty-maven-plugin realm usage to be local

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-29 11:37:22 -05:00
Joakim Erdfelt ad2446dd6c
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-29 11:24:28 -05:00
Joakim Erdfelt 3423375a97
Issue #5357 - Updating to https://eclipse.org/ (#5358) 
* Issue #5357 - Updating to https://eclipse.org/

 - Removing redundant <url> refs in pom.xml
 - Correcting bad indenting from merge
 - Correcting mailing list references
 - Correcting bugs.eclipse.org references
 - Correcting text file references
 - Correcting html references
 - Correcting further references
 - Correcting download.eclipse.org reference
 - Adding test for demo-base /proxy/current/
 - Ensuring jetty-client is included in javadoc-proxy.war/WEB-INF/lib

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-29 11:02:32 -05:00
Joakim Erdfelt 61eab91437
Correcting upperbounds enforcer rule check on jetty-http-tools 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-29 03:27:13 -05:00
Joakim Erdfelt 9e54e9a081
Post merge cleanup. 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-28 18:04:20 -05:00
Joakim Erdfelt 3c7cd43148
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-28 17:55:41 -05:00
Joakim Erdfelt 8b1fcf0b58
Issue #5362 - Adding SslContextFactory.Client to Proxy's HttpClient (#5363) 
- ProxyServletTest additions for server backend TLS
 - Updating test-proxy-webapp testing
 - Better class name for test
 - More documentation on purpose of test.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-28 17:39:59 -05:00
Joakim Erdfelt 8a524a6bf9
Cleaning up junit dep issues in session tests. 
+ Enforcer mandates common version of junit-jupiter,
  but the org.testcontainers:testcontainers brings in
  an older version.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-28 13:48:46 -05:00
Joakim Erdfelt e879c1fcea
Cleaning up junit dep issues in session tests. 
+ Enforcer mandated

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-28 12:44:32 -05:00
Joakim Erdfelt b9112ce631
Moving jetty-cdi tests to /tests/test-cdi to avoid jpms testing hell 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-28 09:08:35 -05:00
Joakim Erdfelt 2942b9ea74
Minor updates for demo-base 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-28 09:06:27 -05:00
Joakim Erdfelt b56733915b
Issue #5264 - identifying optional deps in jetty-home 
+ Done to ease dependency / exclusions listing requirements
   elsewhere in the reactor.
   (Prevents accidental discovered components from
    triggering actions during use of jetty-home
    as a dependency)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-23 17:50:50 -05:00
Joakim Erdfelt 9a2d6cd597
Issue #5264 - Adding HostHeaderCustomizer to H2/H2C Transport tests 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-23 17:03:44 -05:00
Joakim Erdfelt c9be742d70
Issue #5264 - Fixing test-integration references to demos 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-23 16:44:17 -05:00
Joakim Erdfelt ad805d4756
Issue #5264 - More post move to /demos/ updates 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-23 15:38:34 -05:00
Joakim Erdfelt faf6d80390
Issue #5264 - Moving demo webapps to /demos/ tree 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-23 13:35:19 -05:00
Greg Wilkins 5654437cc9 demo-jaas does not depend on demo-jndi 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2020-09-23 19:31:24 +02:00
Greg Wilkins 5332f3f685 demo-jaas depends on jaas 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2020-09-23 19:10:42 +02:00
Greg Wilkins eedcac314b Merge branch 'jetty-10.0.x' into jetty-10.0.x-5264-demo-modules 2020-09-23 15:27:56 +02:00
Joakim Erdfelt be07e84cd7
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-22 09:15:59 -05:00
Joakim Erdfelt a99a832206
Issue #5137 - Cleanup of WebAppContextTest 
+ Cleanup of test-servlet-spec webapp
+ Removing unused methods
+ Commented System.err.println moved to java.util.logging
+ General checkstyle cleanup (empty lines, spacing, etc)
+ Eliminate bogus WebApp LIB ordering tests.
+ No ClassLoader has a order guarantee.
+ Moving HttpSessionListenerTest contents to existing SessionListenerTest
+ Cleanup of SessionListenerTest with eye to resource cleanup
+ Removing ServletContextListenerTest as it duplicates tests
+ Restoring WebAppClassLoaderTest test method
+ `ordering()` is now `testClashingResource()` and properly
  tests assumptions when dealing with a ClassLoader.
  The old test assumed guaranteed order from a ClassLoader,
  which is not a feature of any Java ClassLoader.
  Especially so for URLClassLoader.
+ Restoring clashing resource test

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-22 08:46:11 -05:00
Greg Wilkins d1f6cbb9da added jndi and jaas dependencies 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2020-09-22 13:28:10 +02:00
Greg Wilkins 3768b09d6f added jstl 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2020-09-22 13:07:14 +02:00
Joakim Erdfelt 770f251cbb
Issue #5264 - Fixing demo-jndi deps for javax.mail 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-21 16:48:50 -05:00
Joakim Erdfelt c002305cb2
Issue #5264 - Fixing demo-jndi config 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-21 15:53:45 -05:00
Joakim Erdfelt 533d64cda1
Issue #5264 - Fixing deploy status on demo webapps 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-21 14:47:31 -05:00
Joakim Erdfelt 8a64309cdf
Issue #5264 - Reworking demo/tests into modules based on config classifiers 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-21 13:57:23 -05:00
Joakim Erdfelt 4ecff26022
Issue #5264 - Reworking test-distribution to use jetty-home 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-21 13:56:34 -05:00
dependabot[bot] 3dae15dc5a
Bump mariadb-java-client from 2.6.0 to 2.6.2 (#5302) 
Bumps [mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 2.6.0 to 2.6.2.
- [Release notes](https://github.com/mariadb-corporation/mariadb-connector-j/releases)
- [Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mariadb-corporation/mariadb-connector-j/compare/2.6.0...2.6.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-21 13:23:20 +02:00
Olivier Lamy eaf07dd4cc
fix get sessionId from fileName (#5288) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-09-17 18:03:52 +10:00
gregw afe5044d8c Fixes #5281 
Added work module to create work directory
reviewed by janbartel
 2020-09-16 16:20:16 +02:00
gregw 3bb419842d Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: gregw <gregw@webtide.com>
 2020-09-15 12:04:02 +02:00
Jan Bartel e23eaa26b9 Fix FileSessionDataStoreTest.testCleanOrphans 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-09-15 11:02:01 +02:00