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/02/07 19:07:46 UTC
[freemarker] 01/01: Merge remote-tracking branch 'origin/2.3-gae'
into FREEMARKER-35
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 61de5d926dac3c7b4f40e8c75da9559fbad5d266
Merge: 034534a 1f0b69f
Author: ddekany <dd...@apache.org>
AuthorDate: Sun Feb 7 20:07:32 2021 +0100
Merge remote-tracking branch 'origin/2.3-gae' into FREEMARKER-35
# Conflicts:
# osgi.bnd
.travis.yml | 36 +-
README.md | 7 +-
build.xml | 165 +-----
ivy.xml | 6 +-
.../specialvars.ftl => ivysettings-ci.xml | 42 +-
ivysettings.xml | 41 +-
osgi.bnd | 13 +-
src/main/java/freemarker/core/Assignment.java | 6 +-
src/main/java/freemarker/core/BlockAssignment.java | 12 +-
src/main/java/freemarker/core/BuiltIn.java | 4 +-
.../freemarker/core/BuiltInsForMultipleTypes.java | 4 +-
.../freemarker/core/BuiltInsForStringsMisc.java | 17 +-
src/main/java/freemarker/core/BuiltinVariable.java | 29 +-
src/main/java/freemarker/core/DynamicKeyName.java | 2 +-
src/main/java/freemarker/core/Environment.java | 46 +-
src/main/java/freemarker/core/JSONParser.java | 622 +++++++++++++++++++++
.../core/JavaTemplateNumberFormatFactory.java | 12 +-
src/main/java/freemarker/core/ParseException.java | 316 +++++++----
.../java/freemarker/core/TemplateNullModel.java | 4 +-
.../java/freemarker/core/_CoreStringUtils.java | 26 +-
.../freemarker/ext/beans/ClassIntrospector.java | 65 ++-
.../java/freemarker/ext/beans/_MethodUtil.java | 82 +++
.../java/freemarker/template/Configuration.java | 11 +
.../freemarker/template/DefaultObjectWrapper.java | 82 ++-
.../DefaultObjectWrapperConfiguration.java | 30 +-
.../java/freemarker/template/_TemplateAPI.java | 4 +-
.../freemarker/template/utility/StringUtil.java | 11 +
src/main/javacc/FTL.jj | 3 +-
src/manual/en_US/book.xml | 493 ++++++++++++++--
src/test/java/freemarker/core/CamelCaseTest.java | 3 +
.../freemarker/core/EvalJsonBuiltInTest.java} | 60 +-
src/test/java/freemarker/core/JSONParserTest.java | 171 ++++++
.../freemarker/core/MiscErrorMessagesTest.java | 14 +-
.../java/freemarker/core/NumberFormatTest.java | 47 +-
.../freemarker/core/ParsingErrorMessagesTest.java | 24 +-
.../Java9InstrospectorBugWorkaroundTest.java} | 45 +-
.../java/freemarker/ext/beans/MethodUtilTest2.java | 164 ++++++
.../ext/beans/ParameterListPreferabilityTest.java | 2 +-
.../template/DefaultObjectWrapperTest.java | 45 +-
.../freemarker/core/cano-identifier-escaping.ftl | 6 +-
.../core/cano-identifier-escaping.ftl.out | 4 +-
.../templatesuite/expected/identifier-escaping.txt | 2 +-
.../test/templatesuite/expected/specialvars.txt | 1 +
.../templates/identifier-escaping.ftl | 6 +-
.../freemarker/test/templatesuite/templates/if.ftl | 8 +-
.../test/templatesuite/templates/setting.ftl | 2 +
.../test/templatesuite/templates/specialvars.ftl | 1 +
47 files changed, 2232 insertions(+), 564 deletions(-)
diff --cc src/main/java/freemarker/core/Environment.java
index 0e57db4,b6b5b44..283e062
--- a/src/main/java/freemarker/core/Environment.java
+++ b/src/main/java/freemarker/core/Environment.java
@@@ -71,9 -70,9 +71,10 @@@ import freemarker.template.TemplateNode
import freemarker.template.TemplateNumberModel;
import freemarker.template.TemplateScalarModel;
import freemarker.template.TemplateSequenceModel;
+import freemarker.template.TemplateTemporalModel;
import freemarker.template.TemplateTransformModel;
import freemarker.template.TransformControl;
+ import freemarker.template.Version;
import freemarker.template._TemplateAPI;
import freemarker.template.utility.DateUtil;
import freemarker.template.utility.DateUtil.DateToISO8601CalendarFactory;