[eXist-commits] [eXist-db/exist] 28410a: [feature] Upgrade Jetty 11.0.25 to 12.0.16 depende...

[Joe W. <no...@gi...>]

  Branch: refs/heads/feature/jetty-12-upgrade
  Home:   https://github.com/eXist-db/exist
  Commit: 28410ae7ac591e2fc26f2ea412c0625aead42f44
      https://github.com/eXist-db/exist/commit/28410ae7ac591e2fc26f2ea412c0625aead42f44
  Author: Joe Wicentowski <jo...@gm...>
  Date:   2026-03-31 (Tue, 31 Mar 2026)

  Changed paths:
    M exist-core/pom.xml
    M exist-distribution/pom.xml
    M exist-parent/pom.xml
    M extensions/webdav/pom.xml

  Log Message:
  -----------
  [feature] Upgrade Jetty 11.0.25 to 12.0.16 dependencies (EE10)

Dependency version changes:
- Jetty: 11.0.25 -> 12.0.16
- Jakarta Servlet API: 5.0.0 -> 6.0.0 (EE10)
- Milton servlet: 1.8.1.3-jakarta5 -> 1.8.1.3-jakarta-ee10
  (fixes setStatus(int,String) removal in Servlet 6.0;
  temporarily uses com.evolvedbinary.thirdparty groupId —
  needs republishing under org.exist-db.thirdparty)

Jetty 12 artifact coordinate changes:
- Servlet-layer: org.eclipse.jetty -> org.eclipse.jetty.ee10
  (annotations, servlet, webapp, plus, jndi)
- WebSocket: org.eclipse.jetty.websocket -> org.eclipse.jetty.ee10.websocket
- JAAS: removed as separate dep (now in jetty-security core module)

Co-Authored-By: Claude Opus 4.6 (1M context) <no...@an...>


  Commit: 687b661eb7d062cec0d54a3ff3ee995930616e0b
      https://github.com/eXist-db/exist/commit/687b661eb7d062cec0d54a3ff3ee995930616e0b
  Author: Joe Wicentowski <jo...@gm...>
  Date:   2026-03-31 (Tue, 31 Mar 2026)

  Changed paths:
    M exist-jetty-config/src/main/resources/org/exist/jetty/etc/jetty-annotations.xml
    M exist-jetty-config/src/main/resources/org/exist/jetty/etc/jetty-deploy.xml
    M exist-jetty-config/src/main/resources/org/exist/jetty/etc/jetty-gzip.xml
    M exist-jetty-config/src/main/resources/org/exist/jetty/etc/jetty-jmx.xml
    M exist-jetty-config/src/main/resources/org/exist/jetty/etc/jetty-logging.xml
    M exist-jetty-config/src/main/resources/org/exist/jetty/etc/jetty-ssl.xml
    M exist-jetty-config/src/main/resources/org/exist/jetty/etc/jetty.xml
    M exist-jetty-config/src/main/resources/org/exist/jetty/etc/standalone-jetty-deploy.xml
    M exist-jetty-config/src/main/resources/org/exist/jetty/etc/standalone-jetty-ssl.xml
    M exist-jetty-config/src/main/resources/org/exist/jetty/etc/standalone-jetty.xml
    M exist-jetty-config/src/main/resources/org/exist/jetty/etc/standalone-webapps/exist-webapp-context.xml
    M exist-jetty-config/src/main/resources/org/exist/jetty/etc/standalone.enabled-jetty-configs
    M exist-jetty-config/src/main/resources/org/exist/jetty/etc/webapps/exist-webapp-context.xml
    M exist-jetty-config/src/main/resources/org/exist/jetty/etc/webapps/portal/WEB-INF/jetty-web.xml
    M exist-jetty-config/src/main/resources/org/exist/jetty/etc/webapps/portal/WEB-INF/web.xml
    M exist-jetty-config/src/main/resources/org/exist/jetty/etc/webdefault.xml

  Log Message:
  -----------
  [feature] Migrate Jetty XML configuration for Jetty 12 EE10

