This is an automated email from the ASF dual-hosted git repository. ddekany pushed a commit to branch 2.3 in repository https://gitbox.apache.org/repos/asf/freemarker.git
commit 32bffaedcfe84c1947ab9bd5239f28f4485892df Merge: 0b7e37bf 6765b587 Author: ddekany <[email protected]> AuthorDate: Tue Jan 23 10:22:04 2024 +0100 Merge branch '2.3-gae' into 2.3 .github/workflows/ci.yml | 8 +- README.md | 10 +- build.gradle.kts | 152 ++++++++++- .../freemarker/build/FreemarkerRootExtension.kt | 119 +++++++-- .../freemarker/build/FreemarkerRootPlugin.kt | 14 +- .../build/JakartaSourceRootGeneratorTask.kt | 277 +++++++++++++++++++++ .../java/freemarker/cache/TemplateLoaderUtils.java | 2 +- .../java/freemarker/cache/URLTemplateSource.java | 10 +- .../src/main/java/freemarker/core/EvalUtil.java | 2 +- .../java/freemarker/template/Configuration.java | 29 +-- .../src/main/java/freemarker/template/Version.java | 3 + .../java/freemarker/template/_VersionInts.java | 1 + .../freemarker/version.properties | 19 +- .../freemarker/cache/WebappTemplateLoader.java | 9 +- .../java/freemarker/ext/jsp/EventForwarding.java | 3 + .../ext/jsp/FreeMarkerJspApplicationContext.java | 2 - .../java/freemarker/ext/jsp/TaglibFactory.java | 3 + .../src/main/java/freemarker/ext/jsp/package.html | 4 + .../ext/servlet/AllHttpScopesHashModel.java | 3 + .../freemarker/ext/servlet/FreemarkerServlet.java | 6 +- .../ext/servlet/HttpRequestHashModel.java | 3 + .../servlet/HttpRequestParametersHashModel.java | 4 +- .../ext/servlet/HttpSessionHashModel.java | 4 +- .../java/freemarker/ext/servlet/IncludePage.java | 3 + .../ext/servlet/ServletContextHashModel.java | 3 + .../main/java/freemarker/ext/servlet/package.html | 4 + .../freemarker/template/MockServletContext.java | 46 +++- .../freemarker/test/servlet/WebAppTestCase.java | 2 +- .../tldDiscovery/WEB-INF/expected/test1.txt | 2 +- freemarker-manual/src/main/docgen/en_US/book.xml | 68 ++++- gradle.properties | 3 + osgi.bnd | 5 + rat-excludes | 1 + settings.gradle.kts | 4 + 34 files changed, 731 insertions(+), 97 deletions(-) diff --cc freemarker-core/src/main/resource-templates/freemarker/version.properties index 1a03fc00,cecfdf73..742177d7 --- a/freemarker-core/src/main/resource-templates/freemarker/version.properties +++ b/freemarker-core/src/main/resource-templates/freemarker/version.properties @@@ -94,8 -94,5 +94,5 @@@ versionForOSGi=2.3.33.nightl # 2.X-1.(99|98).Y. Note the X-1. versionForMf=2.3.32.97 - # The date of the build. - # This should be automatically filled by the building tool (Ant). - buildTimestamp=@timestampNice@ -isGAECompliant=true +isGAECompliant=false
