Commit Graph

556 Commits

Author SHA1 Message Date
Joakim Erdfelt 3eddc92783
Updates to jetty.sh and testing to reduce failures (#10790)
+ Updating AmazonCorretto to JDK 17
+ Making sure /etc/default/jetty is populated
  correctly in the user_change mode
+ Removing warnings from jetty startup
  about --start-log-file=... being
  unrecognized
+ Adding unique jetty12 identifier to docker
  image names (helps to keep different jetty
  versions apart when manually testing)
2023-10-26 14:28:01 +11:00
Joakim Erdfelt d6750b0b25
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2023-10-25 11:42:55 -05:00
Joakim Erdfelt 9a8daf71ca
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2023-10-25 11:14:55 -05:00
Joakim Erdfelt 92f62a10f9
Improve and test `jetty.sh` behaviors (#10753)
* Issue #10696 - Addressing start-stop-daemon behaviors in jetty.sh
* disable internal pid-file management of start-stop-daemon
* IssueDo not test for file system permissions if user is root, or process will switch to JETTY_USER
* Fixing bad UID / JETTY_USER condition
* Avoid FS test with setuid use as well
* Fixing stop behavior
* Adding jetty.sh docker testing

---------

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Olivier Lamy <olamy@apache.org>
Co-authored-by: Olivier Lamy <olamy@apache.org>
2023-10-25 09:32:15 -05:00
Olivier Lamy ef9abc02e6
tag this test as external (not running on CI) as it is using external resource from https://open.api.ebay.com (#10686)
Signed-off-by: Olivier Lamy <olamy@apache.org>
2023-10-19 07:07:39 +10:00
Simone Bordet 825fc6df1f
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-10-16 09:41:45 +02:00
Olivier Lamy fcc88274a4
Jetty 12.0.x use automatic formatter for poms to have same style for every poms (#10578)
* apply spotless sort pom

---------

Signed-off-by: Olivier Lamy <olamy@apache.org>
2023-10-12 03:51:36 +02:00
Joakim Erdfelt 6b3f760b80
Updating to version 12.0.3-SNAPSHOT 2023-10-09 21:16:46 -05:00
Joakim Erdfelt b01e3611cf
Updating to version 12.0.2 2023-10-09 20:59:14 -05:00
Lachlan Roberts 70b1fd40ef fix infinite recursion in server dump with Path
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-10-10 11:26:55 +11:00
Joakim Erdfelt c8829f75bf
Updating to version 11.0.18-SNAPSHOT 2023-10-09 13:49:23 -05:00
Joakim Erdfelt 48e7716b94
Updating to version 11.0.17 2023-10-09 13:38:47 -05:00
Joakim Erdfelt 722b97ad6a
Updating to version 10.0.18-SNAPSHOT 2023-10-09 13:32:28 -05:00
Joakim Erdfelt af15f12297
Updating to version 10.0.17 2023-10-09 13:21:53 -05:00
Olivier Lamy 3fe301a8b2
Merge branch 'jetty-10.0.x' into jetty-11.0.x 2023-10-01 15:58:24 +10:00
Joakim Erdfelt 1e1bc5adff
Issue #10606 - Bump build to JDK 21 (#10607)
* Issue #10606 - Bump build to JDK 21
* Fix tests that fail on JDK 21
* better use of `@EnabledForJreRange`
* Disable JAASLdapLoginServiceTest on JDK 20+ via maven profile

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Olivier Lamy <olamy@apache.org>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Olivier Lamy <olamy@apache.org>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
2023-09-28 16:19:36 -05:00
Lachlan Roberts 26ab27bb80 fix for DistributionTests.testJettyConf
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-09-27 12:15:43 +10:00
Lachlan Roberts 46b1959c9d fixes for merge from 11 to 12
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-09-27 10:13:48 +10:00
Lachlan Roberts 69360b80fd Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2023-09-27 10:00:08 +10:00
Lachlan Roberts 869887aff6 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2023-09-27 09:57:26 +10:00
Joakim Erdfelt cc8f976d0c
Issue #10473 - Revert jetty.sh pgrep, and update started checks (#10501)
* Revert pgrep usage in jetty.sh
* Adding test for jetty.conf
* Correcting renamed xml file
* Improved started check
+ Improved `started` function code
  - adding comment explaining steps
  - adding named parameters
+ Improved ARGS check for "jetty.state="
  option, to know when to check the
  state file.
* Make sure state.mod is before any deploy steps to ensure jetty-state file is created early.
* Early cleanup / creation of State file
* Improved `started` function
+ Don't attempt to read from State File
  if it doesn't exist
+ Don't attempt to read from PID File
  if it doesn't exist
+ DEBUG in state file logic
+ DEBUG in pid file logic
+ proper startsWith logic for state detection
* Better state debugging and pid kill

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2023-09-26 16:48:33 -05:00
Olivier Lamy 896a301fc1
Upgrade testcontainers 1.19.0 (fix local issue with upgraded docker version) (#10471)
* add some debug

Signed-off-by: Olivier Lamy <olamy@apache.org>

* force use infinispan.client.hotrod.client_intelligence=BASIC looks to fix issue locally after docker upgrade, use new forListeningPorts to check infinispan start

Signed-off-by: Olivier Lamy <olamy@apache.org>

* use Wait.forListeningPorts to wait docker image start

Signed-off-by: Olivier Lamy <olamy@apache.org>

* cleanup commented code

Signed-off-by: Olivier Lamy <olamy@apache.org>

---------

Signed-off-by: Olivier Lamy <olamy@apache.org>
2023-09-04 13:09:43 +10:00
Joakim Erdfelt 0543583f65
Merge pull request #10447 from eclipse/release/11.0.16
Merge `release/11.0.16` into `jetty-11.0.x` HEAD
2023-08-31 15:12:22 -05:00
Ludovic Orban 475a706fd1 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2023-08-31 09:30:01 +02:00
Joakim Erdfelt 1d226403da
Updating to version 12.0.2-SNAPSHOT 2023-08-29 16:55:36 -05:00
Joakim Erdfelt 4768745849
Updating to version 12.0.1 2023-08-29 16:38:20 -05:00
Jan Bartel 5808a62660
Issue #10356 Update Weld integration (#10359)
* Issue #10356 Update Weld integration

Signed-off-by: Olivier Lamy <olamy@apache.org>
Co-authored-by: Olivier Lamy <olamy@apache.org>
2023-08-29 11:00:50 +02:00
Joakim Erdfelt cb8c4b6ab2
Updating to version 11.0.17-SNAPSHOT 2023-08-25 14:55:08 -05:00
Joakim Erdfelt bedff458c4
Updating to version 11.0.16 2023-08-25 14:43:04 -05:00
Joakim Erdfelt 896dee2466
Updating to version 10.0.17-SNAPSHOT 2023-08-25 14:27:38 -05:00
Joakim Erdfelt a2735a9ae9
Updating to version 10.0.16 2023-08-25 14:10:55 -05:00
Joakim Erdfelt 900f50f513
Issue #10271 - new jetty-home `pid` module (#10272)
* Issue #10271 - new jetty-home module `pid`

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2023-08-25 09:12:49 -05:00
Lachlan be11dfdbab
Merge PR #10400 to 12.0.x for InetAccessHandler (#10403)
Issue #10388 - fix InetAccessHandler module

Add DistributionTest for InetAccessHandler
Removed deprecated method from InetAccessHandler.
Fixed InetAccessHandler DistributionTests for 12.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
2023-08-25 11:32:46 +02:00
Lachlan Roberts 99c049ef1b Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2023-08-25 18:05:18 +10:00
Lachlan Roberts d6320c4494 fix checkstyle violation
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-08-25 15:37:40 +10:00
Lachlan Roberts b89398d91c Issue #10388 - add DistributionTest for InetAccessHandler
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-08-25 14:19:38 +10:00
Joakim Erdfelt fbe4dd8e2a
Make JettyHomeTester more resilient to blank mavenLocalRepository input (#10364) 2023-08-25 06:17:38 +02:00
Simone Bordet c3f52c3ec7
Fixed range of Java versions for testVirtualThreadPoolPreview().
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-08-24 11:35:42 +02:00
Simone Bordet 04b53f3f15
Specifying the $JETTY_BASE directory in testVirtualThreadPoolPreview().
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-08-23 18:01:10 +02:00
Simone Bordet 7f1d262aee
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-08-23 15:47:15 +02:00
Simone Bordet 9efe3a113a
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-08-23 13:43:48 +02:00
Simone Bordet 153f5dfae8 Fixes #10350 - Support Java 21 virtual threads
* Introduced module `threadpool-virtual` for Java 21.
* Updated virtual threads documentation to refer to Java 21.
* Updated requirements that the releases should use Java 21, so that the documentation can properly render the virtual threads documentation.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-08-23 11:58:24 +02:00
Olivier Lamy 97e1527ed6
Jetty 12.0.x use Maven build cache for PRs and branches except jetty-12.0.x main branch (#9871)
* apply configuration/changes for build cache

Signed-off-by: Olivier Lamy <olamy@apache.org>

Signed-off-by: Olivier Lamy <olamy@apache.org>
2023-08-22 02:46:46 +02:00
Simone Bordet 486ec677cf
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-08-21 10:43:49 +02:00
Simone Bordet 295cbe4d5a
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-08-21 09:01:22 +02:00
Simone Bordet e91a68923a
Fixes #8926 - HttpClient GZIPContentDecoder should remove Content-Len… (#10326)
Now Content-Length and Content-Encoding are removed/modified by the decoder.
In this way, applications have a correct sets of headers to decide whether to decode the content themselves.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-08-21 08:58:22 +02:00
Joakim Erdfelt 7cd55498e2
Issue #10158 - tests to prove out XML only based deployment technique (#10209) 2023-08-17 16:48:59 -05:00
Joakim Erdfelt 9c324326c5
Merge `release/12.0.0` back into `jetty-12.0.x` (#10237)
* Updating to version 12.0.0

* Updating to version 12.0.1-SNAPSHOT
2023-08-08 00:55:19 +02:00
Simone Bordet c946a41871 Fixes #10123 - MultiPartByteRanges request gets stuck
The handling of reads in MultiPartByteRanges.PathContentSource was broken for ranges that were larger than the read buffer size.

Fixed by properly counting how many bytes are left to read.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-07-18 21:37:35 +02:00
Simone Bordet f3d8b1539a
Added test case for #10123.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-07-18 16:12:32 +02:00