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 cf2bf365a84e006fc900de090464152cf3a248e9 Merge: 05a9c86b f6f5207a Author: ddekany <[email protected]> AuthorDate: Sun Dec 18 20:23:13 2022 +0100 Merge remote-tracking branch 'origin/2.3-gae' into 2.3 .gitignore | 5 +- build.xml | 199 ++++++----- src/main/java/freemarker/cache/TemplateCache.java | 5 +- .../core/APINotSupportedTemplateException.java | 4 +- .../java/freemarker/core/AddConcatExpression.java | 6 +- .../java/freemarker/core/ArithmeticEngine.java | 4 +- src/main/java/freemarker/core/BuiltIn.java | 6 +- .../java/freemarker/core/BuiltInsForDates.java | 3 +- .../freemarker/core/BuiltInsForMultipleTypes.java | 112 ++++--- .../java/freemarker/core/BuiltInsForNodes.java | 4 +- .../java/freemarker/core/BuiltInsForSequences.java | 6 +- .../freemarker/core/BuiltInsForStringsBasic.java | 21 +- .../core/BuiltInsForStringsEncoding.java | 4 +- .../freemarker/core/BuiltInsForStringsRegexp.java | 4 +- src/main/java/freemarker/core/BuiltinVariable.java | 4 +- .../freemarker/core/CTemplateNumberFormat.java | 178 ++++++++++ src/main/java/freemarker/core/Configurable.java | 6 +- src/main/java/freemarker/core/DynamicKeyName.java | 12 +- src/main/java/freemarker/core/Environment.java | 69 ++-- src/main/java/freemarker/core/EvalUtil.java | 4 +- .../freemarker/core/GetOptionalTemplateMethod.java | 4 +- src/main/java/freemarker/core/HashLiteral.java | 12 +- src/main/java/freemarker/core/Interpret.java | 4 +- src/main/java/freemarker/core/JSONParser.java | 10 +- .../core/JavaTemplateNumberFormatFactory.java | 8 +- src/main/java/freemarker/core/ListLiteral.java | 6 +- src/main/java/freemarker/core/Macro.java | 6 +- src/main/java/freemarker/core/Range.java | 3 +- src/main/java/freemarker/core/RecurseNode.java | 4 +- .../freemarker/core/TemplateConfiguration.java | 3 +- .../java/freemarker/core/TemplateNumberFormat.java | 5 +- src/main/java/freemarker/core/VisitNode.java | 4 +- .../java/freemarker/core/_ArrayEnumeration.java | 2 +- src/main/java/freemarker/core/_ArrayIterator.java | 2 +- src/main/java/freemarker/core/_CoreAPI.java | 6 +- src/main/java/freemarker/core/_DelayedAOrAn.java | 2 +- .../core/_DelayedConversionToString.java | 2 +- .../core/_DelayedFTLTypeDescription.java | 2 +- .../freemarker/core/_DelayedGetCanonicalForm.java | 2 +- .../java/freemarker/core/_DelayedGetMessage.java | 2 +- .../core/_DelayedGetMessageWithoutStackTop.java | 2 +- src/main/java/freemarker/core/_DelayedJQuote.java | 2 +- .../freemarker/core/_DelayedJoinWithComma.java | 2 +- .../freemarker/core/_ErrorDescriptionBuilder.java | 2 +- src/main/java/freemarker/core/_Java8.java | 2 +- src/main/java/freemarker/core/_Java8Impl.java | 2 +- src/main/java/freemarker/core/_JavaVersions.java | 2 +- src/main/java/freemarker/core/_MessageUtil.java | 2 +- .../_ObjectBuilderSettingEvaluationException.java | 2 +- .../core/_ObjectBuilderSettingEvaluator.java | 4 +- .../core/_SettingEvaluationEnvironment.java | 2 +- src/main/java/freemarker/core/_SortedArraySet.java | 2 +- ..._UnexpectedTypeErrorExplainerTemplateModel.java | 2 +- .../freemarker/core/_UnmodifiableCompositeSet.java | 2 +- .../java/freemarker/core/_UnmodifiableSet.java | 2 +- .../java/freemarker/ext/ant/FreemarkerXmlTask.java | 4 +- .../java/freemarker/ext/beans/BeansWrapper.java | 9 +- .../ext/beans/BeansWrapperConfiguration.java | 3 +- .../ext/beans/ClassIntrospectorBuilder.java | 7 +- src/main/java/freemarker/ext/dom/ElementModel.java | 12 +- .../java/freemarker/ext/jdom/NodeListModel.java | 4 +- .../freemarker/ext/jsp/FreeMarkerPageContext.java | 6 +- .../freemarker/ext/servlet/InitParamParser.java | 6 +- .../java/freemarker/template/Configuration.java | 22 +- .../freemarker/template/DefaultObjectWrapper.java | 6 +- .../DefaultObjectWrapperConfiguration.java | 4 +- src/main/java/freemarker/template/Template.java | 4 +- .../java/freemarker/template/_ObjectWrappers.java | 58 ++++ .../java/freemarker/template/_TemplateAPI.java | 53 +-- .../java/freemarker/template/_VersionInts.java | 50 +++ .../freemarker/template/utility/DOMNodeModel.java | 4 +- .../template/utility/TemplateModelUtils.java | 6 +- src/main/javacc/FTL.jj | 352 ++++++++++---------- src/manual/en_US/book.xml | 368 +++++++++++++++++---- src/manual/en_US/docgen.cjson | 33 +- ...icEngineTest.java => ArithmeticEngineTest.java} | 31 +- .../freemarker/core/CTemplateNumberFormatTest.java | 141 ++++++++ src/test/java/freemarker/core/NumberBiTest.java | 61 ++++ .../freemarker/template/ConfigurationTest.java | 2 +- .../template/DefaultObjectWrapperTest.java | 2 +- .../test/templatesuite/TemplateTestCase.java | 4 +- .../test/templatesuite/models/LegacyList.java | 4 +- .../templatesuite/models/TransformHashWrapper.java | 4 +- src/test/resources/META-INF/malformed.tld | 31 -- .../test/templatesuite/expected/number-format.txt | 9 +- .../templatesuite/expected/string-builtins1.txt | 1 + .../test/templatesuite/templates/number-format.ftl | 18 +- .../templatesuite/templates/string-builtins1.ftl | 7 + 88 files changed, 1447 insertions(+), 656 deletions(-) diff --cc build.xml index 3203983c,c219f480..ef573b95 --- a/build.xml +++ b/build.xml @@@ -798,11 -798,12 +798,11 @@@ <groupId>${mavenGroupId}</groupId> <artifactId>${mavenArtifactId}</artifactId> <version>${mavenVersion}</version> - + <packaging>jar</packaging> - + <name>Apache FreeMarker</name> <description> - Google App Engine compliant variation of FreeMarker. FreeMarker is a "template engine"; a generic tool to generate text output based on templates. </description> <url>https://freemarker.apache.org/</url>
