Commit Graph

17765 Commits

Author SHA1 Message Date
olivier lamy 46d8668f67 disable autobahn profile
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-23 21:17:49 +10:00
olivier lamy 42c09b5fef parse autobahn junit results
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-23 18:35:12 +10:00
olivier lamy 8c12dd2d30 autobahn profile(running test suite) part of default build on Jenkins
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-23 17:27:51 +10:00
Greg Wilkins 9216d5ab63
Merge pull request #3224 from lachlan-roberts/jetty-10.0.x-3216-AutobahnWebSocketServerFailures
Issue #3216 - Autobahn WebSocketServer failures in jetty 10
2018-12-23 13:49:35 +11:00
olivier lamy 6ff23e296d Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-12-22 22:00:07 +10:00
Olivier Lamy 72ebcc51af
interpolate version from main pom for maven plugin it test (#3223)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-22 21:55:31 +10:00
Olivier Lamy f5eb4864cc
Issue #3166 Jetty 10.0.x autobahn test ci (#3221)
*  issue #3166 add autobahn test

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-22 21:16:23 +10:00
Greg Wilkins ad8d3ea54d
Merge pull request #3208 from eclipse/jetty-9.4.x-3207-async-servlet-print
Issue #3207 async compliant print methods
2018-12-22 14:16:08 +11:00
Olivier Lamy ab2a8b0fe3
upgrade logback and log4j-slf4j (new artifact log4j-slf4j18-impl) to support slf4j api 1.8 (#3209)
* upgrade logback and version of log4j-slf4j support slf4j 1.8 (new artifact log4j-slf4j18-impl)

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-22 10:01:48 +10:00
Simone Bordet 9aeebb1368 Fixes #3212 - java.io.IOException: 1/unexpected_rst_stream_frame.
Client and server need to to treat an incoming RST_STREAM frame
differently, testing whether the stream is closed for respectively
local and remote streams.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-12-21 13:27:14 +01:00
olivier lamy bd4933b33c Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-12-21 21:48:36 +10:00
Olivier Lamy 63820e5405
activate Maven enforcer Upper bound dependencies check (#3116)
* add requireUpperBoundDeps rule

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-21 21:35:31 +10:00
Lachlan Roberts 164859fb9f Issue #3216 - Autobahn WebSocketServer failures in jetty 10
removed maxFrameSize from CompressExtension now use the
WebSocketChannel.getMaxFrameSize() to fix a bug where a change in the
WebSocketChanel maxFrameSize was not reaching the CompressExtension

create dummy WebSocketChannel in tests using CompressExtension without
a channel to replace the setter for maxFrameSize

increased the maxFrameSize in AutobahnWebSocketNegotiator to fix
autobahn tests being over maxFrameSize after being inflated

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-12-20 20:08:35 +11:00
Greg Wilkins 8f06fa8083 Issue #3207
updates after review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-20 08:53:16 +11:00
Greg Wilkins 225760c2de Issue #3207
Fix #3207 by providing async compliant print methods

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-19 13:57:58 +11:00
Jan Bartel a5e89d0340 Fix last merge from 9.4 for TestAnnotations. 2018-12-19 12:55:54 +11:00
olivier lamy df92c7d5ec fix it with declaring correct version of slf4j and excluding logback as we are now slf4j api 1.8.0-beta2
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-19 10:15:14 +10:00
Jan Bartel 4abc4f8dd4 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-12-19 10:54:41 +11:00
olivier lamy 0ac5f67479 fix cherry pick
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-18 17:53:31 +10:00
olivier lamy 825838f3a9 fix format
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-18 17:41:22 +10:00
olivier lamy a21f2aa578 fix async-rest-jar bundle name typo
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-18 17:40:15 +10:00
olivier lamy bbd45fa66d Update to Maven JAR Plugin 3.1.1 to pick up the fix of MJAR-241
surefire plugin 3.0.0-M2
remove use of Automatic-Module-Name jar plugin property so we avoid failure on jpms module name validation by jar plugin 3.1.1

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-18 17:40:11 +10:00
Olivier Lamy 9ca77a23aa issue #3186 add it to override javax.annotation provided by maven core (#3194)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-18 17:38:11 +10:00
Greg Wilkins 28533d4ca6
Merge pull request #3205 from eclipse/jetty-9.4.x-3202-async-session-create
Issue #3202 Ensure sessions created during async are cleaned up.
2018-12-18 16:43:20 +11:00
Greg Wilkins 503bd71d4c Issue #3202
Handle async cross context session completion
2018-12-18 16:00:46 +11:00
Greg Wilkins 06bbab50f9 Issue #3202
Handle async cross context session completion
2018-12-18 14:07:16 +11:00
Jan Bartel 34b6ecec6c Issue #3202 Ensure sessions created during async are cleaned up.
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-12-18 09:32:12 +11:00
Greg Wilkins 1999b23d67
Merge pull request #3198 from eclipse/jetty-10.0.x-3129-websocket
Issue #3129 rename websocket directories, modules and artifacts
2018-12-18 09:28:25 +11:00
Greg Wilkins f2f6598ddc Fixed param name after review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-18 08:46:52 +11:00
olivier lamy 9af977fa93 fix async-rest-jar bundle name typo
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-17 10:05:53 +10:00
olivier lamy 471dab752b Update to Maven JAR Plugin 3.1.1 to pick up the fix of MJAR-241
surefire plugin 3.0.0-M2
remove use of Automatic-Module-Name jar plugin property so we avoid failure on jpms module name validation by jar plugin 3.1.1

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-17 10:05:53 +10:00
Olivier Lamy f26b9f7c15
issue #3186 add it to override javax.annotation provided by maven core (#3194)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-15 12:35:16 +10:00
WalkerWatch 7c4d12fb7d Updating for customrequestlog impl
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2018-12-13 13:43:22 -05:00
Greg Wilkins 6590dfe832 fixed javax websocket OSGi test
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-13 16:19:16 +11:00
Jan Bartel 3acb98f477
Issue #3161 Update to Apache JSP 8.5.35 (#3163)
* Issue #3161 Update to Apache JSP 8.5.35

Signed-off-by: Jan Bartel <janb@webtide.com>
2018-12-13 14:57:14 +11:00
Greg Wilkins fb06b82172 Issue #3030 ignore identity content encoding during parameter extraction
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-13 13:42:08 +11:00
Greg Wilkins 1176b267b5 removed -impl from websocket name and fixed SCI
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-13 10:05:10 +11:00
Greg Wilkins 52d0d62594 Configure default EndpointIdentificationAlgorithm for WebSocketCoreClient
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-13 09:36:13 +11:00
Greg Wilkins 9a67114c43 work in progress to fix websocket OSGi
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-12 17:35:46 +11:00
Jan Bartel 61686843db Issue #3162 Partial fix for javaxwebsocket in osgi, wip. 2018-12-12 14:44:04 +11:00
Joakim Erdfelt ff0aa965c4 Issue #3162 - Attempting to address ServiceLoader with javax.websocket (client) on OSGi
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-12-12 14:43:58 +11:00
Greg Wilkins 8320d88698 Disable test that fails
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-11 18:02:07 +11:00
Greg Wilkins 252bb5dd72 Merge branch 'jetty-10.0.x' into jetty-10.0.x-3129-websocket 2018-12-11 17:02:16 +11:00
Jan Bartel 6af567a4b9
Handle ServletContainerInitializer from WEB-INF/classes #3146 (#3158)
* Handle the case where a ServletContainerInitializer comes from
WEB-INF/classes

Signed-off-by: Jan Bartel <janb@webtide.com>
2018-12-11 06:33:44 +01:00
Simone Bordet 2497cf6feb
Merge pull request #3193 from bjorncs/low-resource-monitor
Change access of LowResourceCheck to public
2018-12-10 14:17:21 +01:00
Bjørn Christian Seime 71c0e47446 Change access of LowResourceCheck to public
This interface is currently package-private while it's in the
signature of several public methods (e.g. addLowResourceCheck, getLowResourceChecks)

Signed-off-by: Bjørn Christian Seime <bjorncs@yahoo-inc.com>
2018-12-10 13:39:29 +01:00
olivier lamy 14ffa0d981 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-12-08 18:42:42 +10:00
Torbjørn Martinsen e7be376882 Update DoSFilter.java (#3191)
Add missing word and remove extra space in comments
2018-12-06 17:59:08 +10:00
Olivier Lamy 0dcdcc7baf
Jetty 10.0.x fix surefire arg line (to avoid locale dependent build) (#3183)
* surefire.argLine replaced by jetty.surefire.argLine

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-06 09:09:06 +10:00
Greg Wilkins e8d468b3e1 work in progress
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-05 14:45:23 +01:00