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 bd42e4c87b91bdbb584eeead61044f8493a0e898 Merge: b28f1f17 52992c34 Author: ddekany <[email protected]> AuthorDate: Fri Dec 22 02:01:06 2023 +0100 Merge remote-tracking branch 'origin/2.3-gae' into 2.3 # Conflicts: # src/main/java/freemarker/core/TemplateElement.java .asf.yaml | 33 ++ .github/workflows/ci.yml | 74 ++++ .gitignore | 2 + .travis.yml | 46 --- README.md | 34 +- build.properties.sample | 2 - build.xml | 165 ++------ ivy.xml | 12 +- osgi.bnd | 8 +- .../freemarker/cache/StringTemplateLoader.java | 6 +- src/main/java/freemarker/cache/TemplateLoader.java | 2 +- .../java/freemarker/core/AddConcatExpression.java | 261 ++++++++++++- ...va => BuiltInBannedWhenForcedAutoEscaping.java} | 23 +- .../core/BuiltInsForOutputFormatRelated.java | 2 +- .../java/freemarker/core/BuiltInsForSequences.java | 2 +- src/main/java/freemarker/core/CommandLine.java | 2 +- src/main/java/freemarker/core/Configurable.java | 90 ++--- src/main/java/freemarker/core/CustomAttribute.java | 2 +- .../java/freemarker/core/DirectiveCallPlace.java | 2 +- src/main/java/freemarker/core/Environment.java | 56 ++- src/main/java/freemarker/core/EvalUtil.java | 9 +- src/main/java/freemarker/core/IfBlock.java | 24 +- src/main/java/freemarker/core/Include.java | 2 +- src/main/java/freemarker/core/Interpret.java | 6 +- src/main/java/freemarker/core/LibraryLoad.java | 2 +- .../java/freemarker/core/ListElseContainer.java | 21 +- src/main/java/freemarker/core/MethodCall.java | 2 +- src/main/java/freemarker/core/MixedContent.java | 4 +- src/main/java/freemarker/core/NewBI.java | 2 +- src/main/java/freemarker/core/NumberLiteral.java | 2 +- src/main/java/freemarker/core/StopException.java | 2 +- src/main/java/freemarker/core/StringLiteral.java | 2 +- src/main/java/freemarker/core/TemplateElement.java | 6 +- src/main/java/freemarker/core/TemplateObject.java | 26 +- .../freemarker/core/TemplateProcessingTracer.java | 95 +++++ .../freemarker/core/{_Java8.java => _Java16.java} | 12 +- .../core/{_Java8Impl.java => _Java16Impl.java} | 33 +- src/main/java/freemarker/core/_JavaVersions.java | 57 +-- src/main/java/freemarker/debug/DebugModel.java | 2 +- src/main/java/freemarker/debug/DebuggerClient.java | 4 +- .../java/freemarker/ext/ant/FreemarkerXmlTask.java | 84 ++-- .../java/freemarker/ext/beans/ArgumentTypes.java | 4 +- src/main/java/freemarker/ext/beans/ArrayModel.java | 2 +- src/main/java/freemarker/ext/beans/BeanModel.java | 14 +- .../java/freemarker/ext/beans/BeansWrapper.java | 37 +- .../freemarker/ext/beans/ClassIntrospector.java | 15 +- .../java/freemarker/ext/beans/CollectionModel.java | 2 +- .../ext/beans/DefaultMemberAccessPolicy.java | 2 +- .../freemarker/ext/beans/EnumerationModel.java | 2 +- .../java/freemarker/ext/beans/IteratorModel.java | 4 +- src/main/java/freemarker/ext/beans/MapModel.java | 12 +- .../freemarker/ext/beans/MemberAccessPolicy.java | 4 + .../ext/beans/MethodAppearanceFineTuner.java | 22 +- .../freemarker/ext/beans/OverloadedNumberUtil.java | 2 +- .../freemarker/ext/beans/ResourceBundleModel.java | 8 +- .../java/freemarker/ext/beans/SimpleMapModel.java | 2 +- .../java/freemarker/ext/beans/StaticModel.java | 2 +- .../java/freemarker/ext/beans/StaticModels.java | 4 +- .../java/freemarker/ext/jdom/NodeListModel.java | 88 ++--- .../java/freemarker/ext/jsp/EventForwarding.java | 4 +- .../java/freemarker/ext/jsp/TaglibFactory.java | 4 +- .../ext/servlet/AllHttpScopesHashModel.java | 10 +- .../freemarker/ext/servlet/FreemarkerServlet.java | 62 ++- .../java/freemarker/ext/util/IdentityHashMap.java | 66 ++-- .../java/freemarker/ext/xml/NodeListModel.java | 83 ++-- src/main/java/freemarker/log/Logger.java | 4 +- .../java/freemarker/log/SLF4JLoggerFactory.java | 2 +- .../freemarker/template/AdapterTemplateModel.java | 4 +- .../java/freemarker/template/Configuration.java | 55 ++- .../java/freemarker/template/SimpleCollection.java | 22 +- src/main/java/freemarker/template/SimpleDate.java | 2 +- src/main/java/freemarker/template/SimpleHash.java | 2 +- .../java/freemarker/template/SimpleNumber.java | 4 +- .../java/freemarker/template/SimpleScalar.java | 10 +- src/main/java/freemarker/template/Template.java | 20 +- .../freemarker/template/TemplateHashModel.java | 6 +- .../freemarker/template/TemplateMethodModel.java | 2 +- .../template/TemplateModelException.java | 6 +- .../java/freemarker/template/TransformControl.java | 8 +- .../java/freemarker/template/_TemplateAPI.java | 2 + .../freemarker/template/utility/DeepUnwrap.java | 2 +- .../java/freemarker/template/utility/Execute.java | 4 +- .../freemarker/template/utility/StringUtil.java | 43 ++- .../freemarker/template/utility/XmlEscape.java | 4 +- src/main/javacc/FTL.jj | 64 +++- src/main/resources/freemarker/version.properties | 8 +- src/manual/en_US/book.xml | 206 +++++++++- src/manual/en_US/docgen.cjson | 4 +- .../java/freemarker/core/CAndCnBuiltInTest.java | 2 +- .../freemarker/core/ConcatenatedSequenceTest.java | 421 +++++++++++++++++++++ src/test/java/freemarker/core/DateFormatTest.java | 2 +- .../java/freemarker/core/NumberFormatTest.java | 2 +- .../java/freemarker/core/OutputFormatTest.java | 42 +- .../freemarker/core/TagSyntaxVariationsTest.java | 2 +- .../core/TemplateProcessingTracerTest.java | 245 ++++++++++++ .../freemarker/ext/beans/BeansWrapperMiscTest.java | 2 - .../ext/jsp/RealServletContainertTest.java | 4 +- .../template/DefaultObjectWrapperTest.java | 1 + .../freemarker/template/MockServletContext.java | 143 +++++++ src/test/java/freemarker/test/package.html | 4 +- .../freemarker/test/servlet/WebAppTestCase.java | 23 +- .../test/templatesuite/models/BooleanHash1.java | 6 +- .../test/templatesuite/models/BooleanHash2.java | 6 +- .../test/templatesuite/models/MultiModel1.java | 6 +- .../test/templatesuite/models/MultiModel2.java | 4 +- .../test/templatesuite/models/MultiModel3.java | 6 +- .../test/templatesuite/models/MultiModel4.java | 6 +- .../test/templatesuite/models/MultiModel5.java | 6 +- .../templatesuite/models/SimpleTestMethod.java | 4 +- .../templatesuite/models/TransformHashWrapper.java | 6 +- .../models/TransformMethodWrapper1.java | 4 +- .../models/TransformMethodWrapper2.java | 4 +- .../freemarker/test/templatesuite/package.html | 12 +- .../test/templatesuite/expected/comparisons.txt | 1 - .../test/templatesuite/expected/number-format.txt | 4 +- .../test/templatesuite/templates/comparisons.ftl | 22 ++ .../test/templatesuite/templates/number-format.ftl | 2 +- src/test/resources/logback-test.xml | 2 + 118 files changed, 2355 insertions(+), 799 deletions(-)
