Commit Graph

3713 Commits

Author SHA1 Message Date
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
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 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
Lachlan Roberts cee44ff642 JavaxWebSocketClientContainerProvider getContainer should remain protected.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-02-19 19:56:36 +11:00
Joakim Erdfelt d6ec96fe1b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-02-15 14:18:08 -06:00
Joakim Erdfelt 5dd987779c
Adding `WhitespaceAfter` checkstyle rule.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-02-15 12:48:24 -06:00
Lachlan Roberts b69f470304 Issue #5828 - only use the HttpClient constructor for JavaxWebSocketClientContainer
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-02-15 15:32:18 +11:00
Lachlan Roberts 0e4ed5c7b1 Issue #5828 - cleanups from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-02-15 15:13:02 +11:00
Lachlan 2549df99ce
Merge pull request #5935 from eclipse/jetty-10.0.x-5868-WSUpgradeRequestResponse
Issue #5868 - allow request attributes to be set in websocket upgrade
2021-02-10 10:56:18 +11:00
Lachlan Roberts 1dc98b611e Issue #5868 - changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-02-09 10:56:31 +11:00
Lachlan Roberts 805d6efedd Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5828-JavaxWebSocketHttpClient 2021-02-08 17:54:49 +11:00
Lachlan Roberts 8bc84d3119 Issue #4515 - ValidationExtension should not downcast CoreSession
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-02-08 16:14:38 +11: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
Joakim Erdfelt e81c847998
Happy New Year 2021 (Jetty 10 edition)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-21 15:05:57 -06:00
Joakim Erdfelt 176e29e408
Happy New Year 2021
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-21 12:31:00 -06:00
Lachlan f2cde85390
Merge pull request #5874 from eclipse/jetty-10.0.x-5866-WebSocketProgrammaticUpgrade
Issue #5866 - allow WebSocket programmatic upgrades
2021-01-20 16:07:07 +11:00
Lachlan 759805580b
Merge pull request #5860 from eclipse/jetty-9.4.x-5851-WebSocketServletCleanup
Issue #5851 - remove WebSocketServletFactory as ServletContext attribute on destroy
2021-01-20 15:50:48 +11:00
Joakim Erdfelt 2e53ec5384 Updating to version 9.4.37-SNAPSHOT 2021-01-14 11:27:24 -06:00
Joakim Erdfelt 238ec6997c Updating to version 9.4.36.v20210114 2021-01-14 10:29:28 -06:00
Lachlan 16acdcf7e9
Merge pull request #5852 from eclipse/jetty-10.0.x-5850-UpgradeRequestNPE
Fix NPE from WebSocketSession.getUserPrincipal() in Jetty10
2021-01-13 12:01:24 +11:00
Lachlan Roberts 0d48b8b991 Issue #5866 - add Programmatic WebSocket Upgrade to Jetty API
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-13 10:45:45 +11:00
Lachlan Roberts 78707fffde CreatorNegotiator should remain private, use from on WebSocketNegotiator
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-13 09:55:19 +11:00
Lachlan Roberts 2d43661fe3 Set the javax ws upgrade request in constructor.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-12 11:47:35 +11:00
Lachlan Roberts 0a944ac0a9 Issue #5866 - allow programmatic upgrades with websocket-core
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-08 22:47:55 +11:00
Lachlan Roberts 6e6f83c7f2 Fix bad refactor of getMappings method.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-08 14:55:44 +11:00
Lachlan Roberts f738493504 Issue #5851 - remove WebSocketServletFactory as ServletContext attribute on destroy
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-05 15:05:31 +11:00
Lachlan Roberts 02963baae3 disable part of tests due to bug with ServerUpgradeResponse
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-05 08:48:55 +11:00
Lachlan Roberts 65d8131144 fix incorrect test expectation
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-04 17:14:58 +11:00
Lachlan Roberts 69facceec3 Issue #5850 - set the UpgradeRequest in the Javax FrameHandlerFactory
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-04 16:11:28 +11:00
Lachlan Roberts af3cce85a7 The WebSocket Upgrade Header value should be all lower case.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-04 15:57:23 +11:00
Lachlan Roberts 281f6d13ed Issue #5850 - add tests for the UpgradeRequests in the FrameHandlers
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-04 15:55:47 +11:00
Simone Bordet 480767a03b Improvements to the Jetty documentation.
Updated the WebSocket documentation in the operations guide.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-12-30 20:16:20 +01:00
Lachlan Roberts 7a72a6ac64 Issue #5828 - allow HttpClient to be used with JavaxWebSocketClientContainerProvider
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-23 17:14:12 +11:00
Olivier Lamy 06df421b56
Remove javax.* dependencies (#5776)
remove non needed enforcer rule in websocket poms
force search transitive

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-22 08:17:16 +10:00
Lachlan 5611c2daa2
Merge pull request #5790 from eclipse/jetty-9.4.x-5785-WebSocketWarning
remove warning log message on CompressExtension failure
2020-12-18 18:11:47 +11:00
Lachlan Roberts c16674bae7 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5706-ServerUpgradeResponse 2020-12-15 16:51:47 +11:00
Lachlan Roberts 41cffa0bc4 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-ByteAccumulator 2020-12-15 16:49:23 +11:00
Joakim Erdfelt 2662be0a05
Merge pull request #5795 from eclipse/jetty-10.0.x-5784-fix-dual-license-text
Issue #5784 - fix dual license text
2020-12-11 11:37:58 -06:00
olivier lamy 9b100a5bfb Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-12-11 12:10:35 +10:00
Olivier Lamy 639cad63fe
Jetty 9.4.x optimize parser warning from logs and add spotbug (#5735)
* enable spotbugs in CI

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

record issues

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

use warning new generation

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

activate errorprone

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

fix Jenkinsfile

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

do not run spotbugs for jetty-runner as we do not want to fix all dependencies bugs :)

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

junit should allow empty results

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

maven console can be use only once...

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

one liner

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

recordissues only once

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

force id

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

aggregate results

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

configure a name for aggregated reports

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

mo more -T3 no need anymore of remote session test profile

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

I want to see what failing tests look like with new report.

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

skip spotbugs for jetty-jmh

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

get rid of findbugs as we now have spotbugs

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

Revert "I want to see what failing tests look like with new report."

This reverts commit df0d13e4c53d7461872e1f925ec06bd36e4a66c9.

activate errorProne parser

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

make pmd quiet for CI

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

remove -fae flag and do not display transfer progress

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

try junitParser() to see what it does

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

junit parser is a bad idea...

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

increase timeout

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

no -T2 for javadoc

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

fix skip spotbugs and pmd verbose

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

* remove -T options

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-11 11:47:26 +10:00
Joakim Erdfelt f0badc5c5e
Issue #5784 - Fixing source header text: EPL-2.0 OR Apache-2.0
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-12-10 16:04:50 -06:00
Lachlan Roberts 9d2e350b04 Issue #5785 - remove warning on CompressExtension failure
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-10 23:22:03 +11:00
Lachlan 1753dec720
Issue #5774 - make fields and classes in Client/Server ConfigTest static (#5777)
* Issue #5774 - make fields and classes in Client/Server ConfigTest static

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* changes from review

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-10 15:17:02 +11:00
Lachlan Roberts c9409befd8 Issue #5706 - fix potential NPE from websocket-core ServerUpgradeResponse
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-08 16:54:13 +11:00
Lachlan Roberts 8b3cffb49f Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-ByteAccumulator 2020-12-08 14:34:55 +11:00
Joakim Erdfelt 9319f10425 Updating to version 10.0.1-SNAPSHOT 2020-12-02 15:30:13 -06:00
Joakim Erdfelt b9645a1737 Updating to version 10.0.0 2020-12-02 15:04:53 -06:00
Lachlan 121d898517
Move websocket-util classes into websocket-core (#5705)
- Merge websocket-util classes into websocket-core
- rename websocket-util-server to websocket-servlet
- remove websocket-util

* merge websocket-util into websocket-core-common
* move websocket-util-server implementation to websocket-core-server
* rename websocket-util-server to websocket-servlet
* Negotiator should not need the WebSocketComponents, give this to handshaker instead
* fix tests and WebSocketConfigurations
* move exception classes in websocket-core-common
* move MessageSinks and util to internal package
* create internal package for websocket-core-client
* fix JPMS warnings for websocket common modules
* Fixed exports declarations to make MethodHandles.publicLookup() working properly.
* fix broken tests with wrong WebSocketUpgradeFilter package name
* remove -T3 option to not have parallel build
* no need of jacoco here
* do no reuse forks
* remove logback dependency and disable debug log level
* make this test dynamic instead of hardcoded version...
* use -fae
* change websocket-servlet bundle symbolic name
* cleanup changes
* restore bugs....
* Updates after review.

Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-02 11:10:15 +11:00
Lachlan Roberts b4fc70430c do not used fixed port in core WebSocketProxyTest
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-02 00:12:16 +11:00