Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,663 Commits 69 Branches 462 Tags 354 MiB
Commit Graph

25663 Commits

Author SHA1 Message Date
Jan Bartel 07a30cc3e3 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-jndi 2022-06-30 16:39:54 +10:00
Greg Wilkins 3547bdf3d9 Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-06-30 16:39:09 +10:00
Greg Wilkins e285b80f45 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-06-30 16:38:29 +10:00
Greg Wilkins cb918212f2
Fixed #8206 interrupted QTP.stop (#8220) 
Made QTP stop resilient to spurious and self interrupts

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2022-06-30 16:34:21 +10:00
Greg Wilkins ea5bedf072
Jetty 12.0.x deployment (#8208) 
Deploy webapps for different environments from the same webapps directory.
The maximal environment known to the AppProviders is used as the default environment.
An explicit environment can be set in a properties file for an application, which is also used for property substitution in any context xml file.
 2022-06-30 09:51:19 +10:00
Joakim Erdfelt 5304233b15
Go back to simpler Jenkinsfile (#8217) 2022-06-29 17:11:49 -05:00
Lachlan Roberts c8e6bbdf1b Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-06-29 17:28:06 +10:00
Lachlan Roberts ee02d163c3 Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-06-29 17:22:20 +10:00
Jan Bartel 5c267ce7ed
Jetty 12.0.x eex jettymavenplugin (#8200) 
* Fix ee9/10 jetty maven plugin and refactor it tests
 2022-06-29 17:18:18 +10:00
Lachlan Roberts b999e72706 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-06-29 17:12:36 +10:00
Lachlan 8e0ccad495
Merge pull request #8176 from eclipse/jetty-10.0.x-8170-WebSocketHttp2Close 
Issue #8170 - fix WebSocket close over HTTP/2
 2022-06-29 17:12:12 +10:00
Lachlan Roberts d46f16e588 Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-06-29 17:09:36 +10:00
Lachlan Roberts e5a4a04b2a Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-06-29 16:37:23 +10:00
Lachlan 13c61684fe
Merge pull request #8164 from eclipse/jetty-10.0.x-8151-websocketClose 
Issue #8151 - make websocket close non-blocking
 2022-06-29 16:30:27 +10:00
Jan Bartel 2a9bf55adb Fix missed renames for ee9/10 tests 2022-06-29 10:53:56 +10:00
Jan Bartel 633c85337c Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-jndi 2022-06-29 10:17:05 +10:00
Jan Bartel e990f0dfbb Fix names of jetty-ee9/10-test submodules 2022-06-29 10:11:42 +10:00
Jan Bartel c7f9ef797b Fix jndi and enable tests 2022-06-29 09:44:05 +10:00
Lachlan Roberts d05d6634a6 re-enable JettyClientClassLoaderTest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-06-28 16:24:52 +10:00
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