Commit Graph

22258 Commits

Author SHA1 Message Date
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 2c94cf0cd2 fix javadoc
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-17 16:18:04 +10:00
olivier lamy 0a9bbcbaff fix Jenkinsfile
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-17 14:20:49 +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
Joakim Erdfelt 683d9a9349
Issue #5539 - Updating StatisticsServlet accept processing per review
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-16 09:10:24 -06:00
Joakim Erdfelt 770be2dbc3
Issue #5539 - Adding jetty-util-ajax missing dep to osgi tests
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-16 09:10:23 -06:00
Joakim Erdfelt fd974c474c
Fixing bad Container Include Jar pattern.
+ It was matching on jetty-util-ajax-#.jar as well.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-16 09:10:23 -06:00
Joakim Erdfelt c9440357a7
Issue #5539 - Fixing javadoc
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-16 09:10:23 -06:00
Joakim Erdfelt c511275580
Provide more detail in test failure on CI
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-16 09:10:22 -06:00
Joakim Erdfelt cc952f3a3a
Issue #5539 - Adding query parameter accept variation
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-16 09:10:22 -06:00
Joakim Erdfelt b419db90c5
Issue #5539 - Cleanup, adding javadoc, etc.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-16 09:10:21 -06:00
Joakim Erdfelt 02f35deeaa
Issue #5539 - Deprecating 'xml' request parameter in StatisticsServlet
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-16 09:10:21 -06:00
Joakim Erdfelt 5362467e67
Issue #5539 - Proper StatisticsServlet output format via content negotiation
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-16 09:10:21 -06:00
Simone Bordet 3cbd117ec9
Merge pull request #5640 from eclipse/jetty-9.4.x-5633-httpclient_configure_authority
Fixes #5633 - Allow to configure HttpClient request authority.
2020-11-16 15:41:42 +01:00
Joakim Erdfelt 1daac1adbc
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-16 08:28:09 -06:00
Joakim Erdfelt 205676fd99
Merge pull request #5572 from eclipse/jetty-9.4.x-compact3-clean
Correcting compact3 jar contents to only include org.eclipse.jetty
2020-11-16 08:27:40 -06: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
gregw 3508fdc955 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: gregw <gregw@webtide.com>
2020-11-16 11:56:13 +01:00
Greg Wilkins 850a0330ff
Cleanup request/response recycle #4711 (#5643)
* Cleanup request/response recycle #4711

Reordered recycle in request and response to field order so that we can check that all fields are recycled.

* Fixed ordering of reader consumption

* update from review
2020-11-16 11:48:33 +01:00
Lachlan b2bd86701c
Merge pull request #5638 from eclipse/jetty-10.0.x-AutobahnDocker
Run websocket autobahn-testsuite with docker in junit test
2020-11-16 16:10:24 +11:00
Lachlan Roberts 3b22c6bc66 fix broken test: AltFilterTest
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-16 15:57:28 +11:00
olivier lamy a5cf5c0e86 restore -Dmaven.test.failure.ignore=true
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-14 18:53:31 +10:00
olivier lamy 041b5c8712 keep -fae
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-14 15:44:46 +10:00
olivier lamy 48c8db6316 pool scm daily
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-14 14:17:13 +10:00
olivier lamy 8a1130bc41 simpify autobahn build
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-14 14:15:39 +10:00
olivier lamy 9786bc4c98 add Jenkinsfile for autobahn build
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-14 14:10:44 +10:00
olivier lamy 3e09b86903 should exclude autobahn test per default
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-14 13:04:19 +10:00
Lachlan Roberts 6dad0b1b7e rename WebSocketMapping to WebSocketMappings
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-14 10:46:09 +11:00
Lachlan Roberts 165beff3f3 add test for multiple WebSocketUpgradeFilters
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-14 10:43:14 +11:00
Jan Bartel 1245df26a4 Log failure to delete session file.
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-11-13 12:46:15 +01:00
Lachlan Roberts 0493a11106 Use Filter name to identify the WebSocketUpgradeFilter.
Don't allow configuration of WebSocketMapping attribute.
The WebSocketUpgradeFilter is identified by it's name, which must be set as the fully qualified class name.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-13 22:06:20 +11:00
olivier lamy 26f1e0b723 use autobahn to not run it per default
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-13 15:24:27 +10:00
gregw 8884575f85 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: gregw <gregw@webtide.com>
2020-11-12 17:17:55 +01:00
Greg Wilkins f4c32e788a
Fix #5562 Improve HTTP Field cache allocation (#5565)
* Fix #5562 Improve HTTP Field cache allocation

Fix #5562 by initially putting cacheable fields into a inexpensive arraylist.
Only create the Trie (with space and complexity costs) if a second request is received.

* Fixed NPE

* Feedback from review

Create `HttpHeader.isPseudo()`` method
improved clarity with `createFieldCacheIfNeeded()``

* Feedback from review

Only defer Trie creation to first cacheable field, not until next request.

* Updates from review

* Update from review

 + more javadoc
 + empty set return
2020-11-12 17:05:32 +01:00
Lachlan 859cf6cd1c
Merge pull request #5563 from eclipse/jetty-10.0.x-5320-WebSocketHttpClient2
Issue #5320 - using jetty-websocket-httpclient.xml within webapp Jetty 10
2020-11-12 10:52:46 +11:00
Lachlan Roberts a4160c4b5e Fix javadoc on websocket configuration classes.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-12 09:47:38 +11: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
Chris Walker f3278c1e81
Fixing link for secuirty reports in #5642 2020-11-11 14:24:55 -06:00
Chris Walker d93fb0880b Merge branch 'jetty-9.4.x' into jetty-10.0.x
# Conflicts:
#	jetty-documentation/src/main/asciidoc/reference/troubleshooting/security-reports.adoc
2020-11-11 14:22:04 -06:00
Chris Walker 3660e38148
Fixes broken link to security reports. Resolves #5642 2020-11-11 14:18:50 -06:00
Joakim Erdfelt 5f2e8af9f2
Merge branch 'jetty-10.0.x' of github.com:eclipse/jetty.project into jetty-10.0.x 2020-11-11 12:46:04 -06:00
Joakim Erdfelt 00db5cea6e
Fixing jetty-jaas by not using apacheds-all
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-11 12:45:52 -06:00
Jan Bartel 0514fd5288 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-11 19:24:45 +01:00
Jan Bartel 3a99c89350
Issue #5486 PropertyFileLoginModule retains PropertyUserStores (#5518)
* Issue #5486 PropertyFileLoginModule retains PropertyUserStores

Signed-off-by: Jan Bartel <janb@webtide.com>
2020-11-11 18:21:06 +01:00
gregw dd86adad66 Fixed file header 2020-11-11 18:18:50 +01:00