Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
27,530 Commits 70 Branches 462 Tags 370 MiB
Commit Graph

2994 Commits

Author SHA1 Message Date
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
dependabot[bot] deef0b4e30
Bump geronimo-jcdi_2.0_spec from 1.1 to 1.3 (#5607) 
Bumps geronimo-jcdi_2.0_spec from 1.1 to 1.3.

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-10 14:26:52 +10:00
Lachlan Roberts bd553d98e5 fixing badly formatted XML comments 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-09 23:51:35 +11:00
Lachlan Roberts 4c172b5bbb Fix xml <Ref/> tags using id instead of refid. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-09 23:30:36 +11:00
Lachlan Roberts 80a824854b Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5320-WebSocketHttpClient2 2020-11-09 15:17:22 +11:00
Joakim Erdfelt 90777cd1d1
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-11-04 13:33:14 -06:00
Joakim Erdfelt e59b7c2750
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-04 13:24:50 -06:00
Joakim Erdfelt 2fd895a6dc
Merge pull request #5570 from eclipse/dependency/jetty-9.4.x/org.infinispan.protostream-protostream-4.3.4.Final 
Bump protostream from 4.2.2.Final to 4.3.4.Final
 2020-11-04 13:19:52 -06:00
Joakim Erdfelt 71ad5447a4
Merge remote-tracking branch 'origin/release-9.4.34' into jetty-9.4.x 2020-11-04 10:24:21 -06:00
Joakim Erdfelt 4f8707390e
Adding required gson dependency to test-infinispan-sessions 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-11-04 10:09:15 -06:00
Lachlan Roberts 416579a690 fix formatting in DistributionTests 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-04 22:24:19 +11:00
Lachlan Roberts fc4e263f93 Add module and configuration for websocket-client provided to webapp. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-04 22:22:13 +11:00
Joakim Erdfelt 2c43fbf37b
Bump protostream from 4.2.2.Final to 4.3.4.Final 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-11-03 14:08:58 -06:00
Simone Bordet 8b8154d044 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 2020-11-03 19:12:27 +01:00
Ludovic Orban 814dc69803 Get rid of addContent() by making produceContent() return Content instead. 
Make EOF and errors be special content.
Transition to a much simplified FSM by using the needContent() / produceContent() model.
Implement blocking on top of async, this way there is only one FSM.
(Milestone 6)

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2020-11-03 17:30:25 +01:00
Ludovic Orban a4258ec9c0 Merge all HttpInput* impls into a single class, push all differences to HttpChannel* impls (Milestone 5) 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2020-11-03 17:30:25 +01:00
Joakim Erdfelt 40bde46b13
Bump maven-antrun-plugin from 1.8 to 3.0.0 
+ and update configuration/task to configuration/target

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-11-03 08:46:27 -06:00
Joakim Erdfelt e6a5e4d3af
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-11-03 08:34:18 -06:00
Joakim Erdfelt 167eded4cf
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-03 08:33:33 -06:00
Joakim Erdfelt ba577ba972
Merge pull request #5508 from eclipse/dependabot/maven/jetty-9.4.x/org.mariadb.jdbc-mariadb-java-client-2.7.0 
Bump mariadb-java-client from 2.6.0 to 2.7.0
 2020-11-03 07:44:56 -06:00
Lachlan Roberts 8d21bb7b63 Issue #5320 - fix the XmlHttpClientProvider for jetty 10, re-enable tests 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-03 17:17:27 +11:00
Lachlan Roberts c43a9e8234 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-11-03 11:06:04 +11:00
Joakim Erdfelt edaadff55b Updating to version 9.4.35-SNAPSHOT 2020-11-02 09:04:51 -06:00
Lachlan Roberts 1b5747cbbe Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-03 01:17:31 +11:00
Joakim Erdfelt e46af88704 Updating to version 9.4.34.v20201102 2020-11-02 08:03:51 -06:00
Lachlan 12f3c450dc
Merge pull request #5374 from eclipse/jetty-9.4.x-5320-WebSocketHttpClient 
Issue #5320 - using jetty-websocket-httpclient.xml within webapp
 2020-11-03 00:30:09 +11:00
Lachlan Roberts 60c56d8856 changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-02 23:43:42 +11:00
Simone Bordet 39acd7146b Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 2020-11-02 10:48:58 +01:00
Simone Bordet 40fd98d6a9 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-11-02 10:47:03 +01:00
dependabot[bot] 9dbbd4a092
Bump geronimo-interceptor_1.2_spec from 1.1 to 1.2 (#5548) 
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-02 19:44:13 +10:00
Simone Bordet a1b3d3319d
Merge pull request #5491 from eclipse/jetty-9.4.x-5488-jetty-dir.css 
Fixes #5488 - jetty-dir.css not found when using JPMS.
 2020-11-02 10:40:19 +01:00
dependabot[bot] 40acf60936
Bump geronimo-annotation_1.3_spec from 1.1 to 1.3 (#5552) 
Bumps geronimo-annotation_1.3_spec from 1.1 to 1.3.

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-02 19:31:04 +10:00
dependabot[bot] e70e995f0c
Bump openwebbeans.version from 2.0.18 to 2.0.19 (#5551) 
Bumps `openwebbeans.version` from 2.0.18 to 2.0.19.

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

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

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-02 19:30:29 +10:00
dependabot[bot] 2f295c126f
Bump mariadb-java-client from 2.6.0 to 2.7.0 
Bumps [mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 2.6.0 to 2.7.0.
- [Release notes](https://github.com/mariadb-corporation/mariadb-connector-j/releases)
- [Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mariadb-corporation/mariadb-connector-j/compare/2.6.0...2.7.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-30 18:18:43 +00:00
Lachlan Roberts 59883af8bf update version to 9.4.34-SNAPSHOT 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-30 15:00:38 +11:00
Lachlan Roberts 3c3fcc311e Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-5320-WebSocketHttpClient 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-30 12:43:31 +11:00
Joakim Erdfelt 717f75408c
Merge pull request #5471 from eclipse/dependabot/maven/jetty-11.0.x/org.mariadb.jdbc-mariadb-java-client-2.7.0 
Bump mariadb-java-client from 2.6.2 to 2.7.0
 2020-10-28 16:06:28 -05:00
Joakim Erdfelt 506da95885
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-28 15:47:51 -05:00
Joakim Erdfelt 1ad6ebabb6
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-28 15:45:50 -05:00
Joakim Erdfelt 3b8e7c143d
Bump maven.resolver.version from 1.3.1 to 1.6.1 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-28 13:31:42 -05:00
dependabot[bot] 0342bf517e
Bump geronimo-jcdi_2.0_spec from 1.2 to 1.3 
Bumps geronimo-jcdi_2.0_spec from 1.2 to 1.3.

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-26 06:23:26 +00:00
Simone Bordet 4a4a73df2e Fixes #5488 - jetty-dir.css not found when using JPMS. 
Moved jetty-dir.css from jetty-util to jetty-server,
so that it can be found by ResourceHandler when using JPMS.

Updated DefaultServlet to call a ResourceHandler method
to retrieve the stylesheet.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-10-22 16:48:27 +02:00
Joakim Erdfelt e726eefb0b Updating to version 9.4.34-SNAPSHOT 2020-10-20 18:55:39 -05:00
Joakim Erdfelt 1be6875565 Updating to version 9.4.33.v20201020 2020-10-20 18:28:51 -05:00
dependabot[bot] 5eeae2ad5c
Bump jsp-api from 2.1 to 2.2 (#5462) 
Bumps jsp-api from 2.1 to 2.2.

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-10-19 20:42:15 +10:00
dependabot[bot] c1f97e198f
Bump geronimo-jcdi_2.0_spec from 1.2 to 1.3 
Bumps geronimo-jcdi_2.0_spec from 1.2 to 1.3.

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-19 06:15:43 +00:00
dependabot[bot] 1273fc2bc8
Bump mariadb-java-client from 2.6.2 to 2.7.0 
Bumps [mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 2.6.2 to 2.7.0.
- [Release notes](https://github.com/mariadb-corporation/mariadb-connector-j/releases)
- [Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mariadb-corporation/mariadb-connector-j/compare/2.6.2...2.7.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-19 06:15:31 +00:00
Joakim Erdfelt 8c5c589b31
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-16 17:51:50 -05:00
Joakim Erdfelt 1e9c736692
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-16 17:51:32 -05:00
Joakim Erdfelt e6fb4c3ac4 More fixes to allow project to build on Windows 10 2020-10-16 16:45:25 -05:00
Joakim Erdfelt 60fa27f12f
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-16 08:52:05 -05:00
Joakim Erdfelt e12c3ce50b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-16 08:11:42 -05:00
Joakim Erdfelt 369940c8b6
Issue #5451 - Proper use of WorkDir 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-16 06:43:12 -05:00
Lachlan Roberts 5f5eff36cb Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-16 17:14:00 +11:00
Lachlan c95fc2a3dc
Merge pull request #5295 from eclipse/jetty-10.0.x-5287-CompressionPool 
Issue #5287 - rework CompressionPool to use the jetty-util pool
 2020-10-16 17:12:36 +11:00
Lachlan Roberts 8a34442967 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-16 15:41:55 +11:00
Lachlan Roberts 5800f4605f Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-16 15:37:24 +11:00
olivier lamy 6f98b136cf fix tests 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-10-16 13:46:08 +10:00
Joakim Erdfelt fdd880b66b
Issue #5451 - Cleanup of temp file cleanup. 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-15 18:10:38 -05:00
Joakim Erdfelt 9ad6beb805
Merge pull request from GHSA-g3wg-6mcf-8jj6 2020-10-16 01:06:08 +02:00
Lachlan Roberts 4cb475c97d Issue #5320 - also test WebSocketClient on server from WEB-INF/lib 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-15 16:15:57 +11:00
Lachlan Roberts 6cd70ce136 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-5320-WebSocketHttpClient 2020-10-15 14:12:21 +11:00
Lachlan Roberts 608a895aab Issue #5287 - make default CompressionPool capacity 1024 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-14 22:28:26 +11:00
Lachlan Roberts ef816fcc42 DeflaterPoolBenchmark should manage lifecycle of the CompressionPool 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-14 22:28:26 +11:00
Lachlan Roberts 21576f2312 Issue #5287 - fix usages of new CompressionPool 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-14 22:28:26 +11:00
Lachlan Roberts 26f4062d93 Parameterize testWebsocketClientInWebapp over both http and https 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-14 16:35:58 +11:00
Joakim Erdfelt b5a957f415
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-12 08:50:53 -05:00
Simone Bordet 1cd15e8d85
Fixes #5379 - Better handling for wrong SNI. (#5398) 
* Fixes #5379 - Better handling for wrong SNI.

Reworked the SNI logic.
Added support for IP addresses in the SAN extension of certificates in the X509 class.
Fixed keystores to have CN=localhost and SAN with ip=127.0.0.1 and ip=[::1].
Fixed tests that were not using the correct Host header.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-10-12 15:48:53 +02:00
Jan Bartel 943ac79965 Fix containerIncludeJarPattern for quickstart. 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-10-12 14:19:19 +02:00
Joakim Erdfelt b20f0fae46
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-12 06:20:49 -05:00
Joakim Erdfelt dfa076fdb5
Merge pull request #5403 from eclipse/jetty-10.0.x-5401-move-httptester 
Move HttpTester to jetty-http
 2020-10-12 06:14:44 -05:00
dependabot[bot] 8c6e33b871
Bump jakarta.servlet-api from 5.0.0-M1 to 5.0.0 (#5423) 
Bumps [jakarta.servlet-api](https://github.com/eclipse-ee4j/servlet-api) from 5.0.0-M1 to 5.0.0.
- [Release notes](https://github.com/eclipse-ee4j/servlet-api/releases)
- [Commits](https://github.com/eclipse-ee4j/servlet-api/commits)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-10-12 20:54:29 +10:00
Joakim Erdfelt d911c0d0ff
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-12 05:11:55 -05:00
Joakim Erdfelt bd8967407e
Issue #5436 - Disabling failing QuickStartTest 2020-10-12 04:38:08 -05:00
dependabot[bot] 2919d565db
Bump geronimo-jcdi_2.0_spec from 1.1 to 1.2 
Bumps geronimo-jcdi_2.0_spec from 1.1 to 1.2.

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-12 06:22:46 +00:00
Joakim Erdfelt b539131aa6
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-09 13:41:47 -05:00
Joakim Erdfelt fc45286bab
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-09 13:36:42 -05:00
Joakim Erdfelt 72c5ed0ff7
Bumping gcloud from 1.0.0 to 1.105.0 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-08 14:59:34 -05:00
Joakim Erdfelt 57a9e5236a
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-08 09:01:58 -05:00
Joakim Erdfelt 345484929c
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-08 08:53:15 -05:00
Joakim Erdfelt c2655295ac
Eliminating no-longer relevant comment 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-08 08:50:37 -05:00
Joakim Erdfelt fe03a3e6c2
Bump OpenWebBeans from 2.0.11 to 2.0.18 
+ Brings in ServletContainerInitializer fix from 2.0.12

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-08 07:31:20 -05:00
Joakim Erdfelt 857e888e8b
Issue #5401 - Move HttpTester to jetty-http 
+ leaving jetty-http-tools alone

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-07 14:50:31 -05:00
Jan Bartel 6ddbec3c62
Issue #5394 Fix injection for quickstart (#5396) 
* Issue #5394 Fix injection for quickstart

Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-10-06 13:43:41 +02:00
Joakim Erdfelt e3118baf11
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-05 05:43:09 -05:00
Joakim Erdfelt 76eac0eeee
Merge pull request #5389 from eclipse/dependabot/maven/jetty-10.0.x/org.apache.geronimo.specs-geronimo-atinject_1.0_spec-1.2 
Bump geronimo-atinject_1.0_spec from 1.1 to 1.2
 2020-10-05 05:36:53 -05:00
dependabot[bot] 47c2f060eb
Bump javax.servlet-api from 3.1.0 to 4.0.1 
Bumps [javax.servlet-api](https://github.com/javaee/servlet-spec) from 3.1.0 to 4.0.1.
- [Release notes](https://github.com/javaee/servlet-spec/releases)
- [Commits](https://github.com/javaee/servlet-spec/compare/3.1.0...4.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-05 06:25:42 +00:00
dependabot[bot] d987a0d94d
Bump geronimo-atinject_1.0_spec from 1.1 to 1.2 
Bumps geronimo-atinject_1.0_spec from 1.1 to 1.2.

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-05 06:25:38 +00:00
Joakim Erdfelt c223ee37ab Updating to version 11.0.0-SNAPSHOT 2020-10-02 16:38:23 -05:00
Joakim Erdfelt 9ce21ec22b Updating to version 11.0.0.beta2 2020-10-02 16:20:55 -05:00
Lachlan Roberts 27a0879798 dont run WebsocketClientInWebapp test with JPMS 2020-10-02 15:39:49 +10:00
Lachlan Roberts 5b96f6f984 Issue #5320 - Run jetty-websocket-httpclient.xml with server class access. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-01 12:38:17 +10:00
Joakim Erdfelt 85e257fc98 Updating to version 9.4.33-SNAPSHOT 2020-09-30 11:53:09 -05:00
Joakim Erdfelt de97d26f7b Updating to version 9.4.32.v20200930 2020-09-30 11:03:24 -05:00
Joakim Erdfelt 1233ae108e
Fixing bad html links 2020-09-30 09:23:35 -05:00
Lachlan Roberts 00f05cb94e Issue #5320 - reproduce failure to load httpClient for WebSocketClient in webapp 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-09-30 15:11:05 +10:00
Joakim Erdfelt c682f95639
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-29 11:44:04 -05:00
Joakim Erdfelt 88f3dd5a52
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-29 11:37:46 -05:00
Joakim Erdfelt b22ce9c044
Reorg of /demos/ with focus on demo-spec downstream dependencies. (#5367) 
* Reorg of /demos/ with focus on spec modules
* Reworking demo-mock-resources into /demos/ proper
* Removing old /tests/ modules that no longer have a reason for existing.
* Making demo-mock-resources a formal module
* demo-jndi and demo-spec now depend on it
* Restoring jetty-maven-plugin config lost in demo-jetty-webapp
* Fixing jetty-maven-plugin realm usage to be local

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-29 11:37:22 -05:00
Joakim Erdfelt ad2446dd6c
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-29 11:24:28 -05:00
Joakim Erdfelt 3423375a97
Issue #5357 - Updating to https://eclipse.org/ (#5358) 
* Issue #5357 - Updating to https://eclipse.org/

 - Removing redundant <url> refs in pom.xml
 - Correcting bad indenting from merge
 - Correcting mailing list references
 - Correcting bugs.eclipse.org references
 - Correcting text file references
 - Correcting html references
 - Correcting further references
 - Correcting download.eclipse.org reference
 - Adding test for demo-base /proxy/current/
 - Ensuring jetty-client is included in javadoc-proxy.war/WEB-INF/lib

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-29 11:02:32 -05:00
Joakim Erdfelt 02d6ce1b5d
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-29 03:50:55 -05:00
Joakim Erdfelt 61eab91437
Correcting upperbounds enforcer rule check on jetty-http-tools 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-29 03:27:13 -05:00
Joakim Erdfelt 0b5a8789f0
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-28 18:04:41 -05:00
Joakim Erdfelt deb3d60d11
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-28 18:04:32 -05:00
Joakim Erdfelt 9e54e9a081
Post merge cleanup. 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-28 18:04:20 -05:00
Joakim Erdfelt 3c7cd43148
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-28 17:55:41 -05:00
Joakim Erdfelt 8b1fcf0b58
Issue #5362 - Adding SslContextFactory.Client to Proxy's HttpClient (#5363) 
- ProxyServletTest additions for server backend TLS
 - Updating test-proxy-webapp testing
 - Better class name for test
 - More documentation on purpose of test.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-28 17:39:59 -05:00
Joakim Erdfelt 8a524a6bf9
Cleaning up junit dep issues in session tests. 
+ Enforcer mandates common version of junit-jupiter,
  but the org.testcontainers:testcontainers brings in
  an older version.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-28 13:48:46 -05:00
Joakim Erdfelt e879c1fcea
Cleaning up junit dep issues in session tests. 
+ Enforcer mandated

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-28 12:44:32 -05:00
Joakim Erdfelt b9112ce631
Moving jetty-cdi tests to /tests/test-cdi to avoid jpms testing hell 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-28 09:08:35 -05:00
Joakim Erdfelt 2942b9ea74
Minor updates for demo-base 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-28 09:06:27 -05:00
Joakim Erdfelt fcc3b6b4cd
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-25 10:09:58 -05:00
Joakim Erdfelt b56733915b
Issue #5264 - identifying optional deps in jetty-home 
+ Done to ease dependency / exclusions listing requirements
   elsewhere in the reactor.
   (Prevents accidental discovered components from
    triggering actions during use of jetty-home
    as a dependency)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-23 17:50:50 -05:00
Joakim Erdfelt 9a2d6cd597
Issue #5264 - Adding HostHeaderCustomizer to H2/H2C Transport tests 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-23 17:03:44 -05:00
Joakim Erdfelt c9be742d70
Issue #5264 - Fixing test-integration references to demos 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-23 16:44:17 -05:00
Joakim Erdfelt ad805d4756
Issue #5264 - More post move to /demos/ updates 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-23 15:38:34 -05:00
Joakim Erdfelt faf6d80390
Issue #5264 - Moving demo webapps to /demos/ tree 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-23 13:35:19 -05:00
Greg Wilkins 5654437cc9 demo-jaas does not depend on demo-jndi 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2020-09-23 19:31:24 +02:00
Greg Wilkins 5332f3f685 demo-jaas depends on jaas 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2020-09-23 19:10:42 +02:00
Greg Wilkins eedcac314b Merge branch 'jetty-10.0.x' into jetty-10.0.x-5264-demo-modules 2020-09-23 15:27:56 +02:00
Joakim Erdfelt b34c668c85
Fixing checkstyle issue 2020-09-22 11:34:05 -05:00
Joakim Erdfelt 8997a146d3
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-22 09:21:24 -05:00
Joakim Erdfelt be07e84cd7
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-22 09:15:59 -05:00
Joakim Erdfelt a99a832206
Issue #5137 - Cleanup of WebAppContextTest 
+ Cleanup of test-servlet-spec webapp
+ Removing unused methods
+ Commented System.err.println moved to java.util.logging
+ General checkstyle cleanup (empty lines, spacing, etc)
+ Eliminate bogus WebApp LIB ordering tests.
+ No ClassLoader has a order guarantee.
+ Moving HttpSessionListenerTest contents to existing SessionListenerTest
+ Cleanup of SessionListenerTest with eye to resource cleanup
+ Removing ServletContextListenerTest as it duplicates tests
+ Restoring WebAppClassLoaderTest test method
+ `ordering()` is now `testClashingResource()` and properly
  tests assumptions when dealing with a ClassLoader.
  The old test assumed guaranteed order from a ClassLoader,
  which is not a feature of any Java ClassLoader.
  Especially so for URLClassLoader.
+ Restoring clashing resource test

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-22 08:46:11 -05:00
Joakim Erdfelt e9208fa86e
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-22 08:44:25 -05:00
Greg Wilkins d1f6cbb9da added jndi and jaas dependencies 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2020-09-22 13:28:10 +02:00
Greg Wilkins 3768b09d6f added jstl 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2020-09-22 13:07:14 +02:00
Joakim Erdfelt 770f251cbb
Issue #5264 - Fixing demo-jndi deps for javax.mail 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-21 16:48:50 -05:00
Joakim Erdfelt c002305cb2
Issue #5264 - Fixing demo-jndi config 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-21 15:53:45 -05:00
Joakim Erdfelt 533d64cda1
Issue #5264 - Fixing deploy status on demo webapps 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-21 14:47:31 -05:00
Joakim Erdfelt 8a64309cdf
Issue #5264 - Reworking demo/tests into modules based on config classifiers 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-21 13:57:23 -05:00
Joakim Erdfelt 4ecff26022
Issue #5264 - Reworking test-distribution to use jetty-home 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-21 13:56:34 -05:00
dependabot[bot] 3dae15dc5a
Bump mariadb-java-client from 2.6.0 to 2.6.2 (#5302) 
Bumps [mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 2.6.0 to 2.6.2.
- [Release notes](https://github.com/mariadb-corporation/mariadb-connector-j/releases)
- [Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mariadb-corporation/mariadb-connector-j/compare/2.6.0...2.6.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-21 13:23:20 +02:00
olivier lamy 982e24bc80 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-09-17 18:05:44 +10:00
Olivier Lamy eaf07dd4cc
fix get sessionId from fileName (#5288) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-09-17 18:03:52 +10:00
Joakim Erdfelt 0016463089
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-17 02:43:53 -05:00
gregw afe5044d8c Fixes #5281 
Added work module to create work directory
reviewed by janbartel
 2020-09-16 16:20:16 +02:00
gregw d32a818b44 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-15 12:04:49 +02:00
gregw 3bb419842d Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: gregw <gregw@webtide.com>
 2020-09-15 12:04:02 +02:00
Jan Bartel 21105dc0db Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-15 11:03:09 +02:00
Jan Bartel e23eaa26b9 Fix FileSessionDataStoreTest.testCleanOrphans 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-09-15 11:02:01 +02:00
Lachlan Roberts 705646a244 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-15 10:26:27 +10:00
Lachlan f6336887b9
Merge pull request #5265 from eclipse/jetty-10.0.x-JDK-8244090 
JDK-8244090 MethodHandles bug fixed in JDK16
 2020-09-15 10:26:11 +10:00
Greg Wilkins 6305cbce72 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-14 18:10:22 +02:00
Greg Wilkins 780e1207c7
Issue #5254 List/Show modules (#5257) 
* Issue #5254 List/Show modules

 * simplified --list-modules output
 * added --show-module

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

* improve module descriptions

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2020-09-14 18:07:16 +02:00
Lachlan Roberts 14e6bd196e update javadoc for JDK MethodHandles bug tests, stop stacktrace in DistributionTests 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-09-14 17:28:57 +10:00
Simone Bordet ee122aa661 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 2020-09-09 15:42:33 +02:00
Simone Bordet 1fa2b091a2 Merge branch 'jetty-9.4.x' into 'jetty-10.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-09-09 15:39:36 +02:00
Simone Bordet 01135e1515
Fixes #5217 - Review RoundRobinConnectionPool (#5219) 
* Fixes #5217 - Review RoundRobinConnectionPool

Introduced IndexedConnectionPool and RandomConnectionPool.
Clarified semantic of RoundRobinConnectionPool.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-09-09 15:31:28 +02:00
Lachlan Roberts 6b4f198f6b Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-09-09 17:22:28 +10:00
gregw d7b3d62982 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: gregw <gregw@webtide.com>
 2020-09-07 15:59:27 +02:00
Greg Wilkins 7ecf42e3f8
Issue #5162 CDI embedded integration improvements (#5177) 
* Issue #5162 CDI embedded integration improvements

Clean up CDI integration and documentation to better support embedded usage.
 + made listener public
 + added utility class for SCIs

* Issue #5162 CDI embedded integration improvements

Clean up CDI integration and documentation to better support embedded usage.
 + moved EmbeddedWeldTest to jetty-embedded

* fix javadoc

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

* Issue #5162 CDI embedded integration improvements

ventilated text

* fix test pom

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

* Fixed javadoc

* Fixed javadoc

* Issue #5162 CDI embedded integration improvements

Moved tests to jetty-cdi to avoid consequences to other tests in embedded

* trailing new line

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

* updates from review

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

* Feedback from review
 2020-09-07 14:00:20 +02:00
Joakim Erdfelt f4e647f943
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-03 14:13:30 -05:00
Joakim Erdfelt a54ed928ab
Issue #5174 - Reorganized jetty-distribution 
+ Updating license / notice files for EPLv2

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-03 07:13:58 -05:00
Simone Bordet e621c578e6 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 2020-09-02 18:54:19 +02:00
Simone Bordet 466ec0c2d5 Disabled tests broken in Java 15 due to a JVM bug. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-09-02 18:52:10 +02:00
Jan Bartel 7d0e344083 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-02 12:22:18 +02:00
Jan Bartel e2d0e1fa34 Remove println 2020-09-02 12:21:30 +02:00
Jan Bartel 1833ab1ff6 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-02 12:17:30 +02:00
Jan Bartel 9ab95ed824 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-02 12:09:23 +02:00
Jan Bartel ef0c752476
Issue #4888 Ensure HttpSessionListener can access session via (#5220) 
Issue #4888 Ensure HttpSessionListener can call Request.getSession

Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-09-02 11:53:23 +02:00
Jan Bartel 3df5a5d3d6 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-08-31 12:51:29 +02:00
Jan Bartel ad9d702adb
Issue #2609 - Uniform Find Expired Sessions (#5097) 
* Issue #2609 Make all session stores use same algorithm to find expired sessions

Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-08-31 12:39:30 +02:00
Simone Bordet 06a2ebc48e Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 2020-08-27 00:02:55 +02:00
Simone Bordet 30303c7979 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-08-25 16:15:33 +02:00
Jan Bartel e47d2fb32b Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-08-24 17:20:56 +02:00
Jan Bartel 77779ed6d8
Issue #4996 - Regularlize logging (#5167) 
* Issue #4996 Regularize logging

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

Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-08-24 17:15:13 +02:00
olivier lamy 06a538784d Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-08-24 11:03:13 +10:00
Simone Bordet 0af5f676cd Issue #5147 - HTTP2 RoundRobinConnectionPool with maxUsage 
Reworked HTTP/2 release after an exchange is terminated.

Previously, the release was bound to 2 events: onStreamClosed(),
introduced for #2796, and exchangeTerminated().
Unfortunately, if the former happens before the latter and
closes the connection, the latter will see the exchange as
aborted, while in fact it was successful, causing what
reported in #5147, an AsynchronousCloseException.

Now, the release is always performed by the exchangeTerminated()
event. With respect to #2796, the stream is always already
closed by the time the exchangeTerminated() event fires (it
was not before).

Reworked the implementation of RoundRobinConnectionPool using
a lock and aggressively trying to open new connections.

A second fix is related to HttpDestination.release(Connection).
If the connection is closed for e.g. overuse, we need to trigger
the processing of queued requests via send(create: true).

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-08-22 22:10:08 +02:00
Simone Bordet 823e713ee4 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-08-22 17:35:25 +02:00
Simone Bordet 2d3f0e0c10 Improved logging and toString() implementations, 
small refactorings in code and tests.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-08-22 17:31:12 +02:00
Lachlan Roberts 311bcf42a5 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-08-21 10:38:30 +10:00
Joakim Erdfelt 47229e0190
Addressing checkstyle error 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-08-20 13:31:17 -05:00
Joakim Erdfelt 5a0f18513b
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4572-message-indent 2020-08-20 13:29:50 -05:00
olivier lamy 85a281f473 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-08-15 09:25:23 +08:00
Simone Bordet ac4ea4550e Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-08-13 16:52:35 +02:00
Joakim Erdfelt e7a07074f5
Setting DemoBaseTest.testAsyncRest() as @Tag("external") 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-08-13 08:42:44 -05:00
olivier lamy 2d0b90f164 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-08-13 17:03:45 +08:00
Joakim Erdfelt 00f4859e33
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-08-12 16:04:06 -05:00
Joakim Erdfelt 9b5b43a2fd
Fixing KeyStoreScannerTest 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-08-12 15:50:11 -05:00
olivier lamy 7ed2dc0f8b Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-08-12 15:02:05 +08:00
olivier lamy f2d9d2f46f increase stop timeout 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-08-12 15:01:39 +08:00
olivier lamy 26b2433b3f Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-08-12 09:50:32 +08:00
olivier lamy 495a1cb109 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-08-12 09:49:06 +08:00
Olivier Lamy 12667497e1
Jetty 9.4.x surefire 3.0.0 m5 (#5136) 
* test surefire 3.0.0-M5

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

* simplify code to avoid some timeout

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-08-12 10:27:12 +10:00
Simone Bordet 16cd552995 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-08-11 21:00:43 +02:00
olivier lamy e26126264a Updating to version 11.0.0-SNAPSHOT 2020-08-11 16:48:06 +08:00
olivier lamy 6b2b429ba5 Updating to version 11.0.0.beta1 2020-08-11 16:48:06 +08:00
olivier lamy c198d26e6b Updating to version 10.0.0-SNAPSHOT 2020-08-11 16:47:55 +08:00
olivier lamy 429b091578 Updating to version 10.0.0.beta1 2020-08-11 16:47:54 +08:00
Simone Bordet d53d9d8a1d Fixes #5079 - :authority header for IPv6 address not having square brackets. 
On the client:
* Origin.Address.host is passed through HostPort.normalizeHost(),
so that if it is IPv6 is bracketed.
Now the ipv6 address passed to an `HttClient` request is bracketed.
* HttpRequest was de-bracketing the host, but now it does not anymore.

On the server:
* Request.getLocalAddr(), getLocalName(), getRemoteAddr(),
getRemoteHost(), getServerName(), when dealing with an IPv6 address,
return it bracketed.
The reason to return bracketed IPv6 also from *Addr() methods is that
if it is used with InetAddress/InetSocketAddress it still works, but
often it is interpreted as a URI host so brackets are necessary.
* DoSFilter was blindly bracketing - now it does not.

Added a number of test cases, and fixed those that expected
non-bracketed IPv6.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-08-07 15:53:19 +02:00
Simone Bordet e8f76878e3 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 2020-08-04 17:46:55 +02:00
Simone Bordet c49035570e Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-convert_synchronized_to_autolock'. 2020-08-04 16:32:55 +02:00