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 2026/08/23 19:49:06 UTC
(freemarker) branch 2.3 updated (364dd582 -> 53ca7ae8)
This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a change to branch 2.3
in repository https://gitbox.apache.org/repos/asf/freemarker.git
from 364dd582 Merge remote-tracking branch 'origin/2.3-gae' into 2.3
add 5c36655f Add Apple Silicon build workaround
add e01dcb44 Merge pull request #131 from chrisrueger/add-skipJava9And16SourceSets-for-local-dev
add 3e0d0c02 README.md: Compressed/crossreferenced exotic JDK troubleshooting
add 83953d9a Modernize legacy Java usage (mostly things possible since Java 7), and some other code cleanup, mostly freemarker.cache. Also applied standard format on changed fielsm so they won't keep changing at functional changes.
add 394614ac OptInTemplateClassResolver: Faster template name back-steping check, especially if we had %-s; this sometimes has impact, as this runs for each ?new call. Also, now blocks u0000 chars.
add 5615e856 Improved DefaultMemberAccessPolicy-rules to block listing Java system properties. (This default policy is only for trusted template authors anyway (see FAQ), but for historical reasons always we maintain it.)
add 96d1cec0 Deprecated NodeModel utility methods that by default used DocumentBuilderFactory that can load external entities. So now if someone calls them, they will see the warning in the IDE.
add 21196151 (Minor code cleanup)
add 43c3d5a5 Fixed issue with in XML DOM imperative XML processing, where the @@markup and @@nested_markup keys did not XML-escape the values of the xmlns or xmlnx:prefix attributes.
add b8611849 (Some version history updates)
add 91c7734d Removed all "main" (CLI entry point) methods from our main artifact. They were @Deprecated for a long time, and security scans sometimes flag them. (There are still some in test code.)
add a8925084 ClassTemplateLoader and WebappTemplateLoader now checks against backing out from the base directory (and throws MalformedTemplateNameException if that happens), instead of only relying on TemplateCache for that. (Note that FileTemplateLoader always did this check.) In principle, this is the responsibility of TemplateCache, however, not everyone gets Template-s through Configuration.getTemplate, and so through TemplateCache. While the TemplateLoader contract doesn't promi [...]
add 27f341d3 Javadoc fix (and some accidental reformatting): For Servlet related classes/packages both the legacy and the newer Jakarta variant stated that it's the legacy one. (That was because one is a build-time copy of the other, with simple search-and-replace applied.)
add 9c3db2c6 (Manual: Version history adjustments)
new 53ca7ae8 Merge remote-tracking branch 'origin/2.3-gae' into 2.3
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README.md | 12 +-
build.gradle.kts | 26 +-
.../main/java/freemarker/cache/CacheStorage.java | 19 +-
.../freemarker/cache/CacheStorageWithGetSize.java | 4 +-
.../java/freemarker/cache/ClassTemplateLoader.java | 119 ++---
.../freemarker/cache/ConcurrentCacheStorage.java | 16 +-
.../freemarker/cache/FileExtensionMatcher.java | 22 +-
.../java/freemarker/cache/FileNameGlobMatcher.java | 2 +-
.../java/freemarker/cache/FileTemplateLoader.java | 102 +++--
.../FirstMatchTemplateConfigurationFactory.java | 32 +-
.../cache/MergingTemplateConfigurationFactory.java | 10 +-
.../src/main/java/freemarker/cache/NotMatcher.java | 6 +-
.../java/freemarker/cache/StrongCacheStorage.java | 2 +-
.../main/java/freemarker/cache/TemplateCache.java | 490 +++++++++++----------
.../cache/TemplateConfigurationFactory.java | 40 +-
.../TemplateConfigurationFactoryException.java | 8 +-
.../main/java/freemarker/cache/TemplateLoader.java | 163 +++----
.../java/freemarker/cache/TemplateLoaderUtils.java | 3 +-
.../freemarker/cache/TemplateLookupContext.java | 35 +-
.../freemarker/cache/TemplateLookupResult.java | 43 +-
.../freemarker/cache/TemplateLookupStrategy.java | 86 ++--
.../java/freemarker/cache/TemplateNameFormat.java | 180 ++++----
.../freemarker/cache/TemplateSourceMatcher.java | 4 +-
.../java/freemarker/cache/URLTemplateLoader.java | 80 ++--
.../java/freemarker/cache/URLTemplateSource.java | 4 +-
.../src/main/java/freemarker/cache/_CacheAPI.java | 12 +-
.../java/freemarker/cache/_TemplatePathUtils.java | 71 +++
.../core/AliasTemplateDateFormatFactory.java | 27 +-
.../core/AliasTemplateNumberFormatFactory.java | 25 +-
.../src/main/java/freemarker/core/CommandLine.java | 60 ---
.../src/main/java/freemarker/core/Environment.java | 10 +-
.../core/OptInTemplateClassResolver.java | 179 +++++---
.../java/freemarker/core/_CoreLocaleUtils.java | 17 +-
.../main/java/freemarker/ext/dom/NodeModel.java | 342 +++++++-------
.../java/freemarker/ext/dom/NodeOutputter.java | 38 +-
.../main/java/freemarker/ext/dom/Transform.java | 213 ---------
.../java/freemarker/ext/jdom/NodeListModel.java | 27 --
.../template/MalformedTemplateNameException.java | 16 +-
.../freemarker/template/utility/ToCanonical.java | 77 ----
.../ext/beans/DefaultMemberAccessPolicy-rules | 2 +-
.../freemarker/cache/ClassTemplateLoaderTest.java | 98 +++++
.../java/freemarker/cache/TemplateCacheTest.java | 144 +++---
.../freemarker/cache/TemplateNameFormatTest.java | 73 ++-
.../freemarker/cache/TemplatePathUtilsTest.java | 53 +++
.../test/java/freemarker/core/FilterBiTest.java | 15 +-
.../test/java/freemarker/core/JSONParserTest.java | 22 +-
.../freemarker/core/ListBreakContinueTest.java | 21 +-
.../src/test/java/freemarker/core/MapBiTest.java | 13 +-
.../test/java/freemarker/core/MinMaxBITest.java | 20 +-
...tInTemplateClassResolverNameValidationTest.java | 85 ++++
.../java/freemarker/core/OutputFormatTest.java | 471 ++++++++++----------
.../core/TakeWhileAndDropWhileBiTest.java | 34 +-
.../freemarker/core/TemplateConfigurationTest.java | 23 +-
.../freemarker/ext/beans/BeansWrapperBasics.java | 5 +-
.../ext/beans/DefaultMemberAccessPolicyTest.java | 5 +
.../src/test/java/freemarker/ext/dom/DOMTest.java | 14 +
.../freemarker/template/ConfigurationTest.java | 5 +-
.../template/TemplateLookupStrategyTest.java | 236 +++++-----
.../resources/freemarker/cache/templates/1.ftl | 2 +-
.../resources/freemarker/cache/templates/sub/2.ftl | 2 +-
.../freemarker/cache/WebappTemplateLoader.java | 49 ++-
.../java/freemarker/ext/jsp/EventForwarding.java | 5 +-
.../java/freemarker/ext/jsp/TaglibFactory.java | 431 +++++++++---------
.../main/java/freemarker/ext/jsp/package-info.java | 7 +-
.../ext/servlet/AllHttpScopesHashModel.java | 13 +-
.../freemarker/ext/servlet/FreemarkerServlet.java | 5 +-
.../ext/servlet/HttpRequestHashModel.java | 5 +-
.../servlet/HttpRequestParametersHashModel.java | 5 +-
.../ext/servlet/HttpSessionHashModel.java | 5 +-
.../java/freemarker/ext/servlet/IncludePage.java | 7 +-
.../ext/servlet/ServletContextHashModel.java | 5 +-
.../java/freemarker/ext/servlet/package-info.java | 10 +-
.../freemarker/core/ObjectBuilderSettingsTest.java | 4 +
freemarker-manual/src/main/docgen/en_US/book.xml | 98 ++++-
.../CopyrightCommentRemoverTemplateLoader.java | 4 +
.../main/java/freemarker/test/TemplateTest.java | 1 -
gradle.properties | 4 +
osgi.bnd | 1 -
78 files changed, 2425 insertions(+), 2199 deletions(-)
create mode 100644 freemarker-core/src/main/java/freemarker/cache/_TemplatePathUtils.java
delete mode 100644 freemarker-core/src/main/java/freemarker/core/CommandLine.java
delete mode 100644 freemarker-core/src/main/java/freemarker/ext/dom/Transform.java
delete mode 100644 freemarker-core/src/main/java/freemarker/template/utility/ToCanonical.java
create mode 100644 freemarker-core/src/test/java/freemarker/cache/ClassTemplateLoaderTest.java
create mode 100644 freemarker-core/src/test/java/freemarker/cache/TemplatePathUtilsTest.java
create mode 100644 freemarker-core/src/test/java/freemarker/core/OptInTemplateClassResolverNameValidationTest.java
copy freemarker-javax-servlet/src/test/resources/freemarker/ext/jsp/webapps/errors/not-failing.ftl => freemarker-core/src/test/resources/freemarker/cache/templates/1.ftl (99%)
copy freemarker-javax-servlet/src/test/resources/freemarker/ext/jsp/webapps/errors/not-failing.ftl => freemarker-core/src/test/resources/freemarker/cache/templates/sub/2.ftl (99%)
(freemarker) 01/01: Merge remote-tracking branch 'origin/2.3-gae' into 2.3
Posted by dd...@apache.org.
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 53ca7ae87d536f8a5a6fea6cce74d73f3b549bac
Merge: 364dd582 9c3db2c6
Author: ddekany <dd...@apache.org>
AuthorDate: Sun Aug 23 21:48:12 2026 +0200
Merge remote-tracking branch 'origin/2.3-gae' into 2.3
README.md | 12 +-
build.gradle.kts | 26 +-
.../main/java/freemarker/cache/CacheStorage.java | 19 +-
.../freemarker/cache/CacheStorageWithGetSize.java | 4 +-
.../java/freemarker/cache/ClassTemplateLoader.java | 119 ++---
.../freemarker/cache/ConcurrentCacheStorage.java | 16 +-
.../freemarker/cache/FileExtensionMatcher.java | 22 +-
.../java/freemarker/cache/FileNameGlobMatcher.java | 2 +-
.../java/freemarker/cache/FileTemplateLoader.java | 102 +++--
.../FirstMatchTemplateConfigurationFactory.java | 32 +-
.../cache/MergingTemplateConfigurationFactory.java | 10 +-
.../src/main/java/freemarker/cache/NotMatcher.java | 6 +-
.../java/freemarker/cache/StrongCacheStorage.java | 2 +-
.../main/java/freemarker/cache/TemplateCache.java | 490 +++++++++++----------
.../cache/TemplateConfigurationFactory.java | 40 +-
.../TemplateConfigurationFactoryException.java | 8 +-
.../main/java/freemarker/cache/TemplateLoader.java | 163 +++----
.../java/freemarker/cache/TemplateLoaderUtils.java | 3 +-
.../freemarker/cache/TemplateLookupContext.java | 35 +-
.../freemarker/cache/TemplateLookupResult.java | 43 +-
.../freemarker/cache/TemplateLookupStrategy.java | 86 ++--
.../java/freemarker/cache/TemplateNameFormat.java | 180 ++++----
.../freemarker/cache/TemplateSourceMatcher.java | 4 +-
.../java/freemarker/cache/URLTemplateLoader.java | 80 ++--
.../java/freemarker/cache/URLTemplateSource.java | 4 +-
.../src/main/java/freemarker/cache/_CacheAPI.java | 12 +-
.../java/freemarker/cache/_TemplatePathUtils.java | 71 +++
.../core/AliasTemplateDateFormatFactory.java | 27 +-
.../core/AliasTemplateNumberFormatFactory.java | 25 +-
.../src/main/java/freemarker/core/CommandLine.java | 60 ---
.../src/main/java/freemarker/core/Environment.java | 10 +-
.../core/OptInTemplateClassResolver.java | 179 +++++---
.../java/freemarker/core/_CoreLocaleUtils.java | 17 +-
.../main/java/freemarker/ext/dom/NodeModel.java | 342 +++++++-------
.../java/freemarker/ext/dom/NodeOutputter.java | 38 +-
.../main/java/freemarker/ext/dom/Transform.java | 213 ---------
.../java/freemarker/ext/jdom/NodeListModel.java | 27 --
.../template/MalformedTemplateNameException.java | 16 +-
.../freemarker/template/utility/ToCanonical.java | 77 ----
.../ext/beans/DefaultMemberAccessPolicy-rules | 2 +-
.../freemarker/cache/ClassTemplateLoaderTest.java | 98 +++++
.../java/freemarker/cache/TemplateCacheTest.java | 144 +++---
.../freemarker/cache/TemplateNameFormatTest.java | 73 ++-
.../freemarker/cache/TemplatePathUtilsTest.java | 53 +++
.../test/java/freemarker/core/FilterBiTest.java | 15 +-
.../test/java/freemarker/core/JSONParserTest.java | 22 +-
.../freemarker/core/ListBreakContinueTest.java | 21 +-
.../src/test/java/freemarker/core/MapBiTest.java | 13 +-
.../test/java/freemarker/core/MinMaxBITest.java | 20 +-
...tInTemplateClassResolverNameValidationTest.java | 85 ++++
.../java/freemarker/core/OutputFormatTest.java | 471 ++++++++++----------
.../core/TakeWhileAndDropWhileBiTest.java | 34 +-
.../freemarker/core/TemplateConfigurationTest.java | 23 +-
.../freemarker/ext/beans/BeansWrapperBasics.java | 5 +-
.../ext/beans/DefaultMemberAccessPolicyTest.java | 5 +
.../src/test/java/freemarker/ext/dom/DOMTest.java | 14 +
.../freemarker/template/ConfigurationTest.java | 5 +-
.../template/TemplateLookupStrategyTest.java | 236 +++++-----
.../resources/freemarker/cache/templates/1.ftl | 19 +
.../resources/freemarker/cache/templates/sub/2.ftl | 19 +
.../freemarker/cache/WebappTemplateLoader.java | 49 ++-
.../java/freemarker/ext/jsp/EventForwarding.java | 5 +-
.../java/freemarker/ext/jsp/TaglibFactory.java | 431 +++++++++---------
.../main/java/freemarker/ext/jsp/package-info.java | 7 +-
.../ext/servlet/AllHttpScopesHashModel.java | 13 +-
.../freemarker/ext/servlet/FreemarkerServlet.java | 5 +-
.../ext/servlet/HttpRequestHashModel.java | 5 +-
.../servlet/HttpRequestParametersHashModel.java | 5 +-
.../ext/servlet/HttpSessionHashModel.java | 5 +-
.../java/freemarker/ext/servlet/IncludePage.java | 7 +-
.../ext/servlet/ServletContextHashModel.java | 5 +-
.../java/freemarker/ext/servlet/package-info.java | 10 +-
.../freemarker/core/ObjectBuilderSettingsTest.java | 4 +
freemarker-manual/src/main/docgen/en_US/book.xml | 98 ++++-
.../CopyrightCommentRemoverTemplateLoader.java | 4 +
.../main/java/freemarker/test/TemplateTest.java | 1 -
gradle.properties | 4 +
osgi.bnd | 1 -
78 files changed, 2461 insertions(+), 2197 deletions(-)