Handler model:
- HandlerCollection -> Handler$Sequence (constructor takes Array arg)
- Server constructor arg: threadpool -> threadPool (case-sensitive)

Deployment:
- Replaced ContextProvider/scanner with inline addHandler on
  ContextHandlerCollection

Security and class paths:
- ConstraintSecurityHandler -> org.eclipse.jetty.ee10.servlet.security
- JAASLoginService -> org.eclipse.jetty.security.jaas
- DefaultServlet/IntrospectorCleaner -> ee10 packages
- ELContextCleaner removed (obsolete)

Compliance and other:
- MultiPartFormDataCompliance -> MultiPartCompliance
- UriCompliance: LEGACY -> UNSAFE (non-ASCII path support)
- SecureRequestCustomizer: constructor args -> setter-based
- GzipHandler: use addIncludedMethods
- Removed org.eclipse.jetty.util.log.Log references

Co-Authored-By: Claude Opus 4.6 (1M context) <no...@an...>


  Commit: 18c7587e8510ad41dc6ab6dba55e7fda03114916
      https://github.com/eXist-db/exist/commit/18c7587e8510ad41dc6ab6dba55e7fda03114916
  Author: Joe Wicentowski <jo...@gm...>
  Date:   2026-03-31 (Tue, 31 Mar 2026)

  Changed paths:
    M exist-core/src/main/java/org/exist/http/servlets/HttpServletRequestWrapper.java
    M exist-core/src/main/java/org/exist/http/urlrewrite/XQueryURLRewrite.java
    M exist-core/src/main/java/org/exist/jetty/JettyStart.java
    M exist-core/src/main/java/org/exist/jetty/WebAppContext.java
    M extensions/exquery/restxq/src/main/java/org/exist/extensions/exquery/restxq/impl/adapters/HttpServletResponseAdapter.java

  Log Message:
  -----------
  [feature] Migrate Java code for Jetty 12 and Servlet 6.0

JettyStart.java: Handler model rewrite, ResourceFactory, ee10 packages
WebAppContext.java: extends ee10 WebAppContext
HttpServletRequestWrapper.java: Servlet 6.0 additions/removals
XQueryURLRewrite.java, HttpServletResponseAdapter.java: removed
  setStatus(int, String)

Co-Authored-By: Claude Opus 4.6 (1M context) <no...@an...>


  Commit: 79659ecef2fdc110a788a62bb6ac494e1425fcad
      https://github.com/eXist-db/exist/commit/79659ecef2fdc110a788a62bb6ac494e1425fcad
  Author: Joe Wicentowski <jo...@gm...>
  Date:   2026-03-31 (Tue, 31 Mar 2026)

  Changed paths:
    M exist-core/src/test/java/org/exist/xquery/functions/request/GetDataTest.java
    M exist-core/src/test/java/org/exist/xquery/functions/xmldb/DbStore2Test.java
    M exist-core/src/test/resources/standalone-webapp/WEB-INF/web.xml
    M exist-distribution/src/main/xslt/catalog.xml
    A exist-distribution/src/main/xslt/jakartaee_10.xsd
    R exist-distribution/src/main/xslt/jakartaee_9.xsd
    R exist-distribution/src/main/xslt/jsp_3_0.xsd
    A exist-distribution/src/main/xslt/jsp_3_1.xsd
    R exist-distribution/src/main/xslt/web-app_5_0.xsd
    A exist-distribution/src/main/xslt/web-app_6_0.xsd
    R exist-distribution/src/main/xslt/web-common_5_0.xsd
    A exist-distribution/src/main/xslt/web-common_6_0.xsd
    M exist-jetty-config/src/main/resources/standalone-webapp/WEB-INF/web.xml
    M exist-jetty-config/src/main/resources/webapp/WEB-INF/web.xml
    M extensions/debuggee/src/test/resources/standalone-webapp/WEB-INF/web.xml
    M extensions/exquery/restxq/src/test/resources/standalone-webapp/WEB-INF/web.xml
    M extensions/modules/file/src/test/resources/standalone-webapp/WEB-INF/web.xml
    M extensions/modules/persistentlogin/src/test/resources/standalone-webapp/WEB-INF/web.xml
    M extensions/webdav/src/test/resources/standalone-webapp/WEB-INF/web.xml

  Log Message:
  -----------
  [test] Update web.xml schemas, XSD files, and test code for EE10

