Commit Graph

45 Commits

Author SHA1 Message Date
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
Joakim Erdfelt 81bc6d719a
Bump ee10 jakarta.websocket to 2.1.1 2023-07-07 12:33:07 -05:00
gregw e0133d72bf Merge branch 'jetty-12.0.x' into jetty-12.0.x-9396-websocket-jpms-review 2023-06-30 17:17:16 +02:00
Lachlan Roberts e1b0d01aa0 changes to websocket poms and module-info from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-06-30 14:26:02 +10:00
Lachlan Roberts a4d5558bd8 split a webapp module for jetty-ee10-websocket-jakarta-client
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-06-27 17:09:47 +10:00
Olivier Lamy c6f19a21eb
Upgrade of dependencies: slf4j 2.0.7, and some 3rd parties dependencies used for testing (#9924)
* Upgrade of dependencies: slf4j 2.0.7, and some 3rd parties dependencies used for testing

Signed-off-by: Olivier Lamy <olamy@apache.org>

* update jackson to 2.14.3

Signed-off-by: Olivier Lamy <olamy@apache.org>

---------

Signed-off-by: Olivier Lamy <olamy@apache.org>
2023-06-20 12:06:29 +10:00
Simone Bordet 22641f1267
Fix/jetty 12 restore ee n fcgi (#9796)
* Restored ee9 FastCGIProxyServlet and TryFilesFilter.
* Restored ee10 FastCGIProxyServlet and TryFilesFilter.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-06-05 16:50:11 +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
Jan Bartel 46f729f7fc
Issue #9617 Update to Apache Jasper 10.1.7 (#9624) 2023-04-05 18:41:32 +10:00
Joakim Erdfelt 75dbc52f16
Separate weld versions by ee# (#9544) 2023-03-29 10:25:31 -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 a03ec5ffc0
Update <ruleSet> for ee10 2023-03-09 10:24:33 -06:00
Joakim Erdfelt 20404f760c
<onlyUpgradable> set to true 2023-03-09 06:36:35 -06:00
Joakim Erdfelt b8a6ba10f6
Update ee10 servlet-jsp-api to 3.1.1 2023-03-08 16:15:41 -06:00
Joakim Erdfelt 7f52d4f3f0
Set <onlyProjectDependencies> config to true 2023-03-08 16:13:27 -06:00
Joakim Erdfelt 0feff8d35a
Ignoring jetty releases and maven alpha/beta versions 2023-03-08 16:08:09 -06:00
Jan Bartel dd792b5607
Remove jetty-ant (#9382) 2023-02-16 13:48:29 +11:00
Jan Bartel 342bd40e0b
Jetty 12.0.x 9301 fix ee10 jstl jpms (#9321)
* Issue #9301 Fix dependencies for ee10-glassfish-jstl module

* Fix jstl,el,jsp to work in jpms and osgi.
2023-02-09 09:35:54 +11:00
Joakim Erdfelt 18783f0ec5
Removing unused / old deps
+ Removing javax.activation
  we are using jakarta.activation now
+ Removing osgi bootDelegationPackage
  for javax.activation as that package
  is no longer part of the JVM
+ Removing orbit (glassfish) mail
  we are using com.sun.mail (impl) now
+ Removing javax.security.auth
  we are using jakarta.security.auth now
2023-01-31 10:08:27 -06:00
Joakim Erdfelt f80ae9a96e
Bump versions.maven.plugin.version to 2.14.2 2023-01-30 13:55:12 -06:00
Joakim Erdfelt adc66a1886
bump jakarta.xml.bind.impl.version to 4.0.1 2023-01-30 13:45:58 -06:00
Joakim Erdfelt 2e81326dac
bump jakarta.mail to 2.1.1 2023-01-30 13:39:21 -06:00
Joakim Erdfelt 0f2845d22d
bump jakarta.el to 5.0.1 2023-01-30 13:39:02 -06:00
Joakim Erdfelt 39c44539a0
bump jakarta.activation to 2.1.1 2023-01-30 13:37:57 -06:00
Joakim Erdfelt efb19c9cee
Bump jaxws-rt to 4.0.0 2023-01-30 13:35:58 -06:00
Joakim Erdfelt ee4a8dc8e7
Add `dependency-updates-reports` profile to ee10 2023-01-30 13:30:57 -06:00
Simone Bordet c4aeb56b46
Moved jetty-ee10/test-ee10-sessions to jetty-ee10-tests/jetty-ee10-test-sessions.
Renamed all child modules to comply with the convention.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-01-27 20:27:02 +01: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
Jan Bartel 1abaeb6cee
Jetty 12.0.x osgi (#9068) 2022-12-21 08:12:44 -06:00
Joakim Erdfelt 172f2121ea
Fix for [WARNING] The POM for jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api🫙3.0.0-RC1 is missing, no dependency information available 2022-12-12 06:05:32 -06:00
Jan Bartel 862af89c55
Issue #8744 Update ee10 to jasper 10.1.1 (#8746) 2022-11-15 14:10:27 +11: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
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
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
Jan Bartel c7f9ef797b Fix jndi and enable tests 2022-06-29 09:44:05 +10: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
Olivier Lamy 09abf2f021
rename ee10-demo to jetty-ee10-demo (#8172)
* rename ee10-demo to jetty-ee10-demo

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-06-16 15:47:08 +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 a5bb51785d WIP rename ee10 demo modules; fix modules 2022-05-25 19:07:18 +10:00
Jan Bartel 66140afded WIP copy ee9 session tests to ee10 and get them working 2022-05-13 15:26:31 +02: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 9522fa3d87 Remove ee10 http-spi 2022-05-05 18:57:14 +02:00
Olivier Lamy ab0bb9911f
change groupId org.eclipse.jetty.ee10 -> org.eclipse.jetty.ee10.websocket for websocket (#7954)
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-05-04 20:35:34 +10:00
Greg Wilkins 0a32147e89 Jetty-12 Restructure
Copied ee10 from 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:52:44 +02:00