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 2021/10/23 22:57:32 UTC
[freemarker] branch FREEMARKER-35 updated (beb98ae -> eaa65c9)
This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a change to branch FREEMARKER-35
in repository https://gitbox.apache.org/repos/asf/freemarker.git.
from beb98ae Merge branch '2.3-gae' into FREEMARKER-35
add d0c00d6 Fix: Typos "clalc." in TemplateException
add 3a311da Merge pull request #76 from theHacker/patch-1
add e34c270 [FREEMARKER-187] Build failed on some systems due to character encoding issue
add 172bffc Updated version to 2.3.32-SNAPSHOT
add 054b290 [FREEMARKER-190]: Updated dom4j version used during FreeMarker project compilation from 1.3 to 2.1.3. Users can still use FreeMarker with dom4j 1.3 (mostly just luck, but it works). We were forced to do this because old dom4j versions have security vulnerabilities, and although FreeMarker is not affected by them (like we do not pull in dom4j as dependency into the projects of our users), we were flagged as vulnerable at certain places for merely supporting 1.3.
add ec74c48 Fixed mistake in legacy XML wrapper documentation
add b5d2d40 This is related to freemarker.ext.xml, which is the very old, long deprecated XML wrapper (the commonly used one is freemarker.ext.dom), which almost nobody uses, or maybe truly nobody. Still, now the _registerNamespace key works, doing what the documentation always stated. Before this fix it just behaved as if it was the name of an element you are looking for.
new eaa65c9 Merge remote-tracking branch 'origin/2.3-gae' into FREEMARKER-35
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:
build.xml | 1 +
ivy.xml | 6 +-
.../core/DefaultTruncateBuiltinAlgorithm.java | 4 +-
.../java/freemarker/ext/xml/NodeListModel.java | 19 +++---
.../java/freemarker/template/Configuration.java | 3 +
.../freemarker/template/TemplateException.java | 4 +-
.../java/freemarker/template/_TemplateAPI.java | 1 +
src/main/resources/freemarker/version.properties | 8 +--
src/manual/en_US/book.xml | 73 +++++++++++++++++-----
.../template/DefaultObjectWrapperTest.java | 1 +
10 files changed, 84 insertions(+), 36 deletions(-)
[freemarker] 01/01: Merge remote-tracking branch 'origin/2.3-gae'
into FREEMARKER-35
Posted by dd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a commit to branch FREEMARKER-35
in repository https://gitbox.apache.org/repos/asf/freemarker.git
commit eaa65c9435b585936547783623e17229264b85f9
Merge: beb98ae b5d2d40
Author: ddekany <dd...@apache.org>
AuthorDate: Sun Oct 24 00:57:18 2021 +0200
Merge remote-tracking branch 'origin/2.3-gae' into FREEMARKER-35
build.xml | 1 +
ivy.xml | 6 +-
.../core/DefaultTruncateBuiltinAlgorithm.java | 4 +-
.../java/freemarker/ext/xml/NodeListModel.java | 19 +++---
.../java/freemarker/template/Configuration.java | 3 +
.../freemarker/template/TemplateException.java | 4 +-
.../java/freemarker/template/_TemplateAPI.java | 1 +
src/main/resources/freemarker/version.properties | 8 +--
src/manual/en_US/book.xml | 73 +++++++++++++++++-----
.../template/DefaultObjectWrapperTest.java | 1 +
10 files changed, 84 insertions(+), 36 deletions(-)