Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
30,296 Commits 65 Branches 460 Tags 355 MiB
Commit Graph

3287 Commits

Author SHA1 Message Date
Jan Bartel 342bd40e0b
Jetty 12.0.x 9301 fix ee10 jstl jpms (#9321) 
* Issue #9301 Fix dependencies for ee10-glassfish-jstl module

* Fix jstl,el,jsp to work in jpms and osgi.
 2023-02-09 09:35:54 +11:00
Simone Bordet 83d6e1756e
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2023-02-08 10:37:31 +01:00
Simone Bordet ea3429e1b9
Fixed imports. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2023-02-08 10:34:44 +01:00
Simone Bordet a7bd164f8d
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2023-02-08 10:29:12 +01:00
Ludovic Orban b87f9385c8
Jetty 12: Cleanup `StatisticsHandler` (#9291) 
#9145 cleanup statistics

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2023-02-07 17:43:46 +01:00
Greg Wilkins 60a08f5349
Rename Handler Nested & Collection (#9305) 
There is now a Handler interface hierarchy:
 + Container is a Handler that has 1 or more contained Handlers.
 + Wrapper is a Container with only 1 handler and a setHandler method.
 + Collection is a Container with n handlers and a addHandler method

class are now:
 + Abstract implements Handler
 + AbstractContainer extends Abstract implements Container
 + BaseWrapper extends AbstractContainer implements Wrapper
 + Sequence extends AbstractContainer implements Collection

 Lots of other associated cleanups
 2023-02-06 12:15:35 +11:00
Joakim Erdfelt 46a316d4df
Issue #9309 - Introducing test for requestlog format with spaces 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2023-02-03 08:45:35 -06:00
Jan Bartel c9391333ce Disable jpms with glassfish jstl test until fixed. 2023-02-02 23:00:06 +11:00
Joakim Erdfelt 490f86e9a6
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2023-02-01 19:33:43 -06:00
Simone Bordet 106382d810
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2023-02-01 22:49:35 +01:00
Simone Bordet 1283b85b60
More JPMS tests for JSTL. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2023-02-01 22:48:48 +01:00
Joakim Erdfelt 1b1e18bfa1
Merge pull request #9236 from eclipse/fix/jetty-12.0.x/ee10-remove-javax.activation 
Jetty 12 - Removing unused / old deps from ee10
 2023-02-01 13:10:12 -06:00
Jan Bartel 7e67e33d3c
Jetty 12.0.x reenable jetty ee9 tests (#9224) 
* Restore tests in ee9
 2023-02-01 15:04:35 +11:00
Joakim Erdfelt 148d276967
More narrowly focused DEBUG logging for JavadocTransparentProxy flaky test 2023-01-31 16:48:57 -06:00
Joakim Erdfelt 4c467e328d
Revert "More DEBUG on CI build/test" 
This reverts commit b29d589ebd.
 2023-01-31 16:34:10 -06:00
Joakim Erdfelt b29d589ebd
More DEBUG on CI build/test 2023-01-31 15:09:13 -06:00
Joakim Erdfelt dfcd21438a
Adding debug to failing test to see what is causing it to fail. 2023-01-31 12:53:12 -06:00
Simone Bordet af6ecfebfe
Fixes #9210 - Jetty 12 - Review Pool and Pool.Entry (#9211) 
* Fixes #9210 - Jetty 12 - Review Pool and Pool.Entry

* Extracted interface Pool, renamed implementation to ConcurrentPool.
* Extracted Pool.Entry as interface.
* Moved StrategyType to ConcurrentPool.
* Made Pool.Factory.wrap() work in order to wrap Pool instances.
* Removed constructors that were explicitly taking Pool parameters, replaced by a single Pool.Factory parameter.
* Added javadocs.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2023-01-30 10:11:29 +01:00
Simone Bordet cd732a175c
Review and normalized all Maven module <name> for consistency. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2023-01-27 19:09:30 +01:00
Ludovic Orban 12deee847d #9145 re-enable DynamicListenerTests 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2023-01-27 17:44:09 +01:00
Ludovic Orban 2424c86b34 #9145 fix websocket modules 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2023-01-27 17:44:09 +01:00
Ludovic Orban 08a829fdd2 #9145 fix ee8 openid module 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2023-01-27 17:44:09 +01:00
Simone Bordet ded18f523d
Fixes #9166 - Jetty 12: review/remove ByteBufferPool (#9195) 
* Fixes #9166 - Jetty 12: review/remove ByteBufferPool

* Replaced usages of ByteBufferPool with RetainableByteBufferPool.
* Removed ByteBufferPool and related classes.
* Renamed oej.http2.frames.DataFrame.getData() -> getByteBuffer() for consistency.
* Removed Accumulator.acquire(), and updated code to use RetainableByteBufferPool.acquire() instead.
* Fixed HttpOutput callbacks to correctly call super.onCompleteSuccess() and super.onCompleteFailure().

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2023-01-27 13:40:49 +01:00
Olivier Lamy 779f71ca20
Merge branch 'jetty-10.0.x' into jetty-11.0.x 2023-01-12 10:25:48 +08:00
Olivier Lamy 7c7a7f3c39
re-enable h3 tests (#8773) 
* run h3 tests

Signed-off-by: Olivier Lamy <olamy@apache.org>
 2023-01-12 09:22:10 +08:00
Simone Bordet a1c5cefd0d
Reorganization of jetty-client classes. (#9127) 
* Reorganization of jetty-client classes.

* Moved oej.client.api to oej.client
* Moved oej.client.util to oej.client
* Moved implementation classes to oej.client.internal
* Moved transports to oej.client.transport
* Moved transport implementation classes to oej.client.transport.internal
* Moved TunnelRequest to oej.client.internal.

* Moved FastCGI transport classes to o.e.j.fcgi.transport
* Moved FastCGI transport implementation classes to o.e.j.fcgi.transport.internal

* Updated WebSocket core client to use only exported, non-internal, oej.client classes.

* Expanded oej.client.Destination APIs:
  - added: getOrigin(), isSecure(), getProxy(), getConnectionPool(), getHttpClient(), send(..).
  - removed: getScheme(), getHost(), getPort() because they don't uniquely identify a Destination anymore (Origin does)
* Moved destination sweeper functionality from HttpDestination to HttpClient.
  HttpDestination does not implement close() anymore, now relies on LifeCycle.stop()
* Moved HttpReceiver.storeCookie() logic to HttpClient.putCookie() to avoid exposing CookieManager.
* Moved HttpClient.getAcceptEncodingField() to ContentDecoder.Factories

* Avoid public/protected Logger instances.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2023-01-11 10:05:43 +01:00
Olivier Lamy 56af845cf1
Merge branch 'jetty-11.0.x' into jetty-12.0.x 2022-12-26 09:31:36 +10:00
Olivier Lamy 0cfc5bd353
Merge branch 'jetty-10.0.x' into jetty-11.0.x 2022-12-26 09:30:03 +10:00
Eddú Meléndez Gonzales d5a3d8e1f4
Improve DatastoreEmulatorContainer usage (#9081) 
* Improve DatastoreEmulatorContainer usage

Update to testcontainers 1.17.6 and take advantage of
`DatastoreEmulatorContainer#withFlags()`
 2022-12-26 09:27:27 +10:00
Joakim Erdfelt 260245c012
Updating to version 11.0.14-SNAPSHOT 2022-12-07 15:04:55 -06:00
Joakim Erdfelt a04bd1ccf8
Updating to version 11.0.13 2022-12-07 14:46:29 -06:00
Joakim Erdfelt 54c4c03244
Updating to version 10.0.14-SNAPSHOT 2022-12-07 14:33:17 -06:00
Joakim Erdfelt 1c2636ea05
Updating to version 10.0.13 2022-12-07 14:12:50 -06:00
Joakim Erdfelt 754bbddf8a
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-12-07 09:54:18 -06:00
Joakim Erdfelt 7e1de8b1e2
Issue #8973 - Rework KeyStoreScanner handling for symlink related changes (#9014) 
* Issue #8973 - Rework KeyStoreScanner handling for symlink related changes

+ Removed changes from #8786 and #8787
+ More test cases
+ revert jetty.sslContext.reload.followLinks boolean
+ Scanner should follow its own linkOptions setting
+ remove bad documentation in module-ssl-reload.adoc

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Co-authored-by: Lachlan Roberts <lachlan@webtide.com>
 2022-12-07 09:24:19 -06:00
Joakim Erdfelt fab644151a
Tag flaky test - DistributionTests.testVirtualThreadPool 2022-12-06 09:32:15 -06:00
Simone Bordet f8c4783802
Fixes #8975 - Rename getBaseResponse() to getServletContextResponse(). (#8976) 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-12-06 15:08:58 +01:00
Greg Wilkins e682f73d54
Cleanup of TypeUtil and ContextHandler stop/start (#8998) 
* Extracted some non controversial cleanups from another mega PR:

 + TypeUtil class shortname used more often and includes trailing digits
 + Fixed direct stopping/starting of a nested ContextHandler
 + Fixed null path handling in nested context
 + more tests for all of the above

* Extracted some non controversial cleanups from another mega PR:

Fixed nested doStart and doStop

* Extracted some non controversial cleanups from another mega PR:

Fixed DistributionTests
 2022-12-06 15:43:31 +11:00
Joakim Erdfelt 21e8fc185e
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-12-01 11:07:38 -06:00
Olivier Lamy 838728201f
force inject javax.inject 
Signed-off-by: Olivier Lamy <olamy@apache.org>
 2022-11-30 13:21:01 +10:00
Olivier Lamy b50e35a63c
force back to javax.inject as needed by new version of maven-resolver 
Signed-off-by: Olivier Lamy <olamy@apache.org>
 2022-11-30 12:08:12 +10:00
Olivier Lamy b961ba77cc
Merge branch 'jetty-10.0.x' into jetty-11.0.x 2022-11-29 21:36:10 +10:00
Olivier Lamy c1e570d40e
java inject looks to be needed now 
Signed-off-by: Olivier Lamy <olamy@apache.org>
 2022-11-29 19:03:01 +10:00
Simone Bordet 71e0414cbc
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-21 15:52:11 +01:00
Simone Bordet 2c3230a26a
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-21 15:41:47 +01:00
Simone Bordet 83154b4ffe
Fixes #8863 - Provide a possibility to name virtual threads (#8903) 
* Fixes #8863 - Provide a possibility to name virtual threads

Reworked the VirtualThreads APIs to be based on `Executor` rather than just `boolean`.
Introduced Jetty module `threadpool-virtual-preview`.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-21 15:39:54 +01:00
Joakim Erdfelt 18f22816c9
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-11-17 13:01:00 -06:00
Joakim Erdfelt cba414f255
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-11-17 11:51:54 -06:00
Joakim Erdfelt ae6ffdc135
Correct osgi bundle-name 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-11-16 08:36:34 -06:00
Joakim Erdfelt 23c989c6ef
Cleanup imports 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-11-16 08:31:02 -06:00
Joakim Erdfelt f9b8d50a2e
Merge remote-tracking branch 'origin/fix/jetty-10-home-with-docs-awaitility' into fix/jetty-10-home-with-docs 
# Conflicts:
#	tests/jetty-home-tester/src/main/java/org/eclipse/jetty/tests/hometester/JettyHomeTester.java
 2022-11-16 08:30:16 -06:00
Joakim Erdfelt 6b96b0d5e6
Issue #8895 - More reliable JettyHomeTester.unzip 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-11-16 08:23:18 -06:00
Olivier Lamy 62746d9d44
review comments 2022-11-16 20:57:07 +10:00
Olivier Lamy 1eb3cd91ab
use Awaitility 
Signed-off-by: Olivier Lamy <olamy@apache.org>
 2022-11-16 12:55:34 +10:00
Joakim Erdfelt fd558f2eaa
Issue #8895 - fixing JettyHomeTester.await logs timeout 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-11-15 18:51:10 -06:00
Joakim Erdfelt af227778bb
Issue #8895 - Move JettyHomeTester to own module 
+ Fix for circular dependency loop
    test-distribution ->
    jetty-home ->
    jetty-documentation ->
    jetty-asciidoctor-extensions ->
    test-distribution
+ Remove any deps on anything in org.eclipse.jetty from new module

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-11-15 15:06:59 -06:00
Joakim Erdfelt a636a7d153
Adding some more test tags 2022-11-10 10:14:58 -06:00
Lachlan Roberts 539777492e Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-11-10 17:20:21 +11:00
Lachlan 690220fc40
Merge pull request #8787 from eclipse/jetty-10.0.x-8786-KeyStoreScanner-Symlink 
Issue #8786 - add configuration for KeyStoreScanner to not resolve aliases
 2022-11-10 17:17:59 +11:00
Joakim Erdfelt 3ffc29f669
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-11-08 18:09:01 -06:00
Joakim Erdfelt f99da578af
More reliable `AllowedResourceAliasCheckerTest` (#8872) 
* More reliable AllowedResourceAliasCheckerTest

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-11-08 16:16:37 -06:00
Simone Bordet 8893cc2b94
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-08 21:55:10 +01:00
Simone Bordet 1a1b9cfe4c
Fixes #8770 - Review whether to send request body in redirects. (#8775) 
* Fixes #8770 - Review whether to send request body in redirects.

Now the original request body is re-sent only if the redirect status code is 307 or 308.
In the other cases, it is a redirect to a GET method, so the Location is followed without resending the body, and the content headers are removed.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-08 21:54:20 +01:00
Joakim Erdfelt cf7353f274
Jetty 10 - Improve test reliability (#8868) 
* Don't care about stop failures in this test
* More consistent ConnectTimeoutTest
 + using IANA example.com (as it will route to a
   real machine, and will never have this
   specific port open)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-11-07 16:16:25 -06:00
Simone Bordet 4225544222
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-07 19:34:43 +01:00
Joakim Erdfelt fbd4387a3e
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-11-04 15:42:41 -05:00
Joakim Erdfelt 2243ee5f3b
Jetty 10 - Flag flaky tests to be skipped on CI (#8865) 
* @Tag("flaky") use instead of @Disabled
* Tweaking timeouts on some tests
* Tweaking timeouts on some tests

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-04 14:06:12 -05:00
Lachlan Roberts 0a14cca307 changes from review - rename resolveAlias to followLinks 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-11-03 20:37:55 +11:00
Lachlan Roberts 8607e3ef15 changes to ssl-reload module & documentation from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-11-03 18:54:53 +11:00
Greg Wilkins 336bba04c5 Re-introduced JMH tests 
Added stream vs iterator
 2022-10-31 15:15:40 +11:00
Lachlan Roberts 4d15593d63 Issue #8786 - add configuration for KeyStoreScanner to not resolve aliases 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-10-31 14:39:32 +11:00
Simone Bordet ff3b14d01b
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-10-25 09:55:45 +02:00
Gili Tzabari e2e59478ce Update in response to PR comments. 2022-10-24 13:17:25 -04:00
Greg Wilkins ac6abb307d
ResourceHandler set base resource as string (#8735) 
* ResourceHandler set base resource as string

* ResourceCollection should not have a path

fixed tests
 2022-10-21 09:32:54 +11:00
Simone Bordet 02a7f1cce1
Re-enabled distribution tests that were disabled. (#8722) 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-10-18 20:10:57 +02:00
Simone Bordet 0d0790834d
Moved FastCGIProxyServlet in ee9 to FastCGIProxyHandler in core. (#8718) 
Moved FastCGIProxyServlet in ee9 to FastCGIProxyHandler in core.
Moved TryFilesFilter in ee9 to TryPathsHandler in core.
Update Jetty modules to properly setup the class-path in case of proxy usage.

Fixes Surefire configuration to run the tests.
The problem is that fcgi-proxy depends on fcgi-client, so both will be put on the module-path.
However, fcgi-server is used for the tests, it is in the class-path, but depends on fcgi-client that is on the module-path.
Therefore, when a fcgi-server class tries to access a fcgi-client class, JPMS throws because the fcgi-client module does not export to the unnamed module.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-10-18 00:00:34 +02:00
Jan Bartel 756cf2102e
Fix jaas demos (#8689) 
* Fix jaas demos add distro test
 2022-10-12 09:33:14 +11:00
Simone Bordet 7ed59f46c8
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-10-05 12:16:02 +02:00
Simone Bordet 76b6f9cfe7
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-10-05 11:51:37 +02:00
Lachlan Roberts 7e85c2a54c add distribution test to reproduce issue with dry-run 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-10-04 17:43:02 +11:00
Lachlan Roberts 1cc91d36ef Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-09-23 14:42:23 +10:00
Joakim Erdfelt ebfb7c63bb
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-22 17:38:48 +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
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
Simone Bordet 8953873e67
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-09-06 12:31:54 +02:00
Simone Bordet 7fb4ac559d
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-09-06 09:40:25 +02:00
Simone Bordet 77ad0189ba
Fixes #8532 - Review System.nanoTime() usages. (#8535) 
* Fixes #8532 - Review System.nanoTime() usages.

Introduced o.e.j.util.NanoTime class to deal with nanoTimes.

Now NanoTime.now() should be used instead of System.nanoTime(),
and various <unit>[elapsed|since|until]() methods to calculate nanoTimes.

Furthermore, comparing 2 nanoTimes should be done via isBefore(),
rather than using the < operator, which is wrong as specified in
the System.nanoTime() javadocs.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-09-06 09:30:02 +02:00
Olivier Lamy d11b5e0742
add module configuration for demo handler (#8490) 
* add module configuration for demo handler

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-09-02 17:46:38 +10:00
Olivier Lamy 228b58e345 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2022-09-02 14:51:07 +10:00
Olivier Lamy 6b1eb1486b
remove some unused plugins from poms (#8534) 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-09-02 14:25:46 +10:00
Olivier Lamy 19ba621406
use start timeout of distribution test as a constant or configurable via sys property (#8492) 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-08-31 07:42:03 +10:00
Olivier Lamy d533040ea7
fix ee8 jstl module and demo (#8484) 
* add distribution test for demo jstl
* fix default pattern, not more need of taglib

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-08-25 07:06:30 +10:00
Olivier Lamy 8fdbf50222
Restore jetty-ee8-maven-plugin mvove back ITs to jetty-eeX-maven-plugin modules (#8472) 
add back jetty-ee8-maven-plugin
- add back jetty-ee8-jspc-maven-plugin
- remove not used site plugin and simplify code
- moving back ee9 maven plugin ITs to the module
- back of ee10 maven ITs test to the plugin module


Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-08-19 17:50:58 +10:00
Joakim Erdfelt 3d51380922
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-08-16 07:00:11 -05:00
Joakim Erdfelt aff36c1c0c
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-08-16 06:59:33 -05:00
Joakim Erdfelt 3157256ff9
Bump slf4j to 2.0.0-beta1 and logback to 1.3.0-beta0 (#8467) 
* Bump slf4j to 2.0.0-beta1 and logback to 1.3.0-beta0
* use new artifactId slf4j-reload4j

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-08-16 06:58:48 -05:00
Lachlan Roberts 5ce20a69d5 fix AliasCheckerSymlinkTest by adding the required resources 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-08-15 13:12:57 +10:00
Lachlan Roberts 51d61d4c82 fix compile issues after removal of AllowSymLinkAliasChecker 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-08-15 11:14:11 +10:00
Lachlan Roberts 8e172f311e Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-8426-aliaschecker-review 2022-08-15 10:40:59 +10:00
Olivier Lamy 84a81345cc checkstyle fix 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-08-15 07:53:28 +10:00
Simone Bordet f4056d6132
Fixed DemoModulesTests to use <env>-demos.mod (plural) instead of <env>-demo.mod. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-08-12 19:09:45 +02:00
Simone Bordet 6f0f8854de
Merged branch 'jetty-12.0.x' into 'jetty-12.0.x-module-renaming'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-08-12 17:31:01 +02:00
Olivier Lamy 44a37746e6
Jetty 12 : reactivate `jetty-ee9-demo-embedded` and `jetty-ee9-demo-proxy-webapp` and add more (#8419) 
* ee8 demos to use ee9 demos resources
* add jetty-ee8-demo-jaas-webapp
* add jetty-ee8-demo-jndi-webapp jetty-ee8-demo-mock-resources
* uhm jetty-ee8-demo-jetty-webapp have some issues
* fix jetty-ee8-demo-jetty-webapp
* fix some jetty-ee9-demo-embedded and add back jetty-ee8-demo-proxy-webapp
* demo-embedded need to have jetty-ee9-demo-jsp-webapp built first
* fixing more demos modules. Activate dist test for demo modules and all env


Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-08-12 17:52:53 +10:00
Simone Bordet 1eea480764
Jetty 12 module renaming - jetty-websocket. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-08-12 09:33:31 +02:00
Simone Bordet 122b095260
Jetty 12 module renaming - jetty-http3. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-08-12 09:33:31 +02:00
Simone Bordet 7d264e6024
Jetty 12 module renaming - jetty-http2. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-08-12 09:33:31 +02:00
Lachlan Roberts 941527e27f make alias checking in ee10 use core alias checkers 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-08-11 11:52:27 +10:00
Simone Bordet b8e0db70e4
Updated imports to jakarta. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-08-10 15:00:08 +02:00
Simone Bordet 1e778bd97b
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-08-10 14:56:43 +02:00
Simone Bordet be3d16bdbb
Fixes #8007 - Support Loom. (#8360) 
Implemented support for virtual threads for HTTP/1.1, HTTP/2 and HTTP/3.

The virtual thread support is in AdaptiveExecutionStrategy.
When virtual threads are supported and enabled, reserved threads are disabled and
blocking tasks are run in a virtual thread instead that being executed by the Executor.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-08-10 14:31:04 +02:00
Greg Wilkins a19c1ef2ed fix all ee9 demo context paths 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2022-08-10 17:47:08 +10:00
Greg Wilkins d9b53a6174 fix ee9 demo context paths 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2022-08-10 17:33:58 +10:00
Lachlan Roberts 40123bfbfc Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-08-08 13:38:30 +10:00
Lachlan 998bc8c7e8
Merge pull request #8315 from eclipse/jetty-10.0.x-8296-AliasChecking 
Issue #8296 and #8259 -  AllowedResourceAliasChecker improvements
 2022-08-08 13:23:02 +10:00
Olivier Lamy 96a455c157 fix HashLoginService use of Resource 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-08-05 19:36:50 +10:00
Olivier Lamy d5a0b2bd1e more fixes on Resource 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-08-05 18:48:08 +10:00
Olivier Lamy 439bd12c7f fix NPE 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-08-05 15:54:10 +10:00
Joakim Erdfelt 67953f8328
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-08-01 15:48:12 -05:00
Lachlan Roberts 99cb930d78 changes from review PR #8315 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-07-27 10:21:35 +10:00
Lachlan Roberts cff4ff6c98 Issue #8296 - attempt to resolve symlinks for baseResource in ContextHandler.doStart() 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-07-21 18:59:51 +10:00
Joakim Erdfelt d9be926b0d
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-07-21 02:40:46 -05:00
Joakim Erdfelt cbed42491a
Excluding Stress/Slow tests from normal CI builds. (#8314) 
Nightly CI builds still run them.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-07-21 02:40:26 -05:00
Joakim Erdfelt 011733df61
Adding slf4j logging to more jetty-ee9-test-maven-plugin IT projects 2022-07-19 14:45:56 -05:00
Joakim Erdfelt f50aeff646
more slf4j logging in tests/jetty-ee10-test-maven-plugin 2022-07-19 11:47:09 -05:00
Joakim Erdfelt 7fb119bb32
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-07-18 12:50:16 -05:00
Joakim Erdfelt 252539d77d
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-07-18 12:39:14 -05:00
Lachlan Roberts 6c35fc6f65 Issue #8259 - AliasCheckers for different resource bases on same Context 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-07-18 17:22:38 +10:00
Lachlan Roberts 5f246ae5d7 Issue #8296 - add test for issue 8296 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-07-18 15:20:44 +10:00
Olivier Lamy 9149945945
simplify pom by using simple property rather than xml fragment (#7580) 
* simplify pom by using simple property rather than xml fragment

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-07-14 09:42:28 +10:00
Jan Bartel e9f68b9338
Issue #8281 Add slf4j impls to forked jetty plugin it tests (#8282) 2022-07-13 14:23:06 +10:00
Ludovic Orban 23a0203547 rework Resource API (#8106) 
* remove Resource.getFile() and replace its usages with Resource.getPath()
* remove all public PathResource ctors + add non-leaky FS mounting mechanism + interpret string as Path when not a schemed URI
* rename Resource.getResource to Resource.resolve, specifying that the subpath is URI-path-interpreted
* remove useless API methods + deprecate all path-related API
* make subpaths beginning with / resolved as relative to the given uri
* introduce filesystem pooling and generalize resource resolving code
* remove URLResource
* remove unneeded factory method
* both file: and jrt: should not be pooled
* move deprecated impls from PathResource down to Resource + fix some tests
* handle Resource's pointing to non-existent jar files
* Force Resource URIs to end with "/" when the resource is a directory
* Produce warning if attempting to release a mounted filesystem uri that doesn't exist in the pool.

Co-authored-by: Greg Wilkins <gregw@webtide.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: Ludovic Orban <lorban@bitronix.be>
 2022-07-12 10:10:30 +10:00
Jan Bartel b521fc4e7e Merge remote-tracking branch 'origin/jetty-12.0.x-enable-distribution-tests-rebase' into jetty-12.0.x 2022-07-09 16:08:36 +10:00
Joakim Erdfelt 0ed713c46b
Try to improve logging output of jetty-ee10-maven-plugin IT tests. 2022-07-08 14:16:28 -05:00
Greg Wilkins 8322899650 reenable ee10 distribution tests 
Signed-off-by:  Jan Bartel <janb@webtide.com>
 2022-07-08 09:52:20 +10:00
Greg Wilkins 33487b5fd8 reenable ee9 distribution tests 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2022-07-08 09:51:29 +10:00
Greg Wilkins c53bc0709c Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-07-07 23:18:17 +10:00
Olivier Lamy ed8c66f482
Using -DskipTests should not run maven-invoker-plugin tests (#8269) 
* remove this hardcoded override

* removed override configuration
 2022-07-07 22:07:34 +10:00
Jan Bartel 5c267ce7ed
Jetty 12.0.x eex jettymavenplugin (#8200) 
* Fix ee9/10 jetty maven plugin and refactor it tests
 2022-06-29 17:18:18 +10:00
Joakim Erdfelt eddff4d2ee
Merge Release 11.0.11 back into `jetty-11.0.x` (#8193) 
* Updating to version 11.0.11

* Updating to version 11.0.12-SNAPSHOT
 2022-06-22 16:24:57 -05:00
Joakim Erdfelt 64d12e2a5a
Merge Release 10.0.11 back into `jetty-10.0.x` branch (#8194) 
* Updating to version 10.0.11

* Updating to version 10.0.12-SNAPSHOT
 2022-06-22 16:24:48 -05:00
Joakim Erdfelt a3616cad80
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-06-21 15:27:24 -05:00
Tamas Cservenak 3fabe540a5
Fix test-distribution classpath re resolver (#8187) 
* Fix test-distribution classpath re resolver

As currently it seems mixed versions of resolver artifacts are
present on classpath. Resolver 1.8.0 introduces a binary
breakage.

Anyway, this fixes the thing, as impl was actually coming in
as transitive dep of maven-resolver-provider, that is NOT
the same version as the rest of resolver dependencies.

Relying on transitive while fixing other versions is wrong.

* Update to resolver 1.8.1

And add exclusion to banned dependency, that is used when
running in SISU container.
 2022-06-21 15:27:06 -05:00
Joakim Erdfelt 8149350c10
Merge Release 11.0.10 back into `jetty-11.0.x` (#8181) 
* Updating to version 11.0.11-SNAPSHOT
 2022-06-21 14:45:00 +02:00
Joakim Erdfelt c2bc103cb9
Merge Release 10.0.10 back into `jetty-10.0.x` (#8180) 
* Updating to version 10.0.11-SNAPSHOT
 2022-06-21 14:41:41 +02:00
Simone Bordet a668810df5
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-06-16 16:00:49 +02:00
Ludovic Orban 1f902f6371
Disable H3 tests by default with a system property to explicitly enable them (#8150) 
Fixes #8149 disable H3 tests by default with a system property to explicitly enable them

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2022-06-16 15:59:58 +02:00
Jan Bartel 56d914e435 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-06-08 10:33:54 +10:00
Jan Bartel 3caee26742
Jetty 10.0.x 7801 duplicate set session cookie (#7808) 
* Issue #7801 Duplicate set session cookie after id change.

Signed-off-by: Jan Bartel <janb@webtide.com>
 2022-06-08 10:15:24 +10:00
Olivier Lamy 253dc1e577 Merge branch 'jetty-11.0.x' into jetty-12.0.x 2022-06-07 11:18:38 +10:00
dependabot[bot] 0eae68e717
Merge pull request #8115 from eclipse/dependabot/maven/jetty-11.0.x/openwebbeans.version-2.0.27 2022-06-06 23:35:12 +00:00
dependabot[bot] af696528f5
Bump org.apache.felix.framework from 7.0.4 to 7.0.5 
Bumps org.apache.felix.framework from 7.0.4 to 7.0.5.

---
updated-dependencies:
- dependency-name: org.apache.felix:org.apache.felix.framework
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-06 09:25:47 +00:00
dependabot[bot] 0d3f2df7a9
Bump openwebbeans.version from 2.0.26 to 2.0.27 
Bumps `openwebbeans.version` from 2.0.26 to 2.0.27.

Updates `openwebbeans-web` from 2.0.26 to 2.0.27
- [Release notes](https://github.com/apache/openwebbeans/releases)
- [Commits](https://github.com/apache/openwebbeans/compare/openwebbeans-2.0.26...openwebbeans-2.0.27)

Updates `openwebbeans-jetty9` from 2.0.26 to 2.0.27
- [Release notes](https://github.com/apache/openwebbeans/releases)
- [Commits](https://github.com/apache/openwebbeans/compare/openwebbeans-2.0.26...openwebbeans-2.0.27)

---
updated-dependencies:
- dependency-name: org.apache.openwebbeans:openwebbeans-web
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.openwebbeans:openwebbeans-jetty9
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-06 09:19:35 +00:00
dependabot[bot] e675db42ca
Bump openwebbeans.version from 2.0.26 to 2.0.27 
Bumps `openwebbeans.version` from 2.0.26 to 2.0.27.

Updates `openwebbeans-web` from 2.0.26 to 2.0.27
- [Release notes](https://github.com/apache/openwebbeans/releases)
- [Commits](https://github.com/apache/openwebbeans/compare/openwebbeans-2.0.26...openwebbeans-2.0.27)

Updates `openwebbeans-jetty9` from 2.0.26 to 2.0.27
- [Release notes](https://github.com/apache/openwebbeans/releases)
- [Commits](https://github.com/apache/openwebbeans/compare/openwebbeans-2.0.26...openwebbeans-2.0.27)

---
updated-dependencies:
- dependency-name: org.apache.openwebbeans:openwebbeans-web
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.openwebbeans:openwebbeans-jetty9
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-03 10:05:53 +00:00
Joakim Erdfelt 3b563d2000
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-06-02 14:17:46 -05:00
Olivier Lamy d12ee70b5a
exclude log4j-core to avoid problem with m-enforcer-p see https://issues.apache.org/jira/browse/LOG4J2-3241 (#8094) 
* exclude log4j-core to avoid problem with m-enforcer-p see https://issues.apache.org/jira/browse/LOG4J2-3241

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-06-02 18:24:28 +10:00
Greg Wilkins 8d06ffad1b fixed bad merge 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2022-06-01 17:46:16 +10:00
Greg Wilkins 8392b0bb12 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-06-01 11:58:07 +10:00
Greg Wilkins 7a1c165677
Implement #8057 103 Early Hint (#8058) 
Co-authored-by: Ludovic Orban <lorban@bitronix.be>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
 2022-06-01 11:56:54 +10:00
Joakim Erdfelt acdb6ccfee
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-05-26 08:48:40 -05:00
Simone Bordet d1e64f4693
Fixes #8014 - Review HttpRequest URI construction. (#8015) 
Fixes #8014 - Review HttpRequest URI construction.

Now always adding a "/" before the path, if not already present.
Disabled flakey HTTP/3 test.
Parse CONNECT URIs as Authority

Co-authored-by: Greg Wilkins <gregw@webtide.com>
 2022-05-26 18:13:17 +10:00
Greg Wilkins b9ff406ba1 WIP deploying webapps 2022-05-10 09:15:35 +02:00
Joakim Erdfelt 4861897606
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-05-06 16:32:45 -05:00
dependabot[bot] c2c1ea8d9a
Bump maven-bundle-plugin from 5.1.4 to 5.1.5 (#7933) 
* Bump maven-bundle-plugin from 5.1.4 to 5.1.5

Bumps maven-bundle-plugin from 5.1.4 to 5.1.5.

---
updated-dependencies:
- dependency-name: org.apache.felix:maven-bundle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Standardize maven-bundle-plugin usage (to avoid build error)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-05-06 16:24:40 -05:00
Jan Bartel 6c81429085 WIP move session tests to ee9 2022-05-04 15:10:13 +02:00
Jan Bartel ca542c0dbc WIP session tests 2022-05-03 18:28:39 +02:00
Greg Wilkins 04acdb72f0 Jetty-12 Restructure 
Copied over non ee10 components from the hackathon branch

Co-authored-by: Greg Wilkins <gregw@webtide.com>
Co-authored-by: Jan Bartel <janb@webtide.com>
Co-authored-by: Joakim Erdfelt <joakim@webtide.com>
Co-authored-by: Lachlan Roberts <lachlan@webtide.com>
Co-authored-by: Ludovic Orban <lorban@webtide.com>
Co-authored-by: Olivier Lamy <olamy@webtide.com>
Co-authored-by: Simone Bordet <sbordet@webtide.com>
 2022-05-03 15:50:54 +02:00
Joakim Erdfelt 16420f0181
Set version to `10.0.10-SNAPSHOT` (#7823) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-04-03 20:33:44 +10:00
Joakim Erdfelt f079949a35
Merge Release 10.0.9 (#7821) 
* Updating to version 10.0.9

* Updating to version 10.0.10
 2022-04-02 08:43:44 -05:00
Joakim Erdfelt 9548ab0cc9 Updating to version 11.0.10-SNAPSHOT 2022-03-30 13:06:46 -05:00
Joakim Erdfelt 243a48a658 Updating to version 11.0.9 2022-03-30 12:43:51 -05:00
Joakim Erdfelt cc0eb6e468
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-03-30 09:13:38 -05:00
dependabot[bot] 6b25c271b1
Bump jolokia-war from 1.3.3 to 1.7.1 (#6907) 
* Bump jolokia-war from 1.3.3 to 1.7.1

Bumps jolokia-war from 1.3.3 to 1.7.1.

---
updated-dependencies:
- dependency-name: org.jolokia:jolokia-war
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

* Adding HashLoginService to jolokia.xml
* Fixing typo in FQCN for Jetty Password utility
* Using logger to print warning, not ServletContext.log() as it causes an NPE.

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-03-29 21:04:35 -05:00
Joakim Erdfelt b419a8956e
Issue #6879 - Remove jminix (#7770) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-03-23 16:02:35 -05:00
Olivier Lamy 5b3c50bc66 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2022-03-09 15:40:09 +10:00
Olivier Lamy 3d4b68d0bc
remove some site configuration, non used checkstyle profile and turn skip xml into one line property (#7687) 
* remove some site configuration, non used checkstyle profile and turn skip xml into one line property

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-03-05 19:47:32 +10:00
Olivier Lamy 39ee9db33e fix build 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-02-18 13:32:55 +10:00
Olivier Lamy 5d64911dec fix build 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-02-18 10:54:33 +10:00
Olivier Lamy 8ad31b9001 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2022-02-17 16:59:24 +10:00
Lachlan 0f5824640a
Merge pull request #7546 from eclipse/jetty-10.0.x-7545-OpenIdXML 
Add distribution test for OpenID and fix issues with jetty-openid.xml
 2022-02-17 09:54:43 +11:00
Jan Bartel bfa74b1533 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-02-11 09:53:11 +11:00
dependabot[bot] 9602120b9b
Bump openwebbeans.version from 2.0.25 to 2.0.26 (#7549) 
Bumps `openwebbeans.version` from 2.0.25 to 2.0.26.

Updates `openwebbeans-web` from 2.0.25 to 2.0.26
- [Release notes](https://github.com/apache/openwebbeans/releases)
- [Commits](https://github.com/apache/openwebbeans/compare/openwebbeans-2.0.25...openwebbeans-2.0.26)

Updates `openwebbeans-jetty9` from 2.0.25 to 2.0.26
- [Release notes](https://github.com/apache/openwebbeans/releases)
- [Commits](https://github.com/apache/openwebbeans/compare/openwebbeans-2.0.25...openwebbeans-2.0.26)

---
updated-dependencies:
- dependency-name: org.apache.openwebbeans:openwebbeans-web
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.openwebbeans:openwebbeans-jetty9
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-02-10 12:11:00 -06:00
Lachlan Roberts 2c60549eee Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-7545-OpenIdXML 2022-02-08 16:02:11 +11:00
Lachlan Roberts 5fe999caa2 Issue #7545 - changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-02-08 15:59:23 +11:00
Lachlan Roberts 58c230e26c Issue #7545 - add distribution test for jetty-openid so that we can test XML 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-02-08 15:28:02 +11:00
Simone Bordet 4e02be57fd
Updating to version 11.0.9-SNAPSHOT 2022-02-07 12:42:04 +01:00
Simone Bordet 79cc9cf90e
Updating to version 11.0.8 2022-02-07 12:10:09 +01:00
Simone Bordet a4fda96f49
Updating to version 10.0.9-SNAPSHOT 2022-02-07 12:02:02 +01:00
Simone Bordet 716c7afd8e
Updating to version 10.0.8 2022-02-07 11:34:12 +01:00
Joakim Erdfelt b24f15f516
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-02-01 13:59:09 -06:00
Joakim Erdfelt 3791f38684
Issue #6017 - fix accidentally broken k+=v property usage (#7510) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-02-01 13:58:41 -06:00
Lachlan Roberts 66a68c9c61 Merge branch 'jetty-11.0.x' of github.com:eclipse/jetty.project into jetty-11.0.x 2022-02-01 15:05:39 +11:00
Lachlan Roberts 0e1ab2f3de Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-02-01 15:05:15 +11:00
Joakim Erdfelt f1ac7e081b
Issue #7494 - remove unsupported modules (#7495) 
* Issue #7494 - Remove jolokia module

* Issue #7494 - Remove jminix module (doesn't support jakarta.servlet)

* Issue #7494 - Remove jamon module (doesn't support jakarta.servlet)

* Issue #7494 - Remove hawtio module (doesn't support jakarta.servlet)

* Issue #7494 - Removing version properties for removed modules

* Issue #7494 - Removing test dist tests for removed modules
 2022-01-31 20:49:41 -06:00
Lachlan b0e334f14a
Run WebSocket Autobahn test for all Jetty, Javax and Core APIs (#7430) 
* Run WebSocket Autobahn test for all Jetty, Javax and Core APIs

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

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-01-31 15:29:41 +10:00
Simone Bordet a5d0c04f35
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-01-28 12:54:17 +01:00
Joakim Erdfelt 43cb27b36d
Fix test compile due to mariadb 3.x API change 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-01-27 11:31:07 -06:00
Joakim Erdfelt be58156c77
Happy New Year 2022 (#7460) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-01-27 10:42:43 -06:00
Joakim Erdfelt cb127793e5
Happy New Year 2022 (#7459) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-01-27 10:42:30 -06:00
Ludovic Orban 5b2eaf0881 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2022-01-20 15:50:08 +01:00
Ludovic Orban e4140e2ee4 #7318 disable assertion for H3 as it's not a valid assertion for UDP 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2022-01-20 15:22:11 +01:00
Ludovic Orban aef7480765 #7318 fix the assertion parameters' order 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2022-01-20 15:22:11 +01:00
Jan Bartel 9dce2ceb42 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-01-14 15:48:59 +11:00
Jan Bartel 0613818c5e
Issue #7375 Request scoped sessions (#7390) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2022-01-14 15:39:38 +11:00
Ludovic Orban 4d05400112 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2022-01-13 15:12:19 +01:00
Ludovic Orban 91f29a04a9 #7281 pass special content to interceptors 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2022-01-13 15:06:32 +01:00
Joakim Erdfelt e0688f21a2
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-12-28 20:12:12 -06:00
dependabot[bot] 90bb17d86d
Bump openwebbeans.version from 2.0.24 to 2.0.25 
Bumps `openwebbeans.version` from 2.0.24 to 2.0.25.

Updates `openwebbeans-web` from 2.0.24 to 2.0.25
- [Release notes](https://github.com/apache/openwebbeans/releases)
- [Commits](https://github.com/apache/openwebbeans/commits)

Updates `openwebbeans-jetty9` from 2.0.24 to 2.0.25
- [Release notes](https://github.com/apache/openwebbeans/releases)
- [Commits](https://github.com/apache/openwebbeans/commits)

---
updated-dependencies:
- dependency-name: org.apache.openwebbeans:openwebbeans-web
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.openwebbeans:openwebbeans-jetty9
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-20 09:19:55 +00:00
Simone Bordet 2de20c3520
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-20 10:00:26 +01:00
Simone Bordet 0236b7ebd8 Issue #6728 - QUIC and HTTP/3 
Fixed test by approving licenses in DistributionTests.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-20 09:33:38 +01:00
Simone Bordet 578ae30311 Issue #6728 - QUIC and HTTP/3 
Added http3 Jetty module and distribution test.
Implemented simple logic to send the Alt-Svc header in HTTP/2 responses.
Updated JNA dependency to use jna-jpms.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-20 09:33:38 +01:00
Simone Bordet bf64d4bc18 Issue #6728 - QUIC and HTTP/3 
- Incremented test timeouts.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-20 09:33:38 +01:00
Simone Bordet 5f5312ed55 Issue #6728 - QUIC and HTTP/3 
- Larger timeout for file upload test.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-20 09:33:38 +01:00
Simone Bordet 3d2f3ddd10 Issue #6728 - QUIC and HTTP/3 
- Test logging at INFO level.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-20 09:33:38 +01:00
Simone Bordet b9d63ef10e Issue #6728 - QUIC and HTTP/3 
- Giving up on trying to get Jenkins run UDP/QUIC/HTTP3 load tests.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-20 09:33:38 +01:00
Simone Bordet a587b42ba7 Issue #6728 - QUIC and HTTP/3 
- Trying to replicate test failures.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-20 09:33:38 +01:00
Simone Bordet 19344ec030 Issue #6728 - QUIC and HTTP/3 
- Trying to replicate test failures.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-20 09:33:38 +01:00
Simone Bordet 39bf6eb996 Issue #6728 - QUIC and HTTP/3 
- Trying to replicate test failures.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-20 09:33:38 +01:00
Simone Bordet 5263b14864 Issue #6728 - QUIC and HTTP/3 
- Trying to replicate test failures.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-20 09:33:38 +01:00
Simone Bordet 6c56f5c5d3 Issue #6728 - QUIC and HTTP/3 
- Trying to replicate test failures.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-20 09:33:38 +01:00
Simone Bordet 2a761c35eb Issue #6728 - QUIC and HTTP/3 
- Trying to replicate test failures.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-20 09:33:38 +01:00
Simone Bordet 51dc1046c0 Issue #6728 - QUIC and HTTP/3 
- Trying to replicate test failures.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-20 09:33:38 +01:00
Simone Bordet 4b49dbb54f Issue #6728 - QUIC and HTTP/3 
- Try to pinpoint the elusive failures.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-20 09:33:38 +01:00
Simone Bordet eb8444e2c2 Issue #6728 - QUIC and HTTP/3 
- Incremented test timeouts.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-20 09:33:38 +01:00
Simone Bordet 95d835685f Issue #6728 - QUIC and HTTP/3 
- Incremented test timeouts and decremented runs to allow H3 to finish.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-20 09:33:38 +01:00
Simone Bordet a7ec4ff525 Issue #6728 - QUIC and HTTP/3 
- Fixed parsing of HEADERS frames.
- Fixed locking in QpackEncoder.
- Fixed creation of QuicStreamEndPoints.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-20 09:33:38 +01:00
Simone Bordet cd1343fd6c Issue #6728 - QUIC and HTTP/3 
- More test fixes.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-20 09:33:38 +01:00
Simone Bordet a31c35e9ad Issue #6728 - QUIC and HTTP/3 
- Fixed test case to work more consistently with HTTP/3.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-20 09:33:38 +01:00
Simone Bordet 4c22ae9e1b Issue #6728 - QUIC and HTTP/3 
- Fixed idle timeout handling.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-20 09:33:38 +01:00
Simone Bordet 6aedfe52f1 Issue #6728 - QUIC and HTTP/3 
- Fixed HttpChannelOverHTTP3 input reading.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-20 09:33:38 +01:00
Simone Bordet 85a13cfc20 Issue #6728 - QUIC and HTTP/3 
- Fixed buffer release to avoid leaks.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-20 09:33:38 +01:00
Simone Bordet aadc86d36a Issue #6728 - QUIC and HTTP/3 
- More fixes and improvement to HTTP client transport tests.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-20 09:33:38 +01:00
Simone Bordet 6fbe79af46 Issue #6728 - QUIC and HTTP/3 
- Fixed UNIX_DOMAIN tests.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-20 09:33:38 +01:00
Simone Bordet baab1a15b9 Issue #6728 - QUIC and HTTP/3 
- More fixes and improvement to HTTP client transport tests.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-20 09:33:38 +01:00
Simone Bordet aac4232e20 Issue #6728 - QUIC and HTTP/3 
- More fixes and improvement to HTTP client transport tests.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-20 09:33:38 +01:00
Simone Bordet 00a4001b5c Issue #6728 - QUIC and HTTP/3 
- More fixes and improvement to HTTP client transport tests.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-20 09:33:38 +01:00
Simone Bordet 40aba07e33 Issue #6728 - QUIC and HTTP/3 
- More work on making HTTP semantic layer work on top of HTTP/3.
- Various fixes and improvement to HTTP client transport tests.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-20 09:33:38 +01:00
Simone Bordet 3585b408b7 Issue #6728 - QUIC and HTTP/3 
- Made sure Connection.Listeners are properly notified.
- Fixed removal of QuicStreamEndPoints from QuicSession in case of successful request/response exchanges.
- Avoid spurious wakeups by shutting down input after receiving a frame with last=true.
- Updated HttpClient transport tests to work with UNIX_DOMAIN.
- Started updating HttpClient transport tests to work with HTTP/3.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-20 09:33:38 +01:00
Ludovic Orban 16cbcc0e4f HttpDestination can now be told to use cleartext even when the scheme is secure 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-12-20 09:33:38 +01:00
Olivier Lamy 33ab7183dc Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-12-11 13:51:08 +10:00
dependabot[bot] e4677b1677
Bump openwebbeans.version from 2.0.23 to 2.0.24 (#7245) 
Bumps `openwebbeans.version` from 2.0.23 to 2.0.24.

Updates `openwebbeans-web` from 2.0.23 to 2.0.24
- [Release notes](https://github.com/apache/openwebbeans/releases)
- [Commits](https://github.com/apache/openwebbeans/compare/openwebbeans-2.0.23...openwebbeans-2.0.24)

Updates `openwebbeans-jetty9` from 2.0.23 to 2.0.24
- [Release notes](https://github.com/apache/openwebbeans/releases)
- [Commits](https://github.com/apache/openwebbeans/compare/openwebbeans-2.0.23...openwebbeans-2.0.24)

---
updated-dependencies:
- dependency-name: org.apache.openwebbeans:openwebbeans-web
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.openwebbeans:openwebbeans-jetty9
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-12-10 09:46:23 -06:00
Jan Bartel 672de5ab4d Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-12-08 09:41:46 +11:00
Jan Bartel 9bd1e436c5
Issue #7132 Update demos (#7133) 
* Issue #7132 Update demos
 2021-12-08 09:18:50 +11:00
Lachlan Roberts 0d9fe66e8a Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-12-07 09:45:49 +11:00
Lachlan e345ee28a5
Issue #7059 - prevent an internal NPE in AllowedResourceAliasChecker doStart (#7076) 
- prevent an internal NPE in AllowedResourceAliasChecker doStart
- Fix LifeCycle issues with AllowedResourceAliasChecker
- add null check for protected targets in toString.
- improve warning message for AllowedResourceAliasChecker
- add AllowedResourceAliasCheckerTest
 2021-12-07 09:37:11 +11:00
Simone Bordet c030b761f1
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-02 10:13:10 +01:00
Simone Bordet 1ea012afde
Issue #7111 - Add support to deprecate jetty-home modules. (#7125) 
* Issue #7111 - Add support to deprecate jetty-home modules.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-02 10:09:05 +01:00
Simone Bordet 5b153e1f78
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-01 17:37:17 +01:00
Simone Bordet cb25a83667
Issue #6728 - Prepare for QUIC and HTTP/3 (#7100) 
* Issue #6728 - QUIC and HTTP/3

Modifications to Jetty to prepare for QUIC/HTTP3.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-01 09:39:51 +01:00
Joakim Erdfelt 955ed14bfe
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-11-17 10:11:02 -06:00
Joakim Erdfelt ec3d7dbe92
Issue #6017 - Start Property Overrides (#7118) 
* Issue #6017 - jetty-start Property override behavior

+ All *.mod based configuration defaults are default
  properties are not forced values and can be overridden.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-11-17 10:10:29 -06:00
Olivier Lamy 97cd015f5e Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-11-17 20:01:59 +10:00
Olivier Lamy 4868ed0acd
Issue #7034 infinispan flaky tests on CI, force TCP over UDP for jgroups multicasting as it is too slow with kubernetes (#7122) 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2021-11-17 15:50:22 +10:00
Lachlan Roberts a99b1d90d0 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-11-17 09:52:01 +11:00
Lachlan dd0613193c
Merge pull request #7000 from eclipse/jetty-10.0.x-1087-WellKnown 
Issue #1087 - add module for a .well-known handler
 2021-11-17 09:51:26 +11:00
Joakim Erdfelt 9537a365dd
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-11-15 13:06:16 -06:00
Olivier Lamy 0ad49fd1fd
Jetty 10.0.x correctly shutdown infinispan between tests (#7066) 
* correctly shutdown infinispan after each test class

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2021-11-09 15:34:47 +10:00
Jan Bartel 67883dea76 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-11-02 16:05:45 +11:00
Jan Bartel e0d465e39a
Issue #7012 Replace geronimo spec jars with jakarta equivalents (#7013) 
* Issue #7012 Replace geronimo spec jars with jakarta equivalents

Signed-off-by: Jan Bartel <janb@webtide.com>
 2021-11-02 10:37:27 +11:00
Joakim Erdfelt 60e5c4811f
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-10-22 10:53:10 -05:00
dependabot[bot] d4ee8d522a
Bump testcontainers-bom from 1.16.0 to 1.16.1 (#7019) 
* Bump testcontainers-bom from 1.16.0 to 1.16.1

Bumps [testcontainers-bom](https://github.com/testcontainers/testcontainers-java) from 1.16.0 to 1.16.1.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.16.0...1.16.1)

---
updated-dependencies:
- dependency-name: org.testcontainers:testcontainers-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

* use mongodb testcontainer module and upgrade a bit mongodb version
* give it more time to start
* use mongo image from test container api for distribution test
* create only once
* use a different wait strategy based on log rather than port as hazelcast try to do some broadcastind
* change wait for strategy

Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-22 10:50:45 -05:00
Lachlan Roberts dcc6cc435f Issue #1087 - add documentation and distribution test 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-10-22 16:43:22 +11:00
Joakim Erdfelt b67ffd3d2d Updating to version 11.0.8-SNAPSHOT 2021-10-06 15:16:07 -05:00
Joakim Erdfelt 389a358772 Updating to version 11.0.7 2021-10-06 14:58:52 -05:00
Joakim Erdfelt cfc67f86d2 Updating to version 10.0.8-SNAPSHOT 2021-10-06 14:51:32 -05:00
Joakim Erdfelt da8a4553af Updating to version 10.0.7 2021-10-06 14:32:37 -05:00
Simone Bordet 0412bdc3d9 Fixes #6938 - module-info.java file do not use the canonical order for the elements 
Changed order of entries in module-info.java to be canonical

(cherry picked from commit 02691171d5)
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-10-01 09:25:55 +02:00
Olivier Lamy 4011f1e71e
merge jetty-10.0.x (#6945) 2021-09-30 20:41:49 +10:00
Olivier Lamy 51d44a3401
use dependencyManagement for internal dependencies (#6940) 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2021-09-30 16:57:19 +10:00
Dr Heinz M. Kabutz 02691171d5 Changed order of entries in module-info.java to be canonical 2021-09-30 08:29:51 +02:00
Joakim Erdfelt 52fc22fd89
Restore accidentally removed `<requireUpperBoundDeps/>` 
+ Fix upper bound deps that were missed without it

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-09-23 10:29:23 -05:00
Greg Wilkins 8c283a733d Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-09-23 17:37:26 +10:00
Greg Wilkins aac366c300
Fix #6883 relative welcome redirect (#6886) (#6894) 
* Fix #6883 relative welcome redirect (#6886)

Fix #6883 relative welcome redirect
 + make all redirects able to be relative
 + added test for relative redirection in ResourceService

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2021-09-23 15:37:56 +10:00
Joakim Erdfelt 85c7250d1a
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-09-22 17:10:49 -05:00
Joakim Erdfelt 5b6c3f145c
More artifact cleanup javax.* to jakarta.* 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-09-22 10:41:30 -05:00
Joakim Erdfelt 8dd62838f7
Initial cleanup / reorg of dependencies 
+ All plugins and dependencies are alphabetized now
+ All plugins and dependency versions have properties now

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-09-22 09:54:52 -05:00
Greg Wilkins aa793eeafe
Jetty 10.0.x 6497 alias checkers alt (#6681) 
* Issue #6497 - Replace the Alias checkers with new implementation.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
Co-authored-by: Lachlan Roberts <lachlan@webtide.com>
 2021-09-21 18:35:51 +10:00
Jan Bartel d114d8ffc4 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-09-21 11:49:36 +10:00
Jan Bartel d3bfb61761
Jetty 10.0.x 6687 upgrade infinispan (#6766) 
* Issue #6687 Update to infinispan 11.0.11

Signed-off-by: Jan Bartel <janb@webtide.com>


* fix upperbound dependency
* use infinispan bom

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

Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
 2021-09-21 11:16:50 +10:00
Joakim Erdfelt e629e1c26e
Merge pull request #6797 from eclipse/jetty-10.0.x-version-rollup 
Rollup of version changes for 10.0.x
 2021-09-13 18:20:27 -05:00
Olivier Lamy d90c7152d5 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-09-14 06:21:42 +10:00
dependabot[bot] b44dde6098
Bump maven-enforcer-plugin from 3.0.0-M3 to 3.0.0 (#6755) 
* Bump maven-enforcer-plugin from 3.0.0-M3 to 3.0.0

Bumps [maven-enforcer-plugin](https://github.com/apache/maven-enforcer) from 3.0.0-M3 to 3.0.0.
- [Release notes](https://github.com/apache/maven-enforcer/releases)
- [Commits](https://github.com/apache/maven-enforcer/compare/enforcer-3.0.0-M3...enforcer-3.0.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-enforcer-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* fix some upper bound issues and exclude more javax

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

* fix upperbound dependencies issue with enforcer plugin upgrade

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

* exclude this wrong which makes enforcer plugin fail and btw it's not used

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

* fix last enforcer upperbound issues

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
 2021-09-14 06:10:48 +10:00
Joakim Erdfelt 976ce25b89
Bump openwebbeans.version to 2.0.23 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-09-13 14:18:43 -05:00
Jan Bartel 147ea963cc Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-09-10 10:24:13 +10:00
Jan Bartel 3b04e5af97
Issue #6735 Fix xml for infinispan-remote-query and infinispan-embedded-query (#6747) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2021-09-10 10:12:05 +10:00
dependabot[bot] d51cec2d1d
Bump openwebbeans.version from 2.0.20 to 2.0.23 (#6750) 
Bumps `openwebbeans.version` from 2.0.20 to 2.0.23.

Updates `openwebbeans-web` from 2.0.20 to 2.0.23
- [Release notes](https://github.com/apache/openwebbeans/releases)
- [Commits](https://github.com/apache/openwebbeans/compare/openwebbeans-2.0.20...openwebbeans-2.0.23)

Updates `openwebbeans-jetty9` from 2.0.20 to 2.0.23
- [Release notes](https://github.com/apache/openwebbeans/releases)
- [Commits](https://github.com/apache/openwebbeans/compare/openwebbeans-2.0.20...openwebbeans-2.0.23)

---
updated-dependencies:
- dependency-name: org.apache.openwebbeans:openwebbeans-web
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.openwebbeans:openwebbeans-jetty9
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-09-10 08:59:40 +10:00
dependabot[bot] 30b42d20d9
Bump org.apache.felix.framework from 6.0.3 to 7.0.1 (#6707) 
Bumps org.apache.felix.framework from 6.0.3 to 7.0.1.

---
updated-dependencies:
- dependency-name: org.apache.felix:org.apache.felix.framework
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-09-09 17:41:52 +10:00
Olivier Lamy 91e2de166e
fix parent version 2021-09-03 18:08:54 +10:00
Olivier Lamy f3e55848e5
fix parent version 2021-09-03 18:08:22 +10:00
Lachlan Roberts 4317c17c84 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-09-02 10:26:33 +10:00
Lachlan Roberts 59a5b7c9ef Changes from review. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-08-31 11:28:59 +10:00
Lachlan Roberts ead1f6b160 Issue #6601 - export websocket-core-common to jetty-util for DecoratedObjectFactory 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-08-30 11:43:54 +10:00
Lachlan Roberts e64b390fd6 Issue #6601 - add proper JPMS testing for websocket-core 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-08-30 11:11:20 +10:00
Joakim Erdfelt bda0c97f62
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-08-26 11:27:23 -05:00
Joakim Erdfelt c5a33e27d2
Issue #5684 - Windows test overhaul (#6581) 
Issue #5684 - Window's test overhaul

+ Migrate from @DisabledOnOs(WINDOWS) to assumptions on capabilities instead.
+ Fix other outstanding windows testing issues.
+ Cleanup FileBufferedResponseHandlerTest expectations on Windows.
+ PathWatcher scan interval is variable on windows
+ If unable to start testcase based on assumption,
  the stop shouldn't fail testcase
+ Increase various wait timeouts
+ Make tests less strict due to system speed issues
+ Disable Sni tests due to TLS behaviors differences in Windows
  + Windows TLSv1.3 seems to introduce this difference
  + If we restrict to TLSv1.2 this passes.
  + On Linux TLSv.13 on client side will always return a
  + javax.net.ssl.SSLHandshakeException in those test cases that expect it.
  + However, on Windows, Only the TLSv1.2 implementation will return a javax.net.ssl.SSLHandshakeException,
  + All other TLS versions on Windows will result in a
  + javax.net.ssl.SSLException: Software caused connection abort: recv failed
+ Disable ConcurrentStreamCreationTest
  + Not possible to create all of these streams.
+ Fixing DeploymentTempDirTest
  + Using unique workdir per testcase.
  + Don't expect to delete files / directories between tests
    (not supported on windows due to file locking anyway)
 + Fixing line ending difference on windows
 + InvalidPathException is a 404 Not Found
 + Cannot reuse test directory between runs due to memory mapped files that are still in use from previous run.
 + java.nio.file.FileSystemException: C:\code\jetty.project\jetty-webapp\target\tests\welcome#\index.html: The requested operation cannot be performed on a file with a user-mapped section open.

	at java.base/sun.nio.fs.WindowsException.translateToIOException(WindowsException.java:92)
	at java.base/sun.nio.fs.WindowsException.rethrowAsIOException(WindowsException.java:103)
	at java.base/sun.nio.fs.WindowsException.rethrowAsIOException(WindowsException.java:108)
	at java.base/sun.nio.fs.WindowsFileSystemProvider.newByteChannel(WindowsFileSystemProvider.java:235)
	at java.base/java.nio.file.spi.FileSystemProvider.newOutputStream(FileSystemProvider.java:478)
	at java.base/java.nio.file.Files.newOutputStream(Files.java:220)
	at org.eclipse.jetty.webapp/org.eclipse.jetty.webapp.WebAppDefaultServletTest.prepareServer(WebAppDefaultServletTest.java:84)

 + As is typical on windows, we are often unable to delete a file due to file locking issues.
 + Use a unique resource base between tests.
   This is to avoid file locking behaviors that prevent the
   resource base from being reused too quickly on windows.
 + Prevent test run if symlinks not supported
 + Allowing for Windows slosh char as well in asserts
 + SelectorUtils is File.separator dependent
 + Regex is now FS.separator independent
 + Using SelectorUtils from plexus correctly for include/exclude
 + Turning off mapped files for testing reasons.
 + Fix and re-enable RFC2616NIOHttpsTest
 + Issue #6552 - Fix test failures due to slf4j dep
 + Issue #6552 - upgrade testcontainers
 + Issue #6552 - move to assumption based docker existence
 + Issue #6552 - Fix enforcer rule violation on jna.
  Addresses the following side effect of upgrading testcontainers.

[WARNING] Rule 3: org.apache.maven.plugins.enforcer.RequireUpperBoundDeps failed with message:
Failed while enforcing RequireUpperBoundDeps. The error(s) are [
Require upper bound dependencies error for net.java.dev.jna:jna:5.6.0 paths to dependency are:
+-org.eclipse.jetty:infinispan-remote-query:10.0.7-SNAPSHOT
  +-org.testcontainers:testcontainers:1.16.0
    +-com.github.docker-java:docker-java-transport-zerodep:3.2.11
      +-net.java.dev.jna:jna:5.6.0 (managed) <-- net.java.dev.jna:jna:5.8.0

 + use annotation to disable test when docker not available and needed
 + Disabling FileSessionDistributionTests.stopRestartWebappTestSessionContentSaved on Windows
 + Using TLS basic
 + Programmatic removal of memory mapped behavior during testing
 + Fixing slf4j warning

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
 2021-08-26 11:26:46 -05:00
Jan Bartel 7b52e9b5de Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2021-08-19 12:39:32 +10:00
Olivier Lamy 1acf54ba59
Upgrade h2spec-maven-plugin to 1.0.6 (#6616) 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2021-08-19 09:06:52 +10:00
Simone Bordet 27288cef9c
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-08-13 17:54:41 +02:00
Simone Bordet 4af93b5e19
Issue #6476 - warn on exec (#6597) 
Fixes #6476 - Show message if JVM args are present but new JVM is spawned

* Improved documentation by correctly redacting out `jetty-halt.xml`,
an XML file that is only necessary for rendering the documentation.
* Added WARN message when new JVM is spawned.
* Updated documentation.
* Updated --list-config to report whether a JVM is forked.
* Added test case.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-08-13 17:32:53 +02:00
Ludovic Orban 7e39d5434a Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-08-12 10:56:01 +02:00
Ludovic Orban 15bef0c9ed #6327 rework testRequestIdleTimeout and merge http(s) and fcgi test 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-08-12 10:47:24 +02:00
Ludovic Orban 0a98a37cb6 #6327 wait for the request to be committed before sending the data 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-08-12 10:47:24 +02:00
Ludovic Orban 72505af846 #6327 stop relying on timeouts to abort tested requests 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-08-12 10:47:24 +02:00
Ludovic Orban 8766bddb50 #6327 improve test 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-08-12 10:47:24 +02:00
Ludovic Orban 37eb7909be #6327 enable HttpClientStreamTest.testUploadWithDeferredContentProviderFromInputStream 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-08-12 10:47:24 +02:00
Ludovic Orban 2868eea9cc #6327 enable all disabled tests in HttpClientContinueTest 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-08-12 10:47:24 +02:00
Ludovic Orban 7867d51c91 #6327 replace Await helper with awaitility 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-08-12 10:47:24 +02:00
Ludovic Orban 5dc856196e #6327 extract HttpOutput._apiState value from toString 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-08-12 10:47:24 +02:00
Ludovic Orban 26d144d708 #6327 enable AsyncIOServletTest.testAsyncWriteClosed 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-08-12 10:47:24 +02:00
Olivier Lamy ed667cc736
disabled those tests as third parties app are not jakarta ready (#6589) 
* disabled those tests as third parties app are not jakarta ready

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2021-08-10 15:09:28 +10:00
Olivier Lamy 40e6ab2be4 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-08-06 12:09:11 +10:00
Olivier Lamy c7f0c5a4ca
Issue #6373 testing modules, starting with session storage (#6529) 
* Issue #6373 testing modules, starting with session storage

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2021-08-06 12:07:09 +10:00
Simone Bordet 832b7a0be0
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-08-05 10:18:39 +02:00
Simone Bordet 49a08450c2
Fixes #6043 - Reimplement UnixSocket support based on Java 16. (#6522) 
Fixes #6043 - Reimplement UnixSocket support based on Java 16.

* Introduced new module "jetty-server-unixdomain".
It uses reflection to access the Java 16 Unix-Domain classes to keep compatibility with the other modules and the build.
* Added Jetty module with only HTTP/1.1 support for now (requires review of the modules to reuse them with various connectors).
* Updated documentation to mention UnixDomainServerConnector.
* Updated client libraries to support Unix-Domain.
* Updated PROXY protocol implementation to support Unix-Domain.
* Replaced unix.socket.tmp with better named jetty.unixdomain.dir property.
Defaulted jetty.unixdomain.dir property to system property user.home under Windows.
Simplified code that runs Unix-Domain tests.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-08-05 10:04:37 +02:00
Joakim Erdfelt 7f325dfc6e
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-07-30 13:47:55 -05:00
Joakim Erdfelt 3868360555
Issue #6544 - More updates based on review and merge 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-07-30 07:29:59 -05:00
Joakim Erdfelt 4d35dd736d
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-6544-gziphandler-excludedMimeTypes 2021-07-30 07:25:18 -05:00
Joakim Erdfelt 72fc018cc5
Issue #6544 - Updates based on review 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-07-30 07:25:03 -05:00
Joakim Erdfelt 14962805ec
Import cleanup 2021-07-28 05:56:33 -05:00
Joakim Erdfelt 26b4a1143e
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-07-28 05:50:15 -05:00
Joakim Erdfelt 1bdb69dc07
Issue #6544 - Fixing broken `jetty.gzip.excludedMimeTypeList` property support 
+ Adding GzipHandler tests
+ Adding Gzip module tests
+ Updating jetty-gzip.xml for
  includedMimeTypesList and
  excludedMimeTypesList behavior
+ Adding GzipHandler support for
  setIncludedMimeTypesList(String) and
  setExcludedMimeTypesList(String

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-07-27 11:36:56 -05:00
Joakim Erdfelt fdc210f382
Remove unused imports 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-07-27 08:03:00 -05:00
Olivier Lamy 08ace84dca Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-07-25 21:24:49 +10:00
Olivier Lamy 41481669af
use bom for junit with upgrade to 5.7.2 and testcontainer dependencies (#6532) 
* use bom for junit and testcontainer dependencies

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

* remove some duplicate and redundant dependencies declaration as we now have the bom

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2021-07-25 21:23:57 +10:00
Olivier Lamy 8038ebd69c fix import 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2021-07-22 16:59:01 +10:00
Olivier Lamy 9a7d9fb931 fix version 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2021-07-22 16:47:49 +10:00
Olivier Lamy 0e17ee75c8 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-07-22 16:39:05 +10:00
Olivier Lamy 6f3a694250
cherry-pick hazelcast remote distribution test from 9.4.x (#6068) (#6516) 
* cherry-pick jetty hazelcast remote distribution test from jetty-9.4.x (#6068)

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2021-07-20 15:38:46 +10:00
Joakim Erdfelt 9306829a09
Merge pull request #6504 from eclipse/release-11.0.6 
Merge Release 11.0.6
 2021-07-07 08:21:36 -05:00
Lachlan Roberts 273144526e Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-07-06 16:08:53 +10:00
Joakim Erdfelt 102caac3fe Updating to version 11.0.7-SNAPSHOT 2021-06-29 11:40:18 -05:00
Joakim Erdfelt 6946943289 Updating to version 11.0.6 2021-06-29 11:15:33 -05:00
Joakim Erdfelt c245a70893 Updating to version 10.0.7-SNAPSHOT 2021-06-29 10:51:22 -05:00
Joakim Erdfelt 37e7731b4b Updating to version 10.0.6 2021-06-29 10:27:56 -05:00
Lachlan 3c32afa05c
Issue #6473 - canonicalPath refactor & fix alias check in PathResource (Jetty-10) (#6478) 
Issue #6473 - canonicalPath refactor & fix alias check in PathResource

* Reverted %-escape handling for URI query parts.
* Performing canonicalization in ServletContext.getResource(),
  and improving alias checking in ContextHandler.getResource().
* Performing canonicalization checks in Resource.addPath() to avoid
  navigation above of the root.
* Test added and fixed.
* Various cleanups.
* Improved javadoc and comments
* Compliance mode HttpURI uses UriCompliance.Violation

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Greg Wilkins <gregw@webtide.com>
 2021-06-29 15:42:39 +02:00
Joakim Erdfelt c1b6e30471
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-06-23 18:14:25 -05:00
Joakim Erdfelt ca360176b3
Issue #6464 - fix logging capture modules 
+ Adding distribution tests for logging module combinations.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-06-23 07:35:38 -05:00
Greg Wilkins ece8feb4a0 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2021-06-17 08:54:35 +10:00
Greg Wilkins a415606e01
Rename EWYK The AdaptiveExecutionStrategy (#6353) 
Rename EWYK to AdaptiveExecutionStrategy, which better represents the nature of the strategy.

Updated the documentation 
Refactored substrategy selection for code clarity.
Added notes about chaining strategies and thread starvation

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
 2021-06-16 17:22:08 +10:00
Joakim Erdfelt 89d2ea0192 Updating to version 11.0.6-SNAPSHOT 2021-06-11 10:12:15 -05:00
Joakim Erdfelt 50df216262 Updating to version 11.0.5 2021-06-11 09:52:40 -05:00
Joakim Erdfelt 9d2d1e29b7 Updating to version 10.0.6-SNAPSHOT 2021-06-11 09:42:42 -05:00
Joakim Erdfelt dc21b2d73c Updating to version 10.0.5 2021-06-11 09:18:00 -05:00
Ludovic Orban 61a30e381d Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-06-10 15:49:43 +02:00
Ludovic Orban 33c1b14ada #6379: requeue at the tail to reduce contention + use a simpler concurrent queue implementation 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-06-10 15:45:11 +02:00
Jan Bartel 3648b3916c Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-06-10 21:27:05 +10:00
Jan Bartel 900c71902c
Issue #6327 Remove DisabledOnJre or test where appropriate (#6386) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2021-06-10 21:26:16 +10:00
Joakim Erdfelt 063e8c80d5 Updating to version 11.0.5-SNAPSHOT 2021-06-04 13:53:06 -05:00
Joakim Erdfelt 5bcdeb52ae Updating to version 11.0.4 2021-06-04 13:35:11 -05:00