Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
22,407 Commits 76 Branches 465 Tags 372 MiB
Commit Graph

206 Commits

Author SHA1 Message Date
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 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 aabe5ceee2 remove duplicate dependencies 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-12-07 21:14:59 +10: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 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 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
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
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
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 40fd98d6a9 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-11-02 10:47:03 +01: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
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 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
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
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
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 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 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 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
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
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 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 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
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
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
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 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 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
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 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
Joakim Erdfelt fe9deae849 Updating to version 9.4.32-SNAPSHOT 2020-07-23 13:53:47 -05:00