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 70 Branches 462 Tags 370 MiB
Commit Graph

3287 Commits

Author SHA1 Message Date
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
Joakim Erdfelt 987066aac1 Updating to version 10.0.5-SNAPSHOT 2021-06-04 13:28:47 -05:00
Joakim Erdfelt 5523480c54 Updating to version 10.0.4 2021-06-04 13:09:44 -05:00
Jan Bartel dabb0a0624 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-06-01 10:22:19 +10:00
olivier lamy 42153bd57f fix add-opens for cdi tests 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2021-05-29 11:36:23 +10:00
olivier lamy 0e0a122444 add-opens to fix infinispan with java16 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2021-05-29 11:36:23 +10:00
olivier lamy 1ebe7b9453 add-opens to fix infinispan with java16 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2021-05-29 11:36:23 +10:00
Jan Bartel 4f4523d611 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-05-24 12:55:25 +10:00
Jan Bartel 725236743f
Issue #6309 remove duplicate commented out session test (#6310) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2021-05-24 12:48:41 +10:00
Jan Bartel 5a38d47045 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-05-24 10:24:13 +10:00
Jan Bartel 19db66c8a5
Issue #6138 Fix flakey DuplicateCookieTest (#6307) 
* Issue #6138 Fix flakey DuplicateCookieTest

Signed-off-by: Jan Bartel <janb@webtide.com>
 2021-05-24 10:22:59 +10:00
Simone Bordet a83bff553c Updated POM versions to 11.0.4-SNAPSHOT. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-05-21 17:16:21 +02:00
Simone Bordet 9ace21992e Updated POM versions to 10.0.4-SNAPSHOT. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-05-21 17:07:46 +02:00
Ludovic Orban ddbf8e290d Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-05-19 17:28:57 +02:00
Ludovic Orban 1d5d8071ba review comments 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-05-19 17:23:01 +02:00
Ludovic Orban 6ed64e1e65 fix HttpChannelOverHTTP2 recycling order to make sure no demanding content can be left pending 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-05-19 17:23:01 +02:00
Jan Bartel 2ed1bc7ccd Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-05-19 19:07:09 +10:00
Jan Bartel 65ef393262
Issue #6291 Fix FileSessionDataStoreTest.testCleanOrphans (#6292) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2021-05-19 19:06:04 +10:00
Jan Bartel e0b80abf4e Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-05-16 09:53:00 +10:00
Jan Bartel cd6462a625
Issue #6277 Better handling of exceptions thrown in sessionDestroyed (#6278) 
* Issue #6277 Better handling of exceptions thrown in sessionDestroyed

Signed-off-by: Jan Bartel <janb@webtide.com>
 2021-05-16 09:45:50 +10:00
Simone Bordet e9a8497521 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-05-12 17:22:40 +02:00
Simone Bordet de2d764290 Fixes #6254 - Total timeout not enforced for queued requests. 
Fixed logic in HttpDestination.RequestTimeouts, where now a timeout
is scheduled only when the expiration time is less than the existing one.
Various code cleanups.
Renamed HttpDestination.TimeoutTask to RequestTimeouts for clarity.
Improved javadocs, code comments and logging.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
(cherry picked from commit 5f23689aa7)
(cherry picked from commit da50e06b64)
(cherry picked from commit 88ac10439a)
 2021-05-12 10:19:11 +02:00
Lachlan Roberts 409ad3b100 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-04-30 14:45:16 +10:00
Lachlan Roberts a0cca858a7 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-6106-WebSocketCDI 2021-04-27 16:15:52 +10:00
Lachlan Roberts 3ad39161e7 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-04-27 16:06:03 +10:00
Lachlan 3b88b4713c
Merge pull request #6176 from eclipse/jetty-10.0.x-5817-CustomRequestLogFiltering 
Issue #5817 - allow CustomRequestLog to be filtered with BiPredicate
 2021-04-27 16:04:54 +10:00
