Commit Graph

536 Commits

Author SHA1 Message Date
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
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 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