Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
28,364 Commits 68 Branches 462 Tags 354 MiB
Commit Graph

3052 Commits

Author SHA1 Message Date
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