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 d1097c24 Merge remote-tracking branch 'origin/2.3-gae' into
FREEMARKER-35
add f970eaa7 (Some random cleanup of recent servlet related changes)
add dd08c784 Javadoc HTML fixes to satisfy the linter of Java 16 javadoc.
Re-enabled failing if there's any javadoc error.
add 177115ed Do not customize javadoc output anymore - It complicates
build, had to be reviewed for new javadoc versions, and almost nobody uses the
javadoc HTML-s nowadays.
add f42b107f Gradle build: Updated Java SE API link
new 2a23b00b 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 | 76 +------------------
ivy.xml | 7 +-
.../freemarker/cache/StringTemplateLoader.java | 6 +-
src/main/java/freemarker/cache/TemplateLoader.java | 2 +-
.../java/freemarker/core/BuiltInsForSequences.java | 2 +-
src/main/java/freemarker/core/CommandLine.java | 2 +-
src/main/java/freemarker/core/Configurable.java | 87 ++++++++++-----------
src/main/java/freemarker/core/CustomAttribute.java | 2 +-
.../java/freemarker/core/DirectiveCallPlace.java | 2 +-
src/main/java/freemarker/core/Environment.java | 20 ++---
src/main/java/freemarker/core/Include.java | 2 +-
src/main/java/freemarker/core/Interpret.java | 6 +-
src/main/java/freemarker/core/LibraryLoad.java | 2 +-
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/TemplateObject.java | 2 +-
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 | 26 +++----
.../java/freemarker/ext/beans/CollectionModel.java | 2 +-
.../freemarker/ext/beans/EnumerationModel.java | 2 +-
.../java/freemarker/ext/beans/IteratorModel.java | 4 +-
src/main/java/freemarker/ext/beans/MapModel.java | 12 +--
.../ext/beans/MethodAppearanceFineTuner.java | 20 ++---
.../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 | 28 +++----
.../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 | 23 +++---
.../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 +--
.../java/freemarker/template/SimpleTemporal.java | 2 +-
src/main/java/freemarker/template/Template.java | 4 +-
.../freemarker/template/TemplateHashModel.java | 6 +-
.../freemarker/template/TemplateMethodModel.java | 2 +-
.../template/TemplateModelException.java | 6 +-
.../java/freemarker/template/TransformControl.java | 8 +-
.../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 | 2 +-
.../freemarker/core/TagSyntaxVariationsTest.java | 2 +-
.../ext/jsp/RealServletContainertTest.java | 4 +-
src/test/java/freemarker/test/package.html | 4 +-
.../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 +--
79 files changed, 442 insertions(+), 503 deletions(-)
