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

664 Commits

Author SHA1 Message Date
Joakim Erdfelt 4768745849
Updating to version 12.0.1 2023-08-29 16:38:20 -05:00
Joakim Erdfelt cb8c4b6ab2
Updating to version 11.0.17-SNAPSHOT 2023-08-25 14:55:08 -05:00
Joakim Erdfelt bedff458c4
Updating to version 11.0.16 2023-08-25 14:43:04 -05:00
Joakim Erdfelt 896dee2466
Updating to version 10.0.17-SNAPSHOT 2023-08-25 14:27:38 -05:00
Joakim Erdfelt a2735a9ae9
Updating to version 10.0.16 2023-08-25 14:10:55 -05:00
Joakim Erdfelt 053d44e52c
Bump jetty-setuid to 2.0.1 (#10406) 
* Bump jetty-setuid to 2.0.1
 2023-08-25 13:47:50 -05:00
Joakim Erdfelt 900f50f513
Issue #10271 - new jetty-home `pid` module (#10272) 
* Issue #10271 - new jetty-home module `pid`

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2023-08-25 09:12:49 -05:00
Simone Bordet 4b28b9156d
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2023-08-24 19:57:43 +02:00
Simone Bordet cf97e58121
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2023-08-24 19:53:43 +02:00
Simone Bordet 0411e1f19f
Removed unnecessary stale dependency on the javadoc artifact. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2023-08-24 19:49:27 +02:00
Simone Bordet 946b047cde
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2023-08-24 19:45:09 +02:00
Simone Bordet 5cc4a9da09
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2023-08-24 19:41:57 +02:00
Olivier Lamy 2ea646bacd
Issue #10312 Remove cyclic dependencies between jetty-home and jetty-documentation. Add new module jetty-documentation (#10348) 
* cleanup jetty home build extracting jetty-documentation
* Issue #10312 Remove cyclic dependencies between jetty-home and jetty-documentation

Signed-off-by: Olivier Lamy <olamy@apache.org>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2023-08-24 19:41:17 +02:00
Joakim Erdfelt 9c324326c5
Merge `release/12.0.0` back into `jetty-12.0.x` (#10237) 
* Updating to version 12.0.0

* Updating to version 12.0.1-SNAPSHOT
 2023-08-08 00:55:19 +02:00
Simone Bordet 69e2f10521
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2023-07-16 12:01:43 +02:00
Joakim Erdfelt 8e52abe8c9
Merge `jetty-11.0.x` into `jetty-12.0.x` - July 14 (#10108) 
* Updating various old/moved URL references found across project (`jetty-10.0.x`) (#10098)

+ Now that the migration of `https://eclipse.org/jetty/` to `https://eclipse.dev/jetty/` has occurred, it is time to review the URI use in our project
+ Updated URLs in poms
+ Added more URIs to XmlConfiguration
+ Updated URLs in module files
+ Updated URLs in documentation
+ Updated URLs in HTML
+ Correcting bad double-scheme URLs (eg: `http://https://www.eclipse...`)
+ Updating text in *.mod files
+ Removing `/current/` from path `/jetty/documentation/current/`
+ Fixing mailing list URL
+ Fixing github URL references in jsps

---------

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2023-07-14 20:21:11 -05:00
Joakim Erdfelt 8e5bedcf8f
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2023-07-14 12:48:56 -05:00
Joakim Erdfelt a9c596e3d7
Updating various old/moved URL references found across project (`jetty-10.0.x`) (#10098) 
* Now that the migration of `https://eclipse.org/jetty/` to `https://eclipse.dev/jetty/` has occurred, it is time to review the URI use in our project

+ Updated URLs in poms
+ Added more URIs to XmlConfiguration
+ Updated URLs in module files
+ Updated URLs in documentation
+ Updated URLs in HTML
+ Correcting bad double-scheme URLs (eg: `http://https://www.eclipse...`)
+ Updating text in *.mod files
+ Removing `/current/` from path `/jetty/documentation/current/`
+ Fixing mailing list URL

---------

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2023-07-14 12:38:45 -05:00
Simone Bordet 9567ade30f
* Updated README files. 
* Updated the Getting Started sections.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2023-07-11 11:40:03 +02:00
Greg Wilkins 0b1c28a888
Jetty 12 inserted handler in ee10 servlet context (#9927) 
This PR refactors the ee10 handing of servlet API request and response objects:

 + The ServletContextHandler matches the request to a servlet and creates a one time only ServletContextRequest and a ServletContextResponse
 + A reusable ServletChannel object with all the heavy weight HttpInput and HttpOutput object is associated with the ServletContextRequest and ServletContextResponse.
 + Once the handling reaches the ServletHandler, the possibly wrapped request, response and callback are associated with the ServletChannel before handling.
 + Were possible the ServletApiRequest and ServletApiResponse use the possibly wrapped request/response

Added tests to check that GzipHandler can now be nested inside of an EE10 context.

---------

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
Signed-off-by: gregw <gregw@webtide.com>
Co-authored-by: Ludovic Orban <lorban@bitronix.be>
 2023-06-22 17:04:49 +02:00
Jan Bartel 64b54adb9c
Remove unused ee10-demo-realm files and add distro test (#9886) 2023-06-08 18:54:10 +02:00
Jan Bartel 1bc1aacbe7
Fix redirect demo; fix links to sources for demos; fix blog link (#9890) 
* Fix redirect demo; fix links to sources for demos; fix blog link

* Update jetty-home/src/main/resources/modules/demo.d/root/index.html

Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

---------

Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2023-06-08 18:24:08 +02:00
Simone Bordet 30a161d1da
Fixes #9880 - Jetty 12 - jetty.sh does not work on Ubuntu. 
The problem was that when using environment the generation of the command line
via --dry-run was missing the "envs" argument.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2023-06-06 15:48:15 +02:00
Lachlan Roberts be0620ed12 Issue #9631 - use correct artifactId for exclusions 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2023-05-05 16:41:27 +10:00
Lachlan Roberts 89c42c89e7 Issue #9631 - update remaining pom.xml files 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2023-05-05 16:36:55 +10:00
Greg Wilkins 7275bf15a9
Jetty 12.0.x core security (#9405) 
core security module

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: gregw <gregw@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Lachlan Roberts <lachlan@webtide.com>
Co-authored-by: Jan Bartel <janb@webtide.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
 2023-05-02 15:35:49 +02:00
Joakim Erdfelt 1efe9afdf8
Updating to version 11.0.16-SNAPSHOT 2023-04-11 13:53:30 -05:00
Joakim Erdfelt 5bc5e562c8
Updating to version 11.0.15 2023-04-11 13:37:23 -05:00
Joakim Erdfelt ca3c1756ad
Updating to version 10.0.16-SNAPSHOT 2023-04-11 13:23:25 -05:00
Joakim Erdfelt 68017dbd00
Updating to version 10.0.15 2023-04-11 12:24:32 -05:00
Joakim Erdfelt 83b59ae718
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2023-03-24 13:44:13 -05:00
Simone Bordet 856d3338f2
Fixes #9391 - port/move Jetty WebSocket APIs, client and server to je… (#9469) 
* Moved -api, -common, -client to jetty-core/jetty-websocket.
* Implemented jetty-core/jetty-websocket/jetty-websocket-jetty-server using only Jetty core APIs, not Servlet.
* Fixed Graceful shutdown order.
* Fixed mistakes in HttpFieldsWrapper, wrongly calling HttpHeader.name() instead of asString().
* Updated tests to pass cleanly.
* Fixed BOMs and POM dependencies.
* Introduced websocket-jetty.mod and websocket-jetty-client.mod, now used by ee10's Jetty WebSocket.
* Fixed OSGi references to old artifactIds.
* Added test to show how to lookup and use ServerWebSocketContainer from a Handler.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2023-03-24 19:42:51 +01:00
Joakim Erdfelt 388d9df4c3
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2023-03-24 08:35:09 -05:00
Joakim Erdfelt 515b1a89de
Rename RUN_CMD to RUN_ARGS 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2023-03-23 12:15:03 -05:00
Joakim Erdfelt 9060adb8ca
Merge remote-tracking branch 'origin/jetty-10.0.x' into fix/jetty-10.0.x/jetty-sh-start-properties 2023-03-20 23:14:28 -05:00
Olivier Lamy 22bb0d0788 Updating to version 11.0.15-SNAPSHOT 2023-03-01 18:56:07 +10:00
Olivier Lamy e62cc0344a Updating to version 10.0.15-SNAPSHOT 2023-03-01 18:55:10 +10:00
Joakim Erdfelt 8523437309
Updating action/supervise|run|demo 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2023-02-23 16:29:04 -06:00
Joakim Erdfelt 22276201f1
Improve action/start and start-stop-daemon usage 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2023-02-23 13:49:49 -06:00
gregw 7cfc239990 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 
Signed-off-by: gregw <gregw@webtide.com>
 2023-02-15 15:27:17 +11:00
gregw 7a7d69a69f Happy no year 
Remove modification date from copyright notice and instead just have the
project inception year.

Signed-off-by: gregw <gregw@webtide.com>
 2023-02-15 15:22:32 +11:00
Joakim Erdfelt 3b61926500
Use xargs to split --dry-run args properly for RUN_CMD execution 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2023-02-06 15:47:09 -06:00
Simone Bordet cd732a175c
Review and normalized all Maven module <name> for consistency. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2023-01-27 19:09:30 +01:00
Ludovic Orban 12deee847d #9145 re-enable DynamicListenerTests 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2023-01-27 17:44:09 +01:00
Ludovic Orban d6ecf46e84 #9145 add missing exclusion for ee8 artifacts 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2023-01-27 17:44:09 +01:00
Greg Poulos 1dc175efac
Jetty 12.0.x documentation (#9096) 
* fix broken include
* fix demo module example
* add documentation markup to fix documentation build error
* editorial suggestions for installation instructions
* editorial suggestions for quickstart guide
* fix unresolved directive errors
* fix file not found exception thrown during doc build
* editorial suggestions for deployment quickstart, plus some fixed references
* Update documentation/jetty-documentation/src/main/asciidoc/operations-guide/begin/start.adoc

Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
 2023-01-06 17:21:46 +01:00
Joakim Erdfelt 260245c012
Updating to version 11.0.14-SNAPSHOT 2022-12-07 15:04:55 -06:00
Joakim Erdfelt a04bd1ccf8
Updating to version 11.0.13 2022-12-07 14:46:29 -06:00
Joakim Erdfelt 54c4c03244
Updating to version 10.0.14-SNAPSHOT 2022-12-07 14:33:17 -06:00
Joakim Erdfelt 1c2636ea05
Updating to version 10.0.13 2022-12-07 14:12:50 -06:00
Joakim Erdfelt ca3101814b
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-12-06 08:02:21 -06:00
Joakim Erdfelt ccdf6fb983
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-12-06 08:01:11 -06:00
Joakim Erdfelt 72f8fef392
Excluding javadoc jar from jetty-home 2022-12-05 15:47:43 -06:00
Joakim Erdfelt 18f22816c9
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-11-17 13:01:00 -06:00
Joakim Erdfelt cba414f255
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-11-17 11:51:54 -06:00
Joakim Erdfelt 22a810debf
Referencing included /docs/ and /javadoc/ in root index.html 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-11-16 08:55:20 -06:00
Joakim Erdfelt 43615b53f3
Issue #8895 - Fixing jetty-documentation dep reference 
Now the jetty-home artifact builds at the right time in the reactor.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-11-15 14:38:55 -06:00
Joakim Erdfelt 3305440adc
Unpacking the right javadoc artifact 2022-11-14 15:51:27 -06:00
Joakim Erdfelt 67629e68cc
Issue #8895 - Introduce jetty-home-<ver>-with-docs.zip 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-11-14 15:35:40 -06:00
Simone Bordet 41e9842921
Fixes #8858 - Jetty 12 Review MovedContextHandler. (#8859) 
* Fixes #8858 - Jetty 12 Review MovedContextHandler.

Updated method names to avod references to Servlet concepts.
Added test cases.
Updated XML files.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-03 16:13:46 +01:00
Simone Bordet 0d0790834d
Moved FastCGIProxyServlet in ee9 to FastCGIProxyHandler in core. (#8718) 
Moved FastCGIProxyServlet in ee9 to FastCGIProxyHandler in core.
Moved TryFilesFilter in ee9 to TryPathsHandler in core.
Update Jetty modules to properly setup the class-path in case of proxy usage.

Fixes Surefire configuration to run the tests.
The problem is that fcgi-proxy depends on fcgi-client, so both will be put on the module-path.
However, fcgi-server is used for the tests, it is in the class-path, but depends on fcgi-client that is on the module-path.
Therefore, when a fcgi-server class tries to access a fcgi-client class, JPMS throws because the fcgi-client module does not export to the unnamed module.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-10-18 00:00:34 +02:00
Jan Bartel 756cf2102e
Fix jaas demos (#8689) 
* Fix jaas demos add distro test
 2022-10-12 09:33:14 +11:00
ianrifkin f9616fed93
Issue #7182 having running() delete the state file where it previously only deleted the pid file. (#7184) 
* Issue #7182 changing approach from deleting the state file consistently to simply grep'ing for last line in JETTY_STATE file

Signed-off-by: Ian Rifkin <ianrifkin@ianrifkin.com>
 2022-10-06 15:33:43 -05:00
Lachlan Roberts 1cc91d36ef Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-09-23 14:42:23 +10:00
Joakim Erdfelt ebfb7c63bb
Bump log4j2 to 2.19.0 (#8605) 
* Bump log4j2 to 2.19.0
+ Remove old exclusions to log4j in infinispan
  (no longer relevant)
* fix usage of log4j-slf4j2-impl

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-09-22 17:38:48 +10:00
Simone Bordet 3dd81be051
Updated SLF4J to 2.0.1. 
Updated Log4j2 to 2.19.0.
Updated logging-log4j2.mod.
Removed references to og4j-slf4j18-impl, replaced by log4j-slf4j2-impl.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-09-20 22:04:36 +02:00
Olivier Lamy 6b1611592d
merge back release branch to bump version to 11.0.13-SNAPSHOT (#8594) 
* Updating to version 11.0.12

* Updating to version 11.0.13-SNAPSHOT

* add release jetty-9.4.49.v20220914 and 10.0.12 in VERSION.TXT
 2022-09-16 19:50:26 +10:00
Olivier Lamy dbd07146ec
merge back release branch to bump version to 10.0.13-SNAPSHOT (#8593) 
* Updating to version 10.0.12

* Updating to version 10.0.13-SNAPSHOT

* VERSION.TXT =+ content of jetty-9.4.49.v20220914 release

* remove strange line and reorder
 2022-09-16 19:50:12 +10:00
Olivier Lamy d11b5e0742
add module configuration for demo handler (#8490) 
* add module configuration for demo handler

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-09-02 17:46:38 +10:00
Olivier Lamy 0e526d9b3f fix deployment of some demo modules 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-08-23 12:15:38 +10:00
Olivier Lamy 8fdbf50222
Restore jetty-ee8-maven-plugin mvove back ITs to jetty-eeX-maven-plugin modules (#8472) 
add back jetty-ee8-maven-plugin
- add back jetty-ee8-jspc-maven-plugin
- remove not used site plugin and simplify code
- moving back ee9 maven plugin ITs to the module
- back of ee10 maven ITs test to the plugin module


Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-08-19 17:50:58 +10:00
Joakim Erdfelt 3d51380922
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-08-16 07:00:11 -05:00
Joakim Erdfelt aff36c1c0c
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-08-16 06:59:33 -05:00
Joakim Erdfelt 3157256ff9
Bump slf4j to 2.0.0-beta1 and logback to 1.3.0-beta0 (#8467) 
* Bump slf4j to 2.0.0-beta1 and logback to 1.3.0-beta0
* use new artifactId slf4j-reload4j

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-08-16 06:58:48 -05:00
Simone Bordet f4056d6132
Fixed DemoModulesTests to use <env>-demos.mod (plural) instead of <env>-demo.mod. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-08-12 19:09:45 +02:00
Simone Bordet 6f0f8854de
Merged branch 'jetty-12.0.x' into 'jetty-12.0.x-module-renaming'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-08-12 17:31:01 +02:00
Simone Bordet 0915492a7b
Jetty 12 module renaming - demos. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-08-12 10:12:39 +02:00
Olivier Lamy 44a37746e6
Jetty 12 : reactivate `jetty-ee9-demo-embedded` and `jetty-ee9-demo-proxy-webapp` and add more (#8419) 
* ee8 demos to use ee9 demos resources
* add jetty-ee8-demo-jaas-webapp
* add jetty-ee8-demo-jndi-webapp jetty-ee8-demo-mock-resources
* uhm jetty-ee8-demo-jetty-webapp have some issues
* fix jetty-ee8-demo-jetty-webapp
* fix some jetty-ee9-demo-embedded and add back jetty-ee8-demo-proxy-webapp
* demo-embedded need to have jetty-ee9-demo-jsp-webapp built first
* fixing more demos modules. Activate dist test for demo modules and all env


Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-08-12 17:52:53 +10:00
Simone Bordet be2d4ef069
Jetty 12 module renaming - jetty-quic. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-08-12 09:33:31 +02:00
Simone Bordet 122b095260
Jetty 12 module renaming - jetty-http3. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-08-12 09:33:31 +02:00
Simone Bordet 7d264e6024
Jetty 12 module renaming - jetty-http2. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-08-12 09:33:31 +02:00
Simone Bordet 11c3642892
Jetty 12 module renaming - jetty-fcgi. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-08-12 09:33:31 +02:00
Greg Wilkins 408de26ec2 Created core-demo and updated demo root 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2022-08-10 12:04:39 +10:00
Olivier Lamy 96a455c157 fix HashLoginService use of Resource 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-08-05 19:36:50 +10:00
Olivier Lamy d5a0b2bd1e more fixes on Resource 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-08-05 18:48:08 +10:00
Jan Bartel b6d8bcb7b4 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-ee9-demos 2022-07-13 10:05:35 +10:00
Jan Bartel 34d21dd1ec WIP get ee9 demos working; fix some ee10 demos 2022-07-12 18:23:37 +10:00
Olivier Lamy d164efb779
add jetty-ee8-home and unzip it in the jetty-home (#8283) 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-07-12 12:04:26 +10:00
Jan Bartel a5fcce595f WIP 2022-07-11 23:21:35 +10:00
Jan Bartel d03193a770 WIP make ee9 demos work 2022-07-11 16:43:35 +10:00
Greg Wilkins 33487b5fd8 reenable ee9 distribution tests 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2022-07-08 09:51:29 +10:00
Jan Bartel fc3fb15dc4 Fix jetty-ee10-demo-jndi/jetty-webapp and ContextProvider 2022-07-04 15:42:17 +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
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
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
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
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 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
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
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
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
Olivier Lamy 6c4f3b37e7
rename ee9-demo to jetty-ee9-demo (#8178) 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-06-20 14:48:22 +10:00
Jan Bartel eccbfce6dd Rename infinspan-xxx to jetty-infinispan-xxx 2022-06-16 16:31:42 +10:00
Jan Bartel 6139b37fb6 Fix path of ee10-root in .mod file 2022-06-06 09:17:43 +10:00
Greg Wilkins a5c438fd29
Rename demo-eeX to eeX-demo (#8097) 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2022-06-06 08:58:09 +10:00
Jan Bartel 4fde2b7769 Merge remote-tracking branch 'origin/jetty-12.0.x-more-modules-enabled' into jetty-12.0.x 2022-05-31 10:40:04 +10:00
Jan Bartel 43c662a3ac Fix more ee10 modules. 2022-05-30 18:50:23 +10:00
Lachlan Roberts 9b3b531a4d Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-05-30 12:56:50 +10:00
Joakim Erdfelt e19233c1e3
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-05-26 09:18:27 -05:00
Joakim Erdfelt 3fe0d5e12f
Fix #7754 - Allow JETTY_SYS_PROPS to be configured by /etc/default/ (#7819) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-05-26 09:18:10 -05:00
Jan Bartel a5bb51785d WIP rename ee10 demo modules; fix modules 2022-05-25 19:07:18 +10:00
Jan Bartel c096cc07ba Build more demo webapps; fix errors in module files. 2022-05-16 13:37:34 +02:00
Olivier Lamy 852e5850dc fix typo 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-05-09 20:42:47 +10:00
Olivier Lamy de1c74cdb9 servlet api as well 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-05-09 20:42:47 +10:00
Greg Wilkins 3f6f725cce disable jetty-home 
enabled a few more ee9 modules, but not enough
enabled integrations
 2022-05-04 19:29:56 +02:00
Olivier Lamy cb2aa6add8
copy deps for jetty-home (#7955) 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-05-04 21:54:52 +10:00
Greg Wilkins 04acdb72f0 Jetty-12 Restructure 
Copied over non ee10 components from the hackathon branch

Co-authored-by: Greg Wilkins <gregw@webtide.com>
Co-authored-by: Jan Bartel <janb@webtide.com>
Co-authored-by: Joakim Erdfelt <joakim@webtide.com>
Co-authored-by: Lachlan Roberts <lachlan@webtide.com>
Co-authored-by: Ludovic Orban <lorban@webtide.com>
Co-authored-by: Olivier Lamy <olamy@webtide.com>
Co-authored-by: Simone Bordet <sbordet@webtide.com>
 2022-05-03 15:50:54 +02:00
Joakim Erdfelt 16420f0181
Set version to `10.0.10-SNAPSHOT` (#7823) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-04-03 20:33:44 +10:00
Joakim Erdfelt f079949a35
Merge Release 10.0.9 (#7821) 
* Updating to version 10.0.9

* Updating to version 10.0.10
 2022-04-02 08:43:44 -05:00
Joakim Erdfelt 9548ab0cc9 Updating to version 11.0.10-SNAPSHOT 2022-03-30 13:06:46 -05:00
Joakim Erdfelt 243a48a658 Updating to version 11.0.9 2022-03-30 12:43:51 -05:00
Joakim Erdfelt cc0eb6e468
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-03-30 09:13:38 -05:00
dependabot[bot] 6b25c271b1
Bump jolokia-war from 1.3.3 to 1.7.1 (#6907) 
* Bump jolokia-war from 1.3.3 to 1.7.1

Bumps jolokia-war from 1.3.3 to 1.7.1.

---
updated-dependencies:
- dependency-name: org.jolokia:jolokia-war
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

* Adding HashLoginService to jolokia.xml
* Fixing typo in FQCN for Jetty Password utility
* Using logger to print warning, not ServletContext.log() as it causes an NPE.

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-03-29 21:04:35 -05:00
Joakim Erdfelt 3dbfec084a
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-03-23 16:03:38 -05:00
Joakim Erdfelt b419a8956e
Issue #6879 - Remove jminix (#7770) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-03-23 16:02:35 -05:00
ianrifkin 9da5c21ea3
Issue #7182 having running() delete the state file where it previously only deleted the pid file. (#7184) 
* Issue #7182 changing approach from deleting the state file consistently to simply grep'ing for last line in JETTY_STATE file

Signed-off-by: Ian Rifkin <ianrifkin@ianrifkin.com>
 2022-03-23 13:25:34 -05:00
Simone Bordet 4e02be57fd
Updating to version 11.0.9-SNAPSHOT 2022-02-07 12:42:04 +01:00
Simone Bordet 79cc9cf90e
Updating to version 11.0.8 2022-02-07 12:10:09 +01:00
Simone Bordet a4fda96f49
Updating to version 10.0.9-SNAPSHOT 2022-02-07 12:02:02 +01:00
Simone Bordet 716c7afd8e
Updating to version 10.0.8 2022-02-07 11:34:12 +01:00
Joakim Erdfelt f1ac7e081b
Issue #7494 - remove unsupported modules (#7495) 
* Issue #7494 - Remove jolokia module

* Issue #7494 - Remove jminix module (doesn't support jakarta.servlet)

* Issue #7494 - Remove jamon module (doesn't support jakarta.servlet)

* Issue #7494 - Remove hawtio module (doesn't support jakarta.servlet)

* Issue #7494 - Removing version properties for removed modules

* Issue #7494 - Removing test dist tests for removed modules
 2022-01-31 20:49:41 -06:00
Joakim Erdfelt 372c1d1d3f
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-01-05 12:27:32 -06:00
Joakim Erdfelt 13956b27e2
Issue #7297 - Removing log4j 1.x (#7353) 
* Issue #7297 - Removing log4j 1.x

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

* Issue #7297 - Deprecating log4j 1.x

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-01-05 12:26:05 -06:00
Joakim Erdfelt 45fc93aec1
Issue #7354 - Do not add demo jars to jetty-home (#7355) 
* Issue #7354 - Do not add demo jars to jetty-home

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

* Issue #7254 - Do not add lib/ext directory to jetty-home

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-01-05 10:33:26 -06:00
Simone Bordet 2de20c3520
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-20 10:00:26 +01:00
Simone Bordet 7811f40c67 Issue #6728 - QUIC and HTTP/3 
Split the http3 module, introducing the jna and quiche modules with their versions and licenses.
Updated project to reference the new groupId of the quiche binaries.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-20 09:33:38 +01:00
Simone Bordet 578ae30311 Issue #6728 - QUIC and HTTP/3 
Added http3 Jetty module and distribution test.
Implemented simple logic to send the Alt-Svc header in HTTP/2 responses.
Updated JNA dependency to use jna-jpms.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-12-20 09:33:38 +01:00
Jan Bartel 508f289680 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-11-17 14:23:19 +11:00
Jan Bartel aa5da31938
Issue #7103 Clean up distro landing page (#7104) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2021-11-17 14:10:57 +11:00
Joakim Erdfelt df4ddc759f
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-10-22 10:15:29 -05:00
Joakim Erdfelt c89866682c
Issue #7008 - fix jetty.sh - avoid duplicates 
+ Do not include JETTY_SYS_PROPS in JAVA_OPTIONS
  to avoid duplicates that show up in RUN_ARGS.
+ Only use JETTY_SYS_PROPS in RUN_CMD.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-10-18 09:51:17 -05:00
Joakim Erdfelt cdba235db6
Issue #7008 - fix jetty.sh 
+ Minor fix to remove extra LF output in RUN_ARGS
+ Using start-stop-daemon options properly

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-10-18 09:39:37 -05:00
Joakim Erdfelt b67ffd3d2d Updating to version 11.0.8-SNAPSHOT 2021-10-06 15:16:07 -05:00
Joakim Erdfelt 389a358772 Updating to version 11.0.7 2021-10-06 14:58:52 -05:00
Joakim Erdfelt cfc67f86d2 Updating to version 10.0.8-SNAPSHOT 2021-10-06 14:51:32 -05:00
Joakim Erdfelt da8a4553af Updating to version 10.0.7 2021-10-06 14:32:37 -05:00