This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch spring6 in repository https://gitbox.apache.org/repos/asf/causeway.git
commit de23420755b4277591c77522e4308812b61baddd Merge: 246218bd8f 555209320b Author: andi-huber <[email protected]> AuthorDate: Mon Feb 20 07:43:29 2023 +0100 Merge remote-tracking branch 'origin/master' into spring6 .../pages/{2022 => 2023}/2.0.0-RC1/mignotes.adoc | 6 +- .../pages/{2022 => 2023}/2.0.0-RC1/relnotes.adoc | 0 .../relnotes/modules/ROOT/pages/about.adoc | 4 +- .../causeway/commons/internal/base/_Files.java | 1 - .../causeway/commons/internal/base/_Strings.java | 56 +++- .../causeway/commons/internal/base/_With.java | 323 --------------------- .../commons/internal/context/_Context.java | 16 +- .../causeway/commons/internal/context/_Plugin.java | 187 ------------ .../internal/context/_PluginResolveException.java | 37 --- .../causeway/commons/internal/debug/_Probe.java | 3 +- .../causeway/core/metamodel/commons/ClassUtil.java | 4 +- .../causeway/core/metamodel/consent/Veto.java | 5 +- .../facets/collections/CollectionFacet.java | 42 +-- .../templresources/TemplateResourceServlet.java | 8 +- .../audittrail/applib/dom/AuditTrailEntry.java | 9 + .../applib/dom/AuditTrailEntryRepository.java | 81 +++++- .../audittrail/jdo/dom/AuditTrailEntry.java | 69 ++++- .../audittrail/jpa/dom/AuditTrailEntry.java | 68 ++++- 18 files changed, 315 insertions(+), 604 deletions(-) diff --cc core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/templresources/TemplateResourceServlet.java index ed733485b5,ab465f01c4..b9ebf7396c --- a/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/templresources/TemplateResourceServlet.java +++ b/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/templresources/TemplateResourceServlet.java @@@ -21,12 -21,13 +21,13 @@@ package org.apache.causeway.core.webapp import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; + import java.util.Optional; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired;
