Commit Graph

2911 Commits

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