Simone Bordet a7faa00dc4 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-04-22 15:51:37 +02:00
Simone Bordet 1b6fb39867 Re-enabled ConnectionStatisticsTest. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-04-22 15:49:15 +02:00
Ludovic Orban c930445369 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-04-19 11:50:54 +02:00
Ludovic Orban 25467f8904 Improve handling of HttpInput.Interceptor behavior 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-04-19 10:32:23 +02:00
Lachlan Roberts 61ead137b2 Fix intellij warnings in CustomRequestLogTest. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-04-15 19:04:30 +10:00
Lachlan Roberts 382aed8374 Issue #5817 - allow CustomRequestLog to be filtered with BiPredicate 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-04-15 19:03:50 +10:00
Jan Bartel 1e6a931eb9 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-04-15 11:21:05 +10:00
Jan Bartel 6a074bc2cf
Issue #5684 Reduce intensity and rename SameNodeLoadTest (#6143) (#6162) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2021-04-15 11:12:27 +10:00
Lachlan Roberts 045bc72c92 Disable test for WebSocket CDI HttpSession injection and link to issue. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-04-15 09:40:11 +10:00
Simone Bordet a711768384 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-04-12 10:45:58 +02:00
Simone Bordet 1e3f3a3cbb
Fixes #6049 - Default provider [files] section always executed (#6051) 
* Fixes #6049 - Default provider [files] section always executed

Keeping only enabled modules when processing the modules,
so that default provider modules don't get processed.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-04-12 10:41:51 +02:00
Simone Bordet 465154ae04 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-04-10 18:54:34 +02:00
Simone Bordet e163b001c3 Fixes #6105 - HttpConnection.getBytesIn() incorrect for requests with chunked content 
Moved recording of bytes to fillRequestBuffer(),
so they are accounted also for async reads.
Added test case.
Fixed test that was too strictly comparing HttpConnection.bytesIn,
that now report a correct, but larger value.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
(cherry picked from commit aed20abcbe)
 2021-04-10 18:51:54 +02:00
Lachlan Roberts 0d84f35b0d Issue #6106 - Decorate javax.websocket components during the websocket upgrade. 
Decoration should not be delayed until onOpen it should be during the call to
the WebSocketUpgradeFilter or WebSocketServlet.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-04-07 16:43:10 +10:00
Lachlan Roberts bda4c21bcb Issue #6106 - add testing for CDI with javax.websocket Encoder & Decoder 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-04-06 22:58:23 +10:00
Lachlan Roberts f858aa653c Issue #6106 - always decorate javax.websocket Configurators 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-04-06 22:39:15 +10:00
Lachlan Roberts ac5eb54e1e Issue #6106 - fix WebSocket/CDI integration 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-03-31 18:49:31 +11:00
Lachlan Roberts c29bad2301 Issue #6106 - add tests for WebSocket/CDI integration. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-03-31 18:36:15 +11:00
Olivier Lamy 3ee2ba7172 Updating to version 11.0.3-SNAPSHOT 2021-03-26 06:58:38 +00:00
Olivier Lamy 14ed9a5264 Updating to version 11.0.2 2021-03-26 06:41:47 +00:00
Olivier Lamy a0796d1055 Updating to version 10.0.3-SNAPSHOT 2021-03-26 06:31:31 +00:00
olivier lamy 61b5e1a8af revert back to 11.0.2-SNAPSHOT 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2021-03-26 16:15:49 +10:00
Olivier Lamy 7bd207b309 Updating to version 10.0.2 2021-03-26 06:13:42 +00:00
Olivier Lamy d27363fa55 back to 10.0.2-SNAPSHOT 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2021-03-26 06:10:47 +00:00
Jesse McConnell e1f2f8c989
Updating to version 11.0.3-SNAPSHOT 2021-03-25 11:14:04 -05:00
Jesse McConnell 0a126e2e21
Updating to version 11.0.2 2021-03-25 10:58:33 -05:00
Jesse McConnell 7a9e01ac56
Updating to version 10.0.3-SNAPSHOT 2021-03-25 10:38:15 -05:00
Jesse McConnell aac6bfbd48
Updating to version 10.0.2 2021-03-25 10:21:44 -05:00
Simone Bordet 7f0bc550f8 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-03-25 16:12:30 +01:00
Simone Bordet 6fca106160 Reverted version to 10.0.2-SNAPSHOT. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-03-25 16:02:45 +01:00
Simone Bordet 43562774a8 Issue #6085 Fix duplicate valid session cookies to pick first valid. 
Signed-off-by: Jan Bartel <janb@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-03-25 15:53:03 +01:00
Olivier Lamy 3d0574d64c Updating to version 10.0.3-SNAPSHOT 2021-03-25 04:10:39 +00:00
Olivier Lamy ab235ad687 Updating to version 10.0.2 2021-03-25 03:57:25 +00:00
Jan Bartel f3d4bfa3e0 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2021-03-25 10:08:11 +11:00
Jan Bartel fd05a3d19c
Issue #6085 Fix reference counts for multiple valid cookies for sessions (#6088) (#6096) 
* Issue #6085 Fix reference counts for multiple valid cookies for sesssions

