This is an automated email from the ASF dual-hosted git repository. paulrutter pushed a commit to branch http.jetty12.ee10 in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit f15b0681de48c1241e96b1da1824702fa7d1f364 Merge: ec0173dc67 18346fbf9d Author: Paul Rütter <[email protected]> AuthorDate: Fri May 29 10:38:58 2026 +0200 Merge branch 'master' into http.jetty12.ee10 # Conflicts: # http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java .asf.yaml | 14 + http/README.md | 404 +++++++++++++++++---- http/base/pom.xml | 2 +- .../http/base/internal/dispatch/Dispatcher.java | 3 +- .../internal/dispatch/RequestDispatcherImpl.java | 6 +- .../dispatch/ServletRequestMultipartWrapper.java | 33 +- .../http/base/internal/handler/ServletHandler.java | 6 - .../internal/handler/WhiteboardServletHandler.java | 63 +--- .../internal/whiteboard/WhiteboardManager.java | 4 +- http/itest/pom.xml | 14 +- http/jetty/README | 5 +- http/jetty/pom.xml | 2 +- http/jetty12/CHANGELOG.MD | 31 ++ http/jetty12/README | 2 +- http/jetty12/pom.xml | 7 +- .../jetty/internal/ConfigMetaTypeProvider.java | 10 +- .../felix/http/jetty/internal/JettyConfig.java | 13 +- .../felix/http/jetty/internal/JettyService.java | 48 ++- .../felix/http/jetty/it/LightClassifierIT.java | 3 + http/samples/whiteboard/pom.xml | 2 +- 20 files changed, 449 insertions(+), 223 deletions(-)
