20498 Commits

Author SHA1 Message Date
Simone Bordet
528d608860 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-03-25 15:22:07 +01:00
Simone Bordet
e0eb25515b
Merge pull request #4712 from eclipse/jetty-9.4.x-4711-ResetTrailers
Reset trailers on recycled response
2020-03-25 15:09:51 +01:00
Simone Bordet
1a3f39eef1 Issue #4711 - Reset trailers.
Test code cleanup.
Added test for Response.reset().

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-25 15:08:43 +01:00
Greg Wilkins
f4da9760fd Reset trailers on recycled response
Whilst investigating #4711 for jetty-10, it was noticed that trailers are not nulled on recycled Response instances, nor on reset.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-03-25 13:47:34 +01:00
Jan Bartel
0c20622648
Issue #4700 ServletContext.createXXX methods should throw UnsupportedOperationException (#4701)
* Issue #4700 ServletContext.createXXX methods should throw UnsupportedOperationException

Signed-off-by: Jan Bartel <janb@webtide.com>
2020-03-25 11:17:05 +01:00
Jan Bartel
57324f3cca
Issue #4697 ServletContext sessionModes methods should throw UnsupportedOperationException (#4698)
* Issue #4697 ServletContext sessionModes methods should throw UnsupportedOperationException

Signed-off-by: Jan Bartel <janb@webtide.com>
2020-03-25 11:16:36 +01:00
Lachlan
ea80253cca
Merge pull request #4694 from eclipse/jetty-10.0.x-4691-consistent_methodhandles_lookup
Issue #4691 - use static methods with javadoc to get MethodHandle lookups
2020-03-25 10:31:37 +11:00
Lachlan
af899b0e68
Merge pull request #4602 from eclipse/jetty-10.0.x-4340-ServiceLoader
Issue #4340 - Continue after ServiceLoader ServiceConfigurationError
2020-03-25 10:30:38 +11:00
Lachlan Roberts
c0b6d9f677 Issue #4691 - changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-24 14:30:02 +11:00
olivier lamy
b7a4fb7f7e Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-03-24 11:59:35 +10:00
Olivier Lamy
e913ed233a
Issue #4654 Hazelcast configurationLocation is not configurable via mod files (#4655)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-24 11:51:01 +10:00
Greg Wilkins
48cc21ca6d Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2020-03-23 17:00:17 +01:00
Joakim Erdfelt
dfc2568f46
Merge pull request #4689 from eclipse/jetty-10.0.x-4620-stderr-console-capture
Issue #4620 - support alt PrintStream in StdErrAppender properly
2020-03-23 08:36:11 -05:00
Jan Bartel
ea1418ac6d Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-03-23 11:43:09 +01:00
Greg Wilkins
d45fd14ef8 Revert rename of Response closeOutput to completeOutput #4693
Revert the rename of this method and add a deprecated completeOutput to assist those that used the temporary rename.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-03-23 11:16:04 +01:00
Andrej Krota
d445d7eb5d
Fixed InfinispanSessionData serialization issues when using infinispan (#4600)
* Fixed InfinispanSessionData serialization issues when using infinispan
embedded
* Added version to InfinispanSessionDataSerializer
* Refactored InfinispanSessionDataSerializer to make use of
SessionDataMarshaller
* Tests with and without storeAsBinary enabled
* Merged InfinispanSessionDataSerializer and SessionDataMarshaller
* Wrapped Object Input/Output to Input/Output Streams
* Fixed an issue when reading the session data from a file.
* Modified tests to force read from file if available.
* static lazy init serializationContext
* synchronized initSerializationContext

Signed-off-by: Andrej Krota <andrej.krota@gmail.com>
2020-03-23 11:14:01 +01:00
Lachlan Roberts
04cc21fe40 Issue #4691 - use static methods with javadoc to get MethodHandle lookup
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-23 16:43:09 +11:00
Lachlan
d3567fc281
Merge pull request #4692 from eclipse/jetty-10.0.x-4691-consistent_methodhandles_lookup
Issue #4691 - Use MethodHandles.lookup() consistently in WebSocket code.
2020-03-23 11:46:01 +11:00
Lachlan Roberts
d4c2893843 Issue #4691 - Remove unnecessary throws from getMethodHandleLookup.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-23 11:44:06 +11:00
Simone Bordet
10f4fda0de Issue #4691 - Use MethodHandles.lookup() consistently in WebSocket code.
* Using MethodHandles.publicLookup().in(...) instead of privateLookupIn(...).
* Moved test WebSocket EndPoint classes into the proper package, otherwise
  they would not be accessible because the test package is not exported.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-22 16:42:13 +01:00
Joakim Erdfelt
fc722bff22
Issue #4620 - support alt PrintStream in StdErrAppender properly
+ The console-capture jetty module will reset System.err to
  RollingFileOutputStream.  But that's too late, as StdErrAppender
  has already grabbed and is holding onto the System.err from
  earlier, which means it is not writing to the new System.err.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-21 13:51:42 -05:00
olivier lamy
6c5c98b266 cleanup duplicate dependencies
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-21 15:13:28 +10:00
Chris Walker
da3bd1da8b Merge branch 'jetty-9.4.x' into jetty-10.0.x
# Conflicts:
#	jetty-documentation/src/main/asciidoc/development/frameworks/weld.adoc
#	jetty-http/src/test/java/org/eclipse/jetty/http/MultiPartFormInputStreamTest.java
2020-03-20 14:30:22 -05:00
Chris Walker
34488b71b6
Updating Weld documentation. Resolves #3935 2020-03-20 14:26:13 -05:00
Joakim Erdfelt
e385dea838
Do not deploy websocket test projects
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-20 14:04:04 -05:00
Joakim Erdfelt
7e0fff9a89
Merge pull request #4686 from eclipse/jetty-10.0.x-4685-slf4j-impl-not-included
Issue #4685 - jetty-slf4j-impl not a compile/runtime dependency.
2020-03-20 12:04:32 -05:00
Joakim Erdfelt
8456fcd039
Issue #4685 - Adding jetty-slf4j-impl to test wars WEB-INF/lib/
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-20 11:24:15 -05:00
Joakim Erdfelt
891aaa4ca7
Issue #4685 - Removing exclusion on jetty-slf4j-impl
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-20 11:23:53 -05:00
Joakim Erdfelt
43419802b7
Issue #4685 - Declare <scope> for jetty-slf4j-impl everywhere
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-20 11:12:08 -05:00
Joakim Erdfelt
99f1f8b897
Issue #4685 - Cleanup from review
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-20 11:07:25 -05:00
Joakim Erdfelt
9492a5379c
Issue #4685 - eliminate <version> in jetty-slf4j-impl
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-20 10:42:36 -05:00
Joakim Erdfelt
44d2171986
Issue #4685 - jetty-http-spi logging for both jetty and jul
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-20 10:05:32 -05:00
Joakim Erdfelt
2c600f2b68
Issue #4685 - Mark jetty-slf4j-impl as test scope by default
+ Update logging in test-hazelcast-sessions
+ Update logging in test-infinispan-sessions

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-20 09:55:15 -05:00
Simone Bordet
09d8688586
Merge pull request #4670 from eclipse/jetty-10.0.x-4382-h1_to_h2_upgrade
Issue #4382 - Support HTTP/1 upgrade to HTTP/2 in HttpClient.
2020-03-20 11:21:20 +01:00
Lachlan Roberts
04cecaaaef Issue #4340 - Change usages to more closely follow previous behaviours
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-20 17:02:49 +11:00
Olivier Lamy
e05712c26b
upgrade openwebbeans-web to 2.0.15 (#4666)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-20 10:16:12 +10:00
Joakim Erdfelt
874ae80ba4
Issue #4685 - jetty-slf4j-impl not a compile/runtime dependency.
+ Mark as a test dependency

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-19 18:49:51 -05:00
Joakim Erdfelt
a16abe1693
Issue #4685 - jetty-slf4j-impl not a compile/runtime dependency.
+ Mark as a test dependency

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-19 17:46:41 -05:00
Simone Bordet
1326700772 Issue #4382 - Support HTTP/1 upgrade to HTTP/2 in HttpClient.
Added comments and fixed logging.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-19 23:10:03 +01:00
Simone Bordet
9cbd9ab44e Merged 'jetty-10.0.x' into 'jetty-10.0.x-4382-h1_to_h2_upgrade'. 2020-03-19 18:17:57 +01:00
Lachlan
6dc5792301
Merge pull request #4680 from eclipse/jetty-9.4.x-4673-MultiPart
Issue #4673 - fix MultiPart parsing for content split in boundary
2020-03-19 08:49:07 +11:00
Olivier Lamy
0541c5efb4
fix javadoc aggregate generation by using last maven javadoc plugin 3.2.0 (#4675)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-19 07:06:13 +10:00
Simone Bordet
b22c0b196f Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-03-18 17:00:01 +01:00
Simone Bordet
42c4d9b38a Issue #4443 - Track backport of ALPN APIs to Java 8.
Updated documentation.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-18 16:41:02 +01:00
Simone Bordet
91c1b52e66
Merge pull request #4678 from eclipse/jetty-9.4.x-4443-alpn-backport-8u252
Issue #4443 - Track backport of ALPN APIs to Java 8.
2020-03-18 15:35:31 +01:00
Simone Bordet
1be2f47424 Issue #4443 - Track backport of ALPN APIs to Java 8.
Improved logging after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-18 15:32:28 +01:00
Simone Bordet
2940eb8ab5 Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-4382-h1_to_h2_upgrade'. 2020-03-18 11:44:06 +01:00
Simone Bordet
6df47dd183 Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-4443-alpn-backport-8u252'. 2020-03-18 10:57:23 +01:00
Lachlan Roberts
c658ae7056 Issue #4673 - fix MultiPart parsing for content split in boundary
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-18 11:22:40 +11:00
Simone Bordet
8a5fc6375b Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-03-17 23:42:29 +01:00