fab644151a
Tag flaky test - DistributionTests.testVirtualThreadPool
2022-12-06 09:32:15 -06:00
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
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
21e8fc185e
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x
2022-12-01 11:07:38 -06:00
838728201f
force inject javax.inject
...
Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-11-30 13:21:01 +10:00
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
b961ba77cc
Merge branch 'jetty-10.0.x' into jetty-11.0.x
2022-11-29 21:36:10 +10:00
c1e570d40e
java inject looks to be needed now
...
Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-11-29 19:03:01 +10:00
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
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
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
18f22816c9
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x
2022-11-17 13:01:00 -06:00
cba414f255
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2022-11-17 11:51:54 -06:00
ae6ffdc135
Correct osgi bundle-name
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-11-16 08:36:34 -06:00
23c989c6ef
Cleanup imports
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-11-16 08:31:02 -06:00
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
6b96b0d5e6
Issue #8895 - More reliable JettyHomeTester.unzip
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-11-16 08:23:18 -06:00
62746d9d44
review comments
2022-11-16 20:57:07 +10:00
1eb3cd91ab
use Awaitility
...
Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-11-16 12:55:34 +10:00
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
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
a636a7d153
Adding some more test tags
2022-11-10 10:14:58 -06:00
539777492e
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2022-11-10 17:20:21 +11:00
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
3ffc29f669
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2022-11-08 18:09:01 -06:00
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
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
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
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
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
fbd4387a3e
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2022-11-04 15:42:41 -05:00
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
0a14cca307
changes from review - rename resolveAlias to followLinks
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-03 20:37:55 +11:00
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
336bba04c5
Re-introduced JMH tests
...
Added stream vs iterator
2022-10-31 15:15:40 +11:00
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
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
e2e59478ce
Update in response to PR comments.
2022-10-24 13:17:25 -04:00
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
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
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
756cf2102e
Fix jaas demos ( #8689 )
...
* Fix jaas demos add distro test
2022-10-12 09:33:14 +11:00
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
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
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
1cc91d36ef
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2022-09-23 14:42:23 +10:00
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
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
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
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
Joakim Erdfelt
Simone Bordet
Greg Wilkins
Olivier Lamy
Lachlan Roberts
Gili Tzabari
Jan Bartel
Olivier Lamy