- All web-app version="5.0" -> "6.0" with Servlet 6.0 schema refs
- Distribution XSDs: real Jakarta EE 10 schemas from jakarta.ee
- @Ignore GetDataTest HTTP/0.9 and HTTP/1.0 tests (Jetty 12)
- DbStore2Test: Jetty 12 ResourceHandler/Handler.Sequence API

Co-Authored-By: Claude Opus 4.6 (1M context) <no...@an...>


  Commit: 177a1f6fc8e5fedcc4d6c3ec10ae754c120a0676
      https://github.com/eXist-db/exist/commit/177a1f6fc8e5fedcc4d6c3ec10ae754c120a0676
  Author: Joe Wicentowski <jo...@gm...>
  Date:   2026-03-31 (Tue, 31 Mar 2026)

  Changed paths:
    A extensions/webdav/src/test/java/org/exist/webdav/LockTest.java

  Log Message:
  -----------
  [test] Add WebDAV LOCK/UNLOCK test coverage

New LockTest with 3 tests:
- lockAndUnlockXmlDocument: LOCK returns token, UNLOCK succeeds
- lockAndUnlockBinDocument: same for binary documents
- relockReturnsFreshToken: re-LOCK by same user replaces the lock

Ensures LOCK support (Milton 1.x LockableResource) is preserved
across the Jetty 12 upgrade.

Co-Authored-By: Claude Opus 4.6 (1M context) <no...@an...>


  Commit: 8ea78f002927452686ae685fbd9d92557351f5d1
      https://github.com/eXist-db/exist/commit/8ea78f002927452686ae685fbd9d92557351f5d1
  Author: Joe Wicentowski <jo...@gm...>
  Date:   2026-03-31 (Tue, 31 Mar 2026)

  Changed paths:
    M exist-core/src/main/java/org/exist/http/servlets/HttpServletRequestWrapper.java
    M exist-core/src/main/java/org/exist/http/urlrewrite/XQueryURLRewrite.java
    M exist-core/src/main/java/org/exist/jetty/JettyStart.java

  Log Message:
  -----------
  [refactor] Fix Codacy PMD violations in Jetty 12 migration code

Replace toUpperCase().equals() with equalsIgnoreCase(), remove dead
instanceof check, collapse nested ifs, fix parameter reassignments,
remove unnecessary constructor, and suppress false-positive
UnusedPrivateMethod warnings (PMD doesn't detect switch expression calls).

Co-Authored-By: Claude Opus 4.6 (1M context) <no...@an...>


  Commit: 76b6fb91097fd6d1f82e0658920a5d5c4cd3402d
      https://github.com/eXist-db/exist/commit/76b6fb91097fd6d1f82e0658920a5d5c4cd3402d
  Author: Joe Wicentowski <jo...@gm...>
  Date:   2026-03-31 (Tue, 31 Mar 2026)

  Changed paths:
    M exist-core/src/test/java/org/exist/xquery/functions/request/GetDataTest.java
    M exist-parent/pom.xml
    M extensions/webdav/pom.xml

  Log Message:
  -----------
  [refactor] Address review feedback on PR #6144

- Improve @Ignore annotations on HTTP/0.9 and HTTP/1.0 tests with
  precise descriptions of the Jetty 12 behavioral changes:
  HTTP/0.9 rejection corrupts Apache HttpClient connection pool;
  HTTP/1.0 drops connection without response
- Remove TODO comments about republishing Milton servlet under
  org.exist-db.thirdparty groupId (com.evolvedbinary.thirdparty
  is the correct upstream source for this fix)

Co-Authored-By: Claude Opus 4.6 (1M context) <no...@an...>


Compare: https://github.com/eXist-db/exist/compare/28410ae7ac59%5E...76b6fb91097f

To unsubscribe from these emails, change your notification settings at https://github.com/eXist-db/exist/settings/notifications