Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,590 Commits 65 Branches 460 Tags 355 MiB
Commit Graph

25590 Commits

Author SHA1 Message Date
Lachlan Roberts b1a1a60994 fix JettyWebSocketFilterTest in ee9-websocket 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-06-28 16:24:52 +10:00
Jan Bartel bfaf0facb5 Reenable ee10 MetaInfConfigurationTest. 2022-06-28 14:09:49 +10:00
Jan Bartel e6d5eb1826 Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-06-27 12:41:50 +10:00
Jan Bartel 2f1a8a8217 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-06-27 12:39:55 +10:00
Jan Bartel fb29ed45b8
Issue #8196 removed unused jetty-plus.xml (#8197) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2022-06-27 12:38:12 +10:00
Jan Bartel 395f1084d2 Skip ee8-plus tests until 8209 is fixed 2022-06-27 12:35:29 +10:00
Greg Wilkins db3d12f2c4 fix regex test for ee10 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2022-06-27 12:16:24 +10:00
Jan Bartel 80854f8eea Fix jetty-ee9-home build by enabling jetty-ee9-quickstart. 2022-06-27 11:30:02 +10:00
Joakim Erdfelt 1999b39808
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-06-26 12:04:51 -05:00
Joakim Erdfelt d9e157b82f
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-06-25 20:01:01 -05:00
Tamas Cservenak fb4c6228c1
Drop MAT (#8182) 
* Drop MAT

As Maven 3.0 is not being supported, no need for artifical indirection
between sonatype/eclipse package for resolver.

* Drop unused property

* Stabilize dependencies

Declare all the used deps, as MAT is removed, and usage
has changed to resolver API (so declare it).

Plexus Utils is used as well, so declare it explicitly.
 2022-06-25 20:00:11 -05:00
Lachlan Roberts 6ce10d67f7 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-ee9-websocket 2022-06-24 12:48:30 +10:00
Lachlan Roberts 54358b94e2 re-enable ClientConnectTest for websocket ee10 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-06-24 11:34:49 +10:00
Lachlan Roberts 3c92cf6fec re-enable WebAppClassLoaderTest for websocket ee9 & ee10 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-06-24 11:27:19 +10:00
Lachlan Roberts 79385c79b3 re-enable OnMessageReturnTest for websocket ee9 & ee10 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-06-24 11:25:07 +10:00
Lachlan Roberts 1e532032f3 re-enable LargeAnnotatedTest for websocket ee9 & ee10 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-06-24 11:23:22 +10:00
Lachlan Roberts ac68dd05a6 re-enable EndpointViaConfigTest for websocket ee9 & ee10 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-06-24 10:55:02 +10:00
Lachlan Roberts c6206c9b6f re-enable JakartaClientShutdownWithServerWebAppTest for websocket ee9 & ee10 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-06-24 10:54:05 +10:00
Lachlan Roberts 69b6eb1f3e re-enable ContainerProviderServerTest for websocket ee9 & ee10 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-06-24 10:50:57 +10:00
Lachlan Roberts 300f219b25 re-enable LargeContainerTest for websocket ee9 & ee10 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-06-24 10:50:08 +10:00
Lachlan Roberts 8b3a37cfb9 re-enable GracefulCloseTest for websocket ee10 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-06-24 10:49:07 +10:00
Lachlan Roberts a85e80269b reenable PingPongTest for websocket ee9 and ee10 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-06-24 10:44:47 +10:00
Lachlan Roberts 82d7bb5669 fix and improve AltFilterTest in websocket ee9 and ee10 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-06-23 16:15:03 +10:00
Olivier Lamy 83f6b80afb remove ee10 websocket as well 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-06-23 13:31:34 +10:00
Olivier Lamy cb7bb5f334 cleanup not anymore needed content in the pom 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-06-23 13:27:31 +10:00
Jan Bartel 04e0ee7fe7 Undisable jetty-plus tests; remove unused jetty-plus.xml 2022-06-23 10:09:34 +10:00
Joakim Erdfelt 4deb215311
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-06-22 16:27:12 -05:00
François Armand 2dfbea1bc4
Fixes #8152: restore reading JAVA_OPTIONS in script.sh (#8153) 
Co-authored-by: Francois @fanf42 Armand <francois.armand@normation.com>
 2022-06-22 16:26:58 -05:00
Joakim Erdfelt 850dfa8f8a
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-06-22 16:26:11 -05: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
Jan Bartel c734008155 Fix eeX jetty-homes generation. 2022-06-22 18:45:33 +10:00
Lachlan Roberts 08a8e8d4e4 fix websocket compile issue 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-06-22 17:34:45 +10:00
Lachlan Roberts 10ad518da9 fixed websocket JakartaClientClassLoaderTest for ee9 and ee10 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-06-22 16:59:41 +10:00
Lachlan Roberts be2b231b08 fix websocket IdleTimeoutTest for ee9 and ee10 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-06-22 16:57:01 +10:00
Lachlan Roberts 52d044f742 Merge remote-tracking branch 'origin/jetty-12.0.x-ee9-websocket' into jetty-12.0.x 2022-06-22 13:21:59 +10:00
Jan Bartel 9893c81abf
Jetty 12.0.x update jakarta api versions (#8192) 
* update to latest jakarta official releases
 2022-06-22 10:32:54 +10:00
Jan Bartel 3a2a647b08 Fix ee9 jspc maven plugin it tests 2022-06-22 09:29:26 +10: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 97f37d77a6
Add Jetty 10.0.10 to VERSION.txt 2022-06-21 15:26:16 -05:00
Joakim Erdfelt 6da27fcaaa
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-06-21 15:25:02 -05:00
Joakim Erdfelt 5fddbf9bb1
Issue #8184 - Correcting match logic for multiple servlet suffix url-pattern (#8185) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-06-21 15:24:39 -05:00
Simone Bordet 0afbf1f927
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-06-21 15:02:50 +02: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
Simone Bordet e81dab91e0
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-06-21 14:44:33 +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
Greg Wilkins 99b640749c Deploy Supplier<Handler> 2022-06-21 16:29:21 +10:00
Lachlan Roberts e9b8dc14bc disable failing ee9 jetty websocket tests 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-06-21 13:25:19 +10:00
Lachlan Roberts 9756a15f57 disable failing ee9 jakarta websocket tests 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-06-21 13:00:58 +10:00