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

22235 Commits

Author SHA1 Message Date
Lachlan Roberts 64655f7b7e Issue #5320 - allow websocket client jars to be provided by server 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-03 17:16:27 +11:00
Joakim Erdfelt a7ed2f072a
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-02 19:04:59 -06: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
Joakim Erdfelt 981b50df58
Merge pull request #5559 from eclipse/jetty-9.4.x-5555-NPE-NamedFilterMapping 
Jetty 9.4.x 5555 npe named filter mapping
 2020-11-02 07:57:18 -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
gregw 4c49ca5184 More cleanup for #5555 
Some more cleanup for #5555
 2020-11-02 14:08:46 +01:00
Lachlan Roberts 60c56d8856 changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-02 23:43:42 +11:00
gregw 27f0c4141c Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-02 13:31:19 +01:00
Greg Wilkins b77ee515a5
Fixes #5555 NPE if Filter of named servlet (#5556) 
Fixed #5555 NPE if there is a filter with a servlet name mapping, but a request is received for a servlet without a name match.
Added more simple tests for servlet and filter mappings
 2020-11-02 13:30:52 +01:00
gregw 47b1583c7f Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-02 10:58:06 +01:00
Simone Bordet 40fd98d6a9 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-11-02 10:47:03 +01:00
gregw f21c606f1d Fixes #5539 Stats XML format 
Signed-off-by: gregw <gregw@webtide.com>
 2020-11-02 10:45:45 +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
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] d58fed5b9a
Bump spring-beans from 5.2.9.RELEASE to 5.3.0 (#5543) 
Bumps [spring-beans](https://github.com/spring-projects/spring-framework) from 5.2.9.RELEASE to 5.3.0.
- [Release notes](https://github.com/spring-projects/spring-framework/releases)
- [Commits](https://github.com/spring-projects/spring-framework/compare/v5.2.9.RELEASE...v5.3.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-02 19:29:16 +10:00
gregw 365bab153c Fixes #5555 NPE if Filter of named servlet 
Fixed #5555 NPE if there is a filter with a servlet name mapping, but a request is received for a servlet without a name match.
Added more simple tests for servlet and filter mappings
 2020-11-02 10:19:08 +01:00
dependabot[bot] 9b4b52df59
Bump pax-url-wrap from 2.5.2 to 2.6.1 
Bumps [pax-url-wrap](https://github.com/ops4j/org.ops4j.pax.url) from 2.5.2 to 2.6.1.
- [Release notes](https://github.com/ops4j/org.ops4j.pax.url/releases)
- [Commits](https://github.com/ops4j/org.ops4j.pax.url/compare/url-2.5.2...url-2.6.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-02 06:40:10 +00:00
dependabot[bot] 10243b675e
Bump org.eclipse.osgi from 3.6.0.v20100517 to 3.7.1 
Bumps org.eclipse.osgi from 3.6.0.v20100517 to 3.7.1.

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-02 06:38:03 +00:00
Lachlan Roberts b327992f75 Don't enforce the default WebSocketMapping. 
If a user wants to use the WebSocketUpgradeFilter with a different WebSocketMapping,
they can add the ServerContainer manually and put their own WebSocketMapping in.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-02 16:14:27 +11:00
Lachlan Roberts 5d9c81a511 revert to using init parameter to identify the WebSocketUpgradeFilter 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-02 15:44:14 +11:00
Lachlan Roberts 458d67e3db Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-5320-WebSocketHttpClient 2020-11-02 15:07:05 +11:00
olivier lamy 137c1e8b3a localhost cannot work on kubernetes 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-11-02 13:06:04 +10:00
olivier lamy 1b8f3aa07a copy fuzzing config at start of the container 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-11-01 10:31:17 +10:00
olivier lamy 1ccbe7289c turn json reports to surefire reports 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-10-31 15:48:25 +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
Joakim Erdfelt ed1b165fa6
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-30 13:18:39 -05:00
Joakim Erdfelt 8b61d70af5
Merge pull request #5510 from eclipse/dependabot/maven/jetty-9.4.x/io.grpc-grpc-core-1.33.0 
Bump grpc-core from 1.0.1 to 1.33.0
 2020-10-30 13:18:16 -05:00
Joakim Erdfelt aa45104649
Merge pull request #5460 from eclipse/dependabot/maven/jetty-9.4.x/org.asciidoctor-asciidoctor-maven-plugin-2.1.0 
Bump asciidoctor-maven-plugin from 1.5.6 to 2.1.0
 2020-10-30 13:17:32 -05:00
Joakim Erdfelt 3aba60c31f
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-30 13:12:50 -05:00
Joakim Erdfelt 1f727cd10a
Merge pull request #5538 from eclipse/jetty-9.4.x-5531-ssl-dump-protocols 
Issue #5535 - Adding support for regex include/exclude of Protocols to SslContextFactory
 2020-10-30 13:07:30 -05:00
Joakim Erdfelt 249cb02a75
Issue #5535 - Removing irrelevant lines on test 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-30 11:22:46 -05:00
Simone Bordet 5a59d47a68 Improvements to the Jetty documentation. 
Ported and updated the documentation about JMX.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-10-30 16:32:49 +01:00
Joakim Erdfelt 074b4f90f7
Issue #5535 - Adding regex include/exclude of Protocols to SslContextFactory 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-30 10:29:35 -05: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 c969fba71a
Issue #5531 - Using .setExcludeProtocols correctly. 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-29 20:28:21 -05:00
Joakim Erdfelt cff4771375
Issue #5531 - Test excluded protocol behavior 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-29 13:57:20 -05:00
Joakim Erdfelt dadd299e47
Cleanup of SslContextFactoryTest 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-29 13:44:21 -05:00
Lachlan Roberts 377d0a8dc0 fix checkstyle issues 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-29 16:17:01 +11:00
Lachlan Roberts d5222df896 copy all .json and .html reports from docker container 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-29 16:09:44 +11:00
Lachlan 5bb47c954c
Merge pull request #5517 from eclipse/jetty-10.0.x-5493-StatisticsHandler 
Issue #5493 - Fix and simplify graceful shutdown of StatisticsHandler
 2020-10-29 08:55:22 +11:00
olivier lamy 7ced55d18b start working on getting json result and transform then into junit results 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-10-29 07:54:06 +10: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 1c3c3ca092
Merge pull request #5529 from eclipse/dependency/jetty-9.4.x/maven.resolver.version-1.6.1 
Bump maven.resolver.version from 1.3.1 to 1.6.1
 2020-10-28 15:44:55 -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
Greg Wilkins d3bdeefa1a Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2020-10-28 18:01:56 +01:00
Greg Wilkins 7a0de6af3a
Fixes #5498 ServletHolder cleanup (#5514) 
* Fixes #55498 ServletHolder cleanup

Various cleanups for #5498 including:
 + renaming multiple `_servlet` fields in inner classes to avoid confusion
 + better comments in prepare method to describe why it is needed
 + call prepare from Invoker servlet
 + The `_servlet` field is not set until after the servlet is initialized
 + Consistent wrapping of `SingleThreadedWrapper` now in `initServlet`
 + The `getServlet` method now looks the volatile `_servlet` to avoid locking if possible
 + The `handle` method now calls `getServletInstance` as servlet will have been initialized in `prepare`
 + Found and fixed race with making unavaiable servlet available again
 + fixed nanotime overflow
 + fixed several compiler warnings/suggestions
 + removed while true from unavailable servlet
 + Do not destroy servlets unless init has been called.
 + Added TODOs about calling predestroy on instances not created by the holder.
 + Do not destroy servlets unless init has been called.
 + Added TODOs about calling predestroy on instances not created by the holder.
 + improved dump and toString
 2020-10-28 17:46:49 +01:00