Commit Graph

26398 Commits

Author SHA1 Message Date
Joakim Erdfelt a3c2055e10 Bump log4j2 to 2.19.0 (#8605)
* Bump log4j2 to 2.19.0
+ Remove old exclusions to log4j in infinispan
  (no longer relevant)
* fix usage of log4j-slf4j2-impl

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-09-23 15:14:57 +10:00
Joakim Erdfelt 2c335eb7dd
Jetty 12 : Correct appassembler error during `jetty-ee10-test-quickstart` (#8616)
* appassembler-maven-plugin is not needed anymore
2022-09-23 15:07:11 +10:00
Joakim Erdfelt b75896c2f5
Jetty 12 : XmlAppendable use Charset, not String (#8609)
* XmlAppendable use charset, not string
* Collapse Constructors into one
2022-09-22 15:06:02 -05:00
Joakim Erdfelt cde924ec6a
XmlParserTest changed to show simple parse
+ This simple parse should not contain
  references to XSD/DTD in this simple
  state, otherwise it will require internet
  access to perform the test.
2022-09-22 05:52:54 -05:00
Joakim Erdfelt 46bd4cfd9a
Tag tests requiring Online 2022-09-22 05:52:12 -05:00
Olivier Lamy 45ca33676d Merge branch 'jetty-11.0.x' into jetty-12.0.x 2022-09-22 10:09:06 +10:00
Olivier Lamy b7c49315c7 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2022-09-22 09:51:40 +10:00
Vincent Latombe 090104d643
Allow to pass instances of ClientConfig and Config to Hazelcast data store factory (#8600)
* Allow to pass instances of ClientConfig and Config to Hazelcast data store factory

This increases flexibility when configuring it programmatically.

Patterns such as

HazelcastSessionDataStoreFactory f = new HazelcastSessionDataStoreFactory();
f.setOnlyClient(true);
f.setClientConfig(ClientConfig.load());

or

HazelcastSessionDataStoreFactory f = new HazelcastSessionDataStoreFactory();
f.setServerConfig(Config.load());

can then be used to configure Hazelcast according to standard Hazelcast
locations if needed.

Co-authored-by: Jesse Glick <jglick@cloudbees.com>
2022-09-22 07:38:28 +10:00
Simone Bordet d3e16fcff9 Updates from reviews.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-09-21 20:03:49 +02:00
Simone Bordet 910bb41702 Removed duplicate client transport tests already present in core.
Properly implemented request and response trailers for all the transports, both client and server.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-09-21 20:03:49 +02:00
Simone Bordet 0a267fa8d5 Renamed ee10 client transport tests package.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-09-21 20:03:49 +02:00
Simone Bordet d12b46b269 Renamed ee10 client transport tests module.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-09-21 20:03:49 +02:00
Simone Bordet fe34e5390c Reworked HTTP/3 stream and demand implementation so that it now leaves in HTTP3Stream, rather than in HTTP3StreamConnection.
This was necessary to avoid NPE when e.g. calling demand() on a stream that has already been removed from the session.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-09-21 20:03:49 +02:00
Simone Bordet 854d5cdf6a Renamed ee9 client transport tests package.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-09-21 20:03:49 +02:00
Simone Bordet 8e68505524 Moving from ee9 to core more client transport tests.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-09-21 20:03:49 +02:00
Simone Bordet d001d95d9f Moving from ee9 to core the client transport tests that are generic enough to work in core.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-09-21 20:03:49 +02:00
Joakim Erdfelt 4fe414a762
Jetty 12 : precompressed content support for `ResourceService` (#8595)
* Remove Resource.getWeakETag in favor of new EtagUtils
* Protect bad usages of CachingContentFactory
* Working precompressed content for ResourceService
* Fixing DefaultServlet handling of ResourceService.writeHttpError() overrides
* Protect NPE in CachingContentFactory.isValid()
* Complete callback in DefaultServlet.writeHttpError
* Addressing review comments
* Testing for whole content
* Improve MemoryResource handling of name/filename
* EtagUtils handling of Resource
* Better protection of bad Resource impls in EtagUtils
* Update CachingContentFactory
+ Using Resource.lastModified were possible
+ CachingHttpContent has better Resource
  protection, and uses Etag from delegate
+ CachingHttpContent uses delegate where
  possible.
+ Store Etag HttpField in CachingHttpContent
  and allow override in constructor
* Simpler CachingHttpContent.isValid()
* Better handling of PrecompressedHttpContent

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-09-21 09:39:21 -05:00
Joakim Erdfelt d0fd6b88ea
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-09-21 07:22:47 -05:00
Jochen Schalanda 35fe649749
Bump Logback to version 1.4.1 (#8604)
> # 2022-09-14 Release of logback versions 1.3.1 and 1.4.1
> Logback components written for logback 1.2 should work without change in version 1.3. However, Joran, logback's configuration system, has been rewritten to use an internal representation model which can be processed separately. Thus, code depending on Joran needs to be adapted to changes in Joran (logback's internal configuration mechanism).
> 
> As a result of enhancements to Joran, logback configuration scripts are now largely order-free. For example, appenders can now be defined after they are first referenced in a logger. Moreover, unreferenced appenders are no longer instantiated.
> 
> - Logback-classic now correctly invokes DefaultJoranConfigurator when running in a (JPMS) modular environment. This fixes LOGBACK-1670 reported by Alexey Gavrilov who also provided the relevant test case.
> -Logback will now correctly retrieve its own version information when running in a (JPMS) modular environment. This fixes LOGBACK-1677.
> - Logback version 1.3.1 now correctly declares javax.servlet.ServletContainerInitializer as a provided service. This fixes LOGBACK-1671 as reported by Chad Wilson.
2022-09-21 07:14:20 -05:00
Jochen Schalanda 1bc0c0634a
Bump SLF4J to version 2.0.2 (#8603)
SLF4J 2.0.0, 2.0.1, and 2.0.2 have been released recently.

https://www.slf4j.org/news.html

> # 2022-09-20 - Release of SLF4J 2.0.2
> - Fixed bug in the setContextMap() method of Reload4jMDCAdapter. This issue was reported in [SLF4J-563](https://jira.qos.ch/browse/SLF4J-563) by Michael Wartes.
> - The binary of this version can be reproduced by checking out the tag v_2.0.2 from the source code repository (GitHub). Release built using Java "18" 2022-03-22 build 18+36-2087 under Linux Debian 11.2.
> # 2022-09-14 - Release of SLF4J 2.0.1
> - The Logger.makeLoggingEventBuilder method semantics has changed so that overriding implementations should now always build a new LoggingEventBuilder instance as appropraiate for the implementation, i.e the logging backend. For more details see [SLF4J-560](https://jira.qos.ch/browse/SLF4J-560).
> - Deprecated unused LoggerFactoryBinder and MarkerFactoryBinder classes. This issue was raised in [SLF4J-555](https://jira.qos.ch/browse/SLF4J-555) by Witalij Berdinskich who provided the relevant patch.
> - The binary of this version can be reproduced by checking out the tag v_2.0.1 from the source code repository (GitHub). Release built using Java "18" 2022-03-22 build 18+36-2087 under Linux Debian 11.2.
> 
> # 2022-08-20 - Release of SLF4J 2.0.0
> The the 2.0.x series requires Java 8 and adds a backward-compatible [fluent logging api](https://www.slf4j.org/manual.html#fluent).
> 
> Moreover, SLF4J has been modularized per [JPMS/Jigsaw](http://openjdk.java.net/projects/jigsaw/spec/) specification. The resulting internal changes are [detailed](https://www.slf4j.org/faq.html#changesInVersion200) in the FAQ page.
SLF4J 2.0.x series requires Java 8. It builds upon the 1.8.x series and adds a backward-compatible [fluent logging api](https://www.slf4j.org/manual.html#fluent). By backward-compatible, we mean that existing logging frameworks do not have to be changed for the user to benefit from the fluent logging API. However, existing frameworks must migrate to the ServiceLoader mechanism. The resulting internal changes are [detailed](https://www.slf4j.org/faq.html#changesInVersion200) in the FAQ page.
> - Except minor javadoc changes, this release is identical to 2.0.0-beta1 released earlier this month.
> - The binary of this version can be reproduced by checking out the tag v_2.0.0 from the source code repository (GitHub). Release built using Java "18" 2022-03-22 build 18+36-2087 under Linux Debian 11.2.
2022-09-21 07:14:09 -05:00
Joakim Erdfelt 594e7cfcc1
Improving URIUtil.addPathQuery behavior (#8602)
+ Adding test cases as well.
2022-09-21 05:37:53 -05:00
Lachlan 050b4a988b
Merge pull request #8598 from eclipse/jetty-12.0.x-RemoteEndpointApiFix
Complete TODO to fix WebSocket RemoteEndpoint API in Jetty 12
2022-09-21 18:15:12 +10:00
Lachlan 97dd7b30d2
Merge pull request #8413 from eclipse/jetty-12.0.x-websocket-upgrade-contract
Jetty 12 : Strengthen WebSocket upgrade contract and other improvements
2022-09-21 18:14:27 +10:00
Simone Bordet 3dd81be051
Updated SLF4J to 2.0.1.
Updated Log4j2 to 2.19.0.
Updated logging-log4j2.mod.
Removed references to og4j-slf4j18-impl, replaced by log4j-slf4j2-impl.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-09-20 22:04:36 +02:00
Joakim Erdfelt 95bf791b71
Jetty 12 - Improve FileID and use where appropriate (#8589)
* Use FileID where appropriate
* Adding FileID.matchesExtension
* Fixing demo modules start test
2022-09-20 09:35:50 -05:00
Lachlan Roberts e43346b042 fix error in AnnotatedPartialListenerTest
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-09-20 12:32:12 +10:00
Lachlan Roberts 88adc23915 Complete todo to fix WebSocket RemoteEndpoint API
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-09-19 19:11:31 +10:00
Lachlan Roberts 53c0d7b9b4 Complete todo to fix WebSocket RemoteEndpoint API
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-09-19 19:10:33 +10:00
Lachlan Roberts 5296424e0a Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-websocket-upgrade-contract 2022-09-19 18:34:49 +10:00
Lachlan Roberts b9d980b5a9 Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-09-19 16:39:26 +10:00
Lachlan Roberts 7795e9442c add getter for the WebSocketUpgradeHandler configuration
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-09-19 16:34:44 +10:00
Olivier Lamy c37e5214a5 Merge branch 'jetty-11.0.x' into jetty-12.0.x 2022-09-19 12:02:43 +10:00
Olivier Lamy 660d74fe2c Merge branch 'jetty-10.0.x' into jetty-11.0.x 2022-09-19 12:01:17 +10:00
Lachlan 6b2db685cd
Merge pull request #8473 from eclipse/jetty-10.0.x-WebSocketUpgradeHandler-Configuration
add getter for the WebSocketUpgradeHandler configuration
2022-09-19 10:51:33 +10:00
Olivier Lamy e63d1d76da
merge back release branch to restore 12.0.0-SNAPSHOT versions (#8596)
* Updating version jetty-12.0.0.alpha1 in VERSION.txt

* version 12.0.0.alpha1

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

* version back to 12.0.0-SNAPSHOT

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

* merge VERSION .TXT with all release

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

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-09-16 19:50:49 +10:00
Olivier Lamy 6b1611592d
merge back release branch to bump version to 11.0.13-SNAPSHOT (#8594)
* Updating to version 11.0.12

* Updating to version 11.0.13-SNAPSHOT

* add release jetty-9.4.49.v20220914 and 10.0.12 in VERSION.TXT
2022-09-16 19:50:26 +10:00
Olivier Lamy dbd07146ec
merge back release branch to bump version to 10.0.13-SNAPSHOT (#8593)
* Updating to version 10.0.12

* Updating to version 10.0.13-SNAPSHOT

* VERSION.TXT =+ content of jetty-9.4.49.v20220914 release

* remove strange line and reorder
2022-09-16 19:50:12 +10:00
Joakim Erdfelt 8e98467c39
Cleanup tests in jetty-util Resource (#8586)
+ No more @Disabled tests
+ Merge JrtResourceTest into ResourceTest
+ Merge ClassPathResourceTest into ResourceTest
+ Rename JarResourceTest to MountedPathResourceTest
2022-09-15 07:40:05 -05:00
Simone Bordet b6224aea30
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-09-15 11:02:39 +02:00
Simone Bordet c905623c10
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-09-15 11:02:09 +02:00
Simone Bordet 8d2b182afe
Fixes #8558 - Idle timeout occurs on HTTP/2 with InputStreamResponseListener.
Fixed override of reset().

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-09-15 11:01:45 +02:00
Simone Bordet 0d8af24b6b
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-09-15 11:00:03 +02:00
Simone Bordet 8dc823cd86
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-09-15 10:20:47 +02:00
Simone Bordet dab4fe60d3
Fixes #8558 - Idle timeout occurs on HTTP/2 with InputStreamResponseL… (#8585)
* Fixes #8558 - Idle timeout occurs on HTTP/2 with InputStreamResponseListener.

The issue was that HttpReceiverOverHTTP2.ContentNotifier.offer() was racy,
as a network thread could have offered a DATA frame, but not yet called
process() -- yet an application thread could have stolen the DATA frame
completed the response and started another response, causing the network
thread to interact with the wrong response.

The implementation has been changed so that HttpReceiverOverHTTP2.ContentNotifier
does not have a queue anymore and it demands DATA frames to the Stream
only when the application demands more -- a simpler model that just forwards
the demand.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-09-15 10:18:36 +02:00
Olivier Lamy 270f491ea8
add a step to push tag to a fork (#8577)
* add a step to push tag to a fork
* add creation of branch release/
2022-09-15 07:14:48 +10:00
Joakim Erdfelt 9668d614d9
Issue #8474 - Jetty 12 - `Resource.list()` API change + `Resource.getFileName()` addition (#8582)
* Issue #8474 - Resource.list and Resource.getFileName work
* Correcting signature of Resource.list and use it
* Introduce Resource.getFileName and use it
* Adding URIUtil.addPath() test to show file+str behavior

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-09-14 15:48:01 -05:00
Joakim Erdfelt 045af3d9ed
Updating core server RequestTest for added URI.path 2022-09-13 11:37:59 -05:00
Joakim Erdfelt 9ebaf3cf53
Adding ee10 RequestTest 2022-09-13 11:35:06 -05:00
Joakim Erdfelt 141c58208d
Merge branch 'jetty-11.0.x' into jetty-12.0.x 2022-09-13 10:11:40 -05:00
Joakim Erdfelt 0d2bfddf7f
Use normal git, not jgit (as it's incompatible with newer git clones) 2022-09-13 09:53:23 -05:00