You are viewing a plain text version of this content. The canonical link for it is here.

Posted to notifications@freemarker.apache.org by dd...@apache.org on 2024/01/23 06:41:52 UTC

(freemarker) 01/01: Merge pull request #104 from kelemen/generated-jakarta-sources

This is an automated email from the ASF dual-hosted git repository.

ddekany pushed a commit to branch 2.3-gae
in repository https://gitbox.apache.org/repos/asf/freemarker.git

commit babdccb6677d53a41b925ef276ed4cba8f80ea1b
Merge: 6543e507 c88ed780
Author: ddekany <dd...@apache.org>
AuthorDate: Tue Jan 23 07:41:46 2024 +0100

    Merge pull request #104 from kelemen/generated-jakarta-sources
    
    FREEMARKER-218: Jakarta support

 .github/workflows/ci.yml                           |   6 +-
 README.md                                          |   2 +-
 build.gradle.kts                                   |  96 +++++--
 .../freemarker/build/FreemarkerRootExtension.kt    | 114 +++++++--
 .../build/JakartaSourceRootGeneratorTask.kt        | 277 +++++++++++++++++++++
 .../java/freemarker/cache/TemplateLoaderUtils.java |   2 +-
 .../java/freemarker/cache/URLTemplateSource.java   |  10 +-
 .../freemarker/cache/WebappTemplateLoader.java     |   4 +
 .../freemarker/template/MockServletContext.java    |  46 +++-
 .../freemarker/test/servlet/WebAppTestCase.java    |   2 +-
 10 files changed, 513 insertions(+), 46 deletions(-)