Signed-off-by: Jan Bartel <janb@webtide.com>
 2021-03-25 09:37:17 +11:00
Greg Wilkins be9e1d3a57 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-03-25 07:44:56 +11:00
Greg Wilkins 303e031235
Added before dependents to Modules (#6080) 
Added `before` section to a module to control ordering
rename `options` section to `after`

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
 2021-03-24 13:31:36 +01:00
Simone Bordet 897dc49bef Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-03-05 19:21:47 +01:00
Simone Bordet 217a97b952 Fixes #6037 - Review logging modules for j.u.l. 
Fixed mistakes in logging-jul-capture.mod.
Introduced java-util-logging-bridge.properties for the bridge module configuration.
Added [exec] sections to specify the jul config file.
Removed logging-jul-capture.xml, not necessary.
Added tests to verify that the fixed modules work fine.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-03-05 19:18:19 +01:00
Joakim Erdfelt 3f0f57cefc Updating to version 11.0.2-SNAPSHOT 2021-02-19 16:20:48 -06:00
Joakim Erdfelt e98092c179 Updating to version 11.0.1 2021-02-19 16:02:24 -06:00
Joakim Erdfelt 8ed8dc62e3 Updating to version 10.0.2-SNAPSHOT 2021-02-19 13:06:42 -06:00
Joakim Erdfelt d0bfd9145d Updating to version 10.0.1 2021-02-19 12:43:50 -06:00
Ludovic Orban 22be42c436 Merge branch 'jetty-10.0.x' into jetty-11.0.x 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-02-17 16:38:06 +01:00
Ludovic Orban ace019ab2d Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5605-wakeup-blocked-threads 2021-02-16 13:35:18 +01:00
Joakim Erdfelt 01fb5769f4
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-02-15 14:18:34 -06:00
Joakim Erdfelt d6ec96fe1b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-02-15 14:18:08 -06:00
Joakim Erdfelt 5dd987779c
Adding `WhitespaceAfter` checkstyle rule. 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-02-15 12:48:24 -06:00
Jan Bartel d6d648316a
Issue #5941 Use Glassfish JSTL impl (#5942) 
* Issue #5941 Use Glassfish JSTL impl

Signed-off-by: Jan Bartel <janb@webtide.com>
 2021-02-10 22:21:22 +01:00
Ludovic Orban 03e2789699 Merge remote-tracking branch 'origin/jetty-9.4.x-5605-wakeup-blocked-threads' into jetty-10.0.x-5605-wakeup-blocked-threads 2021-02-10 15:53:38 +01:00
gregw 9f2a4f5ad5 Fix #5605 write side 
refactored the complete method to consider unrecoverable API states no matter what the httpout state
actually is.  This avoid duplication of OPEN, CLOSING, CLOSED etc. handling.
 2021-02-10 15:35:48 +01:00
Simone Bordet e4baac75ad Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-02-10 11:32:15 +01:00
Simone Bordet 29d48b0de5 Improvements to the Jetty documentation. 
Documented the Jetty start mechanism.

Reorganized the documentation to look better on the TOC.

Improved JettyIncludeExtension to support replacements, deletions and callouts.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-02-10 11:27:30 +01:00
Ludovic Orban d297e9c473 unblock readers after consumeAll 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-02-09 09:26:34 +01:00
Ludovic Orban 9611a252a5 Merge remote-tracking branch 'origin/jetty-9.4.x-5605-wakeup-blocked-threads' into jetty-10.0.x-5605-wakeup-blocked-threads 2021-02-08 10:52:57 +01:00
gregw e9315fe51f Fix #5605 Unblock non container Threads 
revert fillInterest cancellation and just abort connection instead.
tested for all transports
 2021-02-03 17:27:25 +01:00
Joakim Erdfelt c80eac0386
Fixing checkstyle issue 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-01-26 11:13:09 -06:00
Jan Bartel 83b047285d Fix checkstyle violations in JettyHomeTester 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2021-01-26 15:44:27 +01:00
olivier lamy a2270fe74a Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-01-26 21:25:24 +10:00
olivier lamy b214837c78 use local repo to download mod files 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2021-01-26 21:03:56 +10:00
olivier lamy 2a37eb8400 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-01-26 18:26:59 +10:00
olivier lamy da7fd63d98 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2021-01-26 18:26:18 +10:00
Joakim Erdfelt 4c51591407
Remove PMD from build (#5900) 
* Remove PMD from build

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

* Attempt to fix log4j2 distribution test

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

* Fixing jetty-start tests to use configured maven.repo.uri property

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

* Using ${env.MAVEN_REPO_URI} configured at Jenkins.

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

* no need of this

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

Co-authored-by: olivier lamy <oliver.lamy@gmail.com>
 2021-01-26 18:17:29 +10:00
Simone Bordet 31d5ea58ca Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-01-25 14:23:23 +01:00
Simone Bordet 95b5cfd532
Fixes #5902 - Grab Jetty startup output in documentation. (#5906) 
* Fixes #5902 - Grab Jetty startup output in documentation.

Implemented an Asciidoctor extension that uses `JettyHomeTester` to run
Jetty and capture its output.
This extension is triggered by the `ServiceLoader` mechanism, so the
documentation jar is now in the plugin classpath.

Introduced `jetty-halt.xml` so that the JVM can be halted.
In this way, Jetty does not produce the "stopping" log lines and
therefore they won't be grabbed and included in the documentation.

Used the new `include::jetty[]` directive in the documentation.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Greg Wilkins <gregw@webtide.com>
 2021-01-25 14:21:17 +01:00
Joakim Erdfelt 10136235b2
Happy New Year 2021 (Jetty 11 edition) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-01-21 15:22:28 -06:00
Joakim Erdfelt e81c847998
Happy New Year 2021 (Jetty 10 edition) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-01-21 15:05:57 -06:00
Joakim Erdfelt 176e29e408
Happy New Year 2021 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-01-21 12:31:00 -06:00
Simone Bordet bacb4b2555 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-01-21 16:23:32 +01:00
Simone Bordet 9fe5700260
Fixes #5880 - Move test-simple-webapp to demos. (#5881) 
* Fixes #5880 - Move test-simple-webapp to demos.

Moved test-simple-webapp to demos under demo-simple-webapp.
Moved the JSP demos into their own module: out of demo-jetty-webapp into demo-jsp-webapp.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-01-21 15:27:03 +01:00
Joakim Erdfelt 2e53ec5384 Updating to version 9.4.37-SNAPSHOT 2021-01-14 11:27:24 -06:00
Joakim Erdfelt 238ec6997c Updating to version 9.4.36.v20210114 2021-01-14 10:29:28 -06:00
Jan Bartel 03ae75f407 Add reason for @Disabled. 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2021-01-12 12:20:28 +01:00
Jan Bartel d2bb533bd4 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-01-12 12:16:21 +01:00
Jan Bartel a36f8d2819 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-01-12 12:15:50 +01:00
Jan Bartel 2adea58037 Remove old comment from JdbcLoginServiceTest 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2021-01-12 12:14:56 +01:00
Simone Bordet 931eea40e6 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-01-11 11:27:15 +01:00
Simone Bordet f836f87754 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-01-11 11:23:12 +01:00
Simone Bordet b45c32616c
Fixes #5844 - --download flag to jetty-start causes NullPointerException. 
Added test case, null guard and a couple small fixes.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-01-07 12:51:06 +01:00
gregw 002043f42f Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 
Signed-off-by: gregw <gregw@webtide.com>
 2021-01-05 12:57:34 +01:00
Greg Wilkins 51120b1f0b
Tries improvements (#5736) 
* ArrayTrie handles full alphabet
* TreeTrie handles case sensitive
* improved trie selection from Index builders
* optimisations, cleanups and benchmarks.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2021-01-05 12:52:34 +01:00
Olivier Lamy 06df421b56
Remove javax.* dependencies (#5776) 
remove non needed enforcer rule in websocket poms
force search transitive

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-12-22 08:17:16 +10:00
olivier lamy ac9b9091ac use an existing url for javadoc url 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-12-16 18:21:04 +10:00
Joakim Erdfelt d5b08ea9f2
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-12-11 11:40:10 -06:00
Joakim Erdfelt 2662be0a05
Merge pull request #5795 from eclipse/jetty-10.0.x-5784-fix-dual-license-text 
Issue #5784 - fix dual license text
 2020-12-11 11:37:58 -06:00
olivier lamy efe4f5e5ea Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-12-11 12:11:53 +10:00
olivier lamy 9b100a5bfb Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-12-11 12:10:35 +10:00
Joakim Erdfelt a8d68360f8
Issue #5784 - Removing infinispan exclusions on license checker 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-12-10 19:55:36 -06:00
Olivier Lamy 639cad63fe
Jetty 9.4.x optimize parser warning from logs and add spotbug (#5735) 
* enable spotbugs in CI

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

record issues

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

use warning new generation

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

activate errorprone

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

fix Jenkinsfile

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

do not run spotbugs for jetty-runner as we do not want to fix all dependencies bugs :)

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

junit should allow empty results

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

maven console can be use only once...

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

one liner

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

recordissues only once

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

force id

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

aggregate results

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

configure a name for aggregated reports

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

mo more -T3 no need anymore of remote session test profile

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

I want to see what failing tests look like with new report.

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

skip spotbugs for jetty-jmh

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

get rid of findbugs as we now have spotbugs

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

Revert "I want to see what failing tests look like with new report."

This reverts commit df0d13e4c53d7461872e1f925ec06bd36e4a66c9.

activate errorProne parser

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

make pmd quiet for CI

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

remove -fae flag and do not display transfer progress

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

try junitParser() to see what it does

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

junit parser is a bad idea...

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

increase timeout

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

no -T2 for javadoc

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

fix skip spotbugs and pmd verbose

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

* remove -T options

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-12-11 11:47:26 +10:00
Joakim Erdfelt f0badc5c5e
Issue #5784 - Fixing source header text: EPL-2.0 OR Apache-2.0 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-12-10 16:04:50 -06:00
Joakim Erdfelt 8a92880172
Fixing version in new test module 2020-12-09 16:01:03 -06:00
Joakim Erdfelt d0572ada58
Merge remote-tracking branch 'origin/release-11.0.0' into jetty-11.0.x 2020-12-09 15:28:50 -06:00
Joakim Erdfelt 0a70fbf206
Merge remote-tracking branch 'origin/release-10.0.0' into jetty-10.0.x 2020-12-09 15:28:26 -06:00
olivier lamy 062ed5321d Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-12-09 07:04:14 +10:00
olivier lamy 1744687e8d Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-12-09 07:03:35 +10:00
Olivier Lamy 9deaef0de4
remove configuration for plugin clirr as it is not used (#5771) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-12-09 06:58:08 +10:00
Jan Bartel 1fb9e27560 Issue #5772 Fix jndi mail class duplication 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-12-08 13:05:53 +01:00
olivier lamy 61aac5abb5 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-12-07 21:15:26 +10:00
olivier lamy aabe5ceee2 remove duplicate dependencies 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-12-07 21:14:59 +10:00
olivier lamy 30ddd725d7 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-12-07 12:19:54 +10:00
Olivier Lamy 22ca841e37
get rid of this logback dependency (#5747) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-12-07 12:19:08 +10:00
Joakim Erdfelt 30bd8b9fba Updating to version 11.0.1-SNAPSHOT 2020-12-02 15:59:13 -06:00
Joakim Erdfelt 432f896d7a Updating to version 11.0.0 2020-12-02 15:35:56 -06:00
Joakim Erdfelt 9319f10425 Updating to version 10.0.1-SNAPSHOT 2020-12-02 15:30:13 -06:00
Joakim Erdfelt b9645a1737 Updating to version 10.0.0 2020-12-02 15:04:53 -06:00
Joakim Erdfelt cc9b41cf17
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-12-02 14:53:52 -06:00
Joakim Erdfelt 41c2e9cb6d
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5739-Remove-distribution-from-doco 2020-12-02 14:52:53 -06:00
Simone Bordet 9c882ee796 Improved KeyStoreScanner.scan(). 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-12-02 19:24:19 +01:00
Simone Bordet 97b3f262ab Fixed scan(Callback) bug, returning early in case of failures. 
More cleanups in code adding more privateness, getting rid of unnecessary exceptions, making fields final, etc.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-12-02 12:53:23 +01:00
gregw 1768bd898f Fix #5739 Remove distribution from doco 
Mostly mechanical fixes
 2020-12-02 09:16:29 +01:00
Simone Bordet 69ce508c4c Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-12-01 13:01:48 +01:00
Lachlan Roberts b26cda59d9 fix locations of some jmh benchmarks 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-12-01 15:56:23 +11:00
gregw 1333bbc55c Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-30 17:35:56 +01:00
gregw 69b3c37717 remove test rather than disable 
Signed-off-by: gregw <gregw@webtide.com>
 2020-11-30 17:35:37 +01:00
gregw 20f6dc1ace Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-30 17:33:21 +01:00
gregw 7e9b050050 disable test accidentally added for #5737 
Signed-off-by: gregw <gregw@webtide.com>
 2020-11-30 17:23:10 +01:00
Jan Bartel dfe9b67673 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-11-30 14:46:49 +01:00
Jan Bartel 7b77a532a8 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-30 14:42:18 +01:00
gregw b4e2ad0df7 added CVE 
Signed-off-by: gregw <gregw@webtide.com>
 2020-11-30 14:23:45 +01:00
Jan Bartel 5ad130515f
Issue #5713 Remove dependency on derby (#5728) 
* Issue #5713 Remove dependency on derby

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

* use the mariadb client version from the property

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

Co-authored-by: olivier lamy <oliver.lamy@gmail.com>
 2020-11-30 14:22:50 +01:00
olivier lamy 1207d1eee5 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-11-28 11:47:59 +10:00
Simone Bordet 8c465ac76d Fixed tests and code after merge of #5310 from 9.4.x. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-11-27 13:53:06 +01:00
Joakim Erdfelt fe0a4f624e
Merge remote-tracking branch 'origin/release-9.4.35' into jetty-9.4.x 2020-11-25 15:56:09 -06:00
dependabot[bot] 36d7a90930
Bump geronimo-atinject_1.0_spec from 1.1 to 1.2 (#5666) 
Bumps geronimo-atinject_1.0_spec from 1.1 to 1.2.

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-25 10:58:07 +01:00
Lachlan Roberts f56cbe0656 revert change to URI in JakartaWebSocketTest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-25 18:40:27 +11:00
Joakim Erdfelt 3fbd5eb4a4
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-11-24 13:36:42 -06:00
gregw 0a70cba8ae Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: gregw <gregw@webtide.com>
 2020-11-24 18:36:24 +01:00
Greg Wilkins 9f82ca0a80
Use File.list and File.walk within a try with resource (#5718) 
* Use File.list and File.walk within a try with resource

The API contract of File.list and File.walk requires them to be closed after use.

* Fix from review

Left out filter

* Fix from review

Factored out deleteFile with better debug

* Fix from review

Can delete files whilst walking

* Fix from review

Restored sweepFile
fixed minor code suggestions
 2020-11-24 18:12:42 +01:00
Olivier Lamy 00d324979f
Fix problems caused by upgrade to jstl version. (#5715) 
* Fix problems caused by upgrade to jstl version.

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

* fix upperbound dependency

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

* add trailing /

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

Co-authored-by: Jan Bartel <janb@webtide.com>
 2020-11-24 21:17:02 +10:00
olivier lamy 3dbd23ec10 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-11-24 09:42:48 +10:00
olivier lamy ba7d1b6377 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-11-24 09:42:14 +10:00
Olivier Lamy 429bec57a4
Issue #5644 Remove all profiles for session tests (#5703) 
* remote session tests are now executed per default, new profile to exclude then no-remote-session-tests

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

* remove this no-remote-session-tests profile just use skipTests to skip that

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-11-24 09:38:30 +10:00
Simone Bordet 07c94abc4b Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 2020-11-23 15:54:21 +01:00
Joakim Erdfelt e8683cba9f Updating to version 9.4.36-SNAPSHOT 2020-11-20 16:05:27 -06:00
Joakim Erdfelt bdc54f03a5 Updating to version 9.4.35.v20201120 2020-11-20 15:05:50 -06:00
Chris Walker 4071310044 Merge branch 'jetty-10.0.x' into jetty-11.0.x 
# Conflicts:
#	tests/test-integration/src/test/java/org/eclipse/jetty/test/HttpInputIntegrationTest.java
 2020-11-20 14:00:26 -06:00
Simone Bordet 8edb5cfc24 Issue #5691 - HttpInput may skip setting fill interest. 
Code cleanups and logging improvements.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-11-20 16:50:24 +01:00
Simone Bordet 7726c2ebcb Code cleanup to fix checkstyle issue. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-11-19 17:34:20 +01:00
Joakim Erdfelt 901a17d197
Issue #5605 - Adding more comments 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-11-19 10:24:36 -06:00
Joakim Erdfelt a6d432e9e3
Issue #5605 - Adding more comments and fixing logging 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-11-19 10:19:31 -06:00
Simone Bordet 88c03ac1dc Issue #5605 - java.io.IOException: unconsumed input during http request parsing. 
Fixed test after merge.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-11-19 16:47:36 +01:00
Simone Bordet d4feb4f29d Removed unused code. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-11-19 16:08:31 +01:00
Simone Bordet 3a44648e46 Code cleanup. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-11-19 15:21:58 +01:00
olivier lamy 041069e7ae Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-11-19 21:37:33 +10:00
olivier lamy 8eb9522775 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-11-19 21:36:37 +10:00
Joakim Erdfelt 5f6e72d2ed
Issue #5605 - Adding more gzip consume all tests 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-11-18 11:42:40 -06:00
olivier lamy 0d40a210fc Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-11-18 21:29:20 +10:00
gregw f37ad023a8 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: gregw <gregw@webtide.com>
 2020-11-18 11:20:48 +01:00
Greg Wilkins 14f94f738d
Issue #5605 unconsumed input on sendError (#5637) 
* Issue #5605 unconsumed input on sendError

Add Connection:close if content can't be consumed during a sendError. Processed after the request has returned to the container.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Update from review

 + Add close on all uncommitted requests when content cannot be consumed.

* Update from review

 + fixed comment
 + space comma

* Only consume input in COMPLETE if response is >=200 (ie not an upgrade or similar)

* Updated to be less adventurous

I do not think it was valid to always consumeAll in COMPLETE as this could break upgrades with both 101s and 200s
Instead I have reverted to having this consumeAll logic only:
 + in sendError once control has passed back to the container and we are about to generate an error page.
 + in front of all the sendRedirection that we do without calling the application first.

Extra tests also added

* Updated to be less adventurous

reverted test

* Testcase for odd sendError(400) issue.

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

* Fix for odd sendError(400) issue.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

* Testcase for odd sendError(400) issue.

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

* Always try to consumeAll on all requests

* Refinements after testing in 10

* Refinements after testing in 10

Fixed test

* Fixed comment from review

* Updates from review

+ added redirect methods that consumeAll
+ ensureContentConsumedOrConnectionClose renamed to ensureConsumeAllOrNotPersistent
+ ensureConsumeAllOrNotPersistent now handles HTTP/1.0 and HTTP/1.1 differently

* better consumeAll implementation

* update from review

 + better javadoc
 + filter out keep-alive
 + added more tests

* update from review

 + better javadoc

* update from review

 + fixed form redirection test for http 1.0 and 1.1

* update from review

 + HttpGenerator removes keep-alive if close present
 + Use isRedirection

Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
 2020-11-18 10:40:05 +01:00
Joakim Erdfelt d30d95c26c
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-11-17 09:20:25 -06:00
Joakim Erdfelt e9c6c942ea
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-17 09:12:50 -06:00
Joakim Erdfelt 1448444c65
Merge pull request #5560 from eclipse/jetty-9.4.x-5539-statisticsservlet-output 
Issue #5539 - Proper StatisticsServlet output format via content negotiation
 2020-11-17 08:52:34 -06:00
Jan Bartel 83e5b3fc04 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-11-17 15:49:00 +01:00
Jan Bartel ac6444f6ff
Issue #5272 Clean up LoginServices and LoginModules (#5641) 
* Issue #5272 Clean up LoginServices and LoginModules

Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-11-17 15:40:12 +01:00
olivier lamy 1f3995712c Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-11-17 16:32:49 +10:00
olivier lamy 8dd980d256 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-11-17 16:32:07 +10:00
Olivier Lamy 48b89f9394
use @Testcontainers to disable test if docker not available (#5678) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-11-17 16:20:16 +10:00
olivier lamy 40df53f774 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-11-17 12:03:31 +10:00
olivier lamy 35ace7787b Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-11-17 12:02:31 +10:00
Olivier Lamy 213ac63d2c
Enable gcloud testing in docker (#5651) 
* Enable "gcloud" profile for gcloud session testing.

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

* use docker image as google datastore

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

* fix project id

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

* all tests pass here

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

* do not trim stack trace

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

* Try distinguishing between localhost and non-localhost

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

* add some debug

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

* remove non needed pom content

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

Co-authored-by: Jan Bartel <janb@webtide.com>
 2020-11-17 11:13:22 +10:00
Joakim Erdfelt 314c65fb14
Issue #5539 - Adding StatisticsServlet tests in test-distribution 
+ Updating module definition for JSON

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-11-16 12:31:28 -06:00
Joakim Erdfelt bd7be9e2e3
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-11-16 09:59:03 -06:00
Joakim Erdfelt d3f275ad4b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-16 09:58:46 -06:00
Joakim Erdfelt 7f86f5e9ad
Merge pull request #5663 from eclipse/dependabot/maven/jetty-9.4.x/openwebbeans.version-2.0.20 
Bump openwebbeans.version from 2.0.19 to 2.0.20
 2020-11-16 09:58:24 -06:00
Simone Bordet 406dec79e3 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 2020-11-16 16:45:16 +01:00
Simone Bordet 36d8289dee Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-11-16 16:39:53 +01:00
dependabot[bot] 991e23d80b
Bump openwebbeans.version from 2.0.19 to 2.0.20 
Bumps `openwebbeans.version` from 2.0.19 to 2.0.20.

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

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

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-16 14:05:10 +00:00
Lachlan Roberts 3a2095a7b0 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-11-12 10:57:06 +11:00
Lachlan Roberts 8ff545f696 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5320-WebSocketHttpClient2 2020-11-12 09:42:48 +11:00
Simone Bordet a308881fab Fixes #5633 - Allow to configure HttpClient request authority. 
Introduced HttpDestination.send(Request, Response.CompleteListener) to send a request using the given destination.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-11-11 17:13:00 +01:00
Lachlan 23f75a395b
Merge pull request #5599 from eclipse/jetty-9.4.x-XML-Review 
Fixes to XML formatting and comments.
 2020-11-11 13:55:26 +11:00
Joakim Erdfelt a2825950fc
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-11-10 12:17:33 -06:00
Joakim Erdfelt 9e22260377
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-10 12:12:39 -06:00
Joakim Erdfelt 21c27f6370
Fixing checkstyle violations 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-11-10 06:33:04 -06:00
dependabot[bot] 949a89c15b
Bump geronimo-interceptor_1.2_spec from 1.1 to 1.2 (#5632) 
Bumps geronimo-interceptor_1.2_spec from 1.1 to 1.2.

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-10 16:34:46 +10:00