This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a change to branch 2.3
in repository https://gitbox.apache.org/repos/asf/freemarker.git
from b28f1f17 Merge remote-tracking branch 'origin/2.3-gae' into 2.3
add 0d803638 Updated release date in the manual
add 3ac86b54 Updated version to 2.3.33-nightly
add a00b6c70 #91 (from Github, but re-done manually): Fix wrong link text
in documentation
add 57a76085 Another typo in the Manual (reported in private)
add feb612b0 Update docgen.cjson - fix broken link to template tester
add 345b6eeb Merge pull request #93 from prushforth/2.3-gae
add 5f8e1cb2 FREEMARKER-214 - updating JavaCC to 7.0.12
add 09e81c1f Merge branch 'apache:2.3-gae' into
FREEMARKER-214-updata-javacc-to-7.0.12
add 301f3ef2 Merge pull request #90 from
donnchadhpop/FREEMARKER-214-updata-javacc-to-7.0.12
add df938ce6 Version history: Added JavaCC upgrade
add a8bb8f92 Manual: Typo fix, and refined compatibility warning.
add 7e5b6df0 add .asf.yaml
add caba878e Merge pull request #99 from bmarwell/asf-yaml-autolinks
add 05d6158c Update .asf.yaml, disable issues
add fb9335ab Merge pull request #101 from bmarwell/patch-1
add a33970de [BUILD] add github workflow
add 039ae476 [BUILD] remove travis.yaml, use ci goal
add e571099d Merge pull request #100 from bmarwell/github_workflows
add 43e57dc8 [BUILD] sign and rat-check on CI build
add 79b77fa4 Merge pull request #102 from
bmarwell/2.3-dist-rat-github-action
add 8050d7c0 README shows Git Action status, instead of the now dead
Travis build status. Renamed Git Action to "CI", otherwise it looks odd in the
status icon.
add 723a21c6 (Fixed badge URL)
add e50d6512 (Some Javadoc and comment adjustments)
add 52cae12d Switched to Java 16 as minimal build environment. With this
version (since Java 9) we can't use javac "bootclasspath", and "source", and
"target", but "release". Also, removed RMI sub generation for the debug API, as
rmic was removed since JDK 13 or so, and modern RMI doesn't need stubs anyway
(also probably nobody uses the debug API).
add 1b8481f6 Adjusted JUnit test expected value for JDK 11+, where the
default format of numbers and temporals has been changed. (We already require
JDK 16 for the build.)
add d7f7f1a5 (Updated README IDE setup instructions)
add 763e6752 Updated Jetty version used in JUnit tests, because the old
one can't run on Java 16. Also some adjustments in Jetty setup was needed.
add 2caaddc1 Fixed issue (noticed with upgraded Jetty): When
FreemarkerServlet was used with the TemplateExceptionHandler.DEBUG_HANDLER or
HTML_DEBUG_HANDLER, on Jetty the response web page was possibly empty or
partial, as Jetty has abruptly closed the connection after we flushed the HTTP
response with status code 200, and yet thrown an exception. Now in this
situation we only log the exception, but don't throw it. (Production system
should always use RETHROW_HANDLER, and this chang [...]
add d6304199 Disabled javadoc failing on errors for now, as because of
switching to Java 16 there's a lot of HTML-related complaints.
add 35e1664e Dropped support for Java 7, to simplify build. Now minimum is
Java 8.
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
add 5d16d1cc Fix string comparison to avoid using the collator.
Benchmarking has shown an up-to-1000x performance degradation from using the
collator.
add 611f27ef Unicode-normalize strings before comparing them.
add 1c274bc3 Only use the new logic (without Collator) when
`incompatibleImprovements` >= 2.3.33.
add dbacf3b5 Merge pull request #87 from nolaviz/nolaviz-devel
add 8b229bfb Additional documentation, and test for: PR #87 - Fix string
comparison to avoid using the collator
add d88154f9 (Minor javadoc content improvement)
add 93a96377 Solution for PR #97 Speedup ConcatenatedSequence iteration,
but it works differently as the PR.
add d75ddc6c Simplified ConcatenatedSequence iteration logic.
Non-recursive ConcatenatedSequence.size() to limit stack usage.
add d63b2766 README IntelliJ instructions adjusted
add 8ac81c61 Made ConcatenatedSequence.get(int) a lot less slow when it
was made from a lot of concatenated sequences. Not fast still, but way faster
in those cases, and is a backward compatible solution. (That is, it's a
solution that doesn't assume that the nested sequences weren't changed since
the concatenation. It could be much faster if we can assume that.)
add 4ca8c34a ConcatenatedSequence now also implements
TemplateCollectionModelEx, and thus has an isEmpty() that's more efficient than
size() == 0. Also extende the Unit test to check with more kind sequence
implementations, and with sequences containing null items.
add 020e54e9 Support "forced" auto-escaping policy.
add c38c8876 Change error messages to explicitly refer to
auto_escaping_policy.
add e5521545 Fix tyop.
add 9a19894d Merge pull request #88 from nolaviz/nolaviz-devel-forceautoesc
add cf5164ca For PR #88 forceAutoEscape: Better error messages. Some more
test coverage.
add c01e084c For PR #88 forceAutoEscape: Fixed javadoc error
add eb1a0ad2 For PR #88 forceAutoEscape: Postpone failing due to
non-escaping output format until we are past the #ftl header
add 389a9e51 For PR #88 forceAutoEscape: Better error message, and test
coverage for blocking <#ftl auto_esc=false>
add 6965a7ed For PR #88 forceAutoEscape: Documentation
add 2713f7ac Ensure the "else" part of a `#list` is evaluated in
`Environment.visit()`.
add 87568040 Add a `TemplateProcessingTracer` interface.
add 66857d98 Make the `TemplateProcessingTracer` interface slightly more
useful.
add d5c8c766 Merge pull request #89 from nolaviz/nolaviz-patch1
add 52992c34 PR #89 TemplateProcessingTracer reworked: - Instead of
passing several arguments to the TemplateProcessingTracer method, only pass a
single TracedElement object. This allow use to add new methods later without
breaking backward compatibility. - Added TracedElement.getDescription() to give
a single-line canonical description of the element (same format that we use in
FTL stack taces) - Expose the Environment object to TemplateProcessingTracer
methods - Do not expose the T [...]
new bd42e4c8 Merge remote-tracking branch 'origin/2.3-gae' into 2.3
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:
.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} | 6 +-
.../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, 2354 insertions(+), 783 deletions(-)
create mode 100644 .asf.yaml
create mode 100644 .github/workflows/ci.yml
delete mode 100644 .travis.yml
copy src/main/java/freemarker/core/{BuiltInBannedWhenAutoEscaping.java =>
BuiltInBannedWhenForcedAutoEscaping.java} (83%)
create mode 100644 src/main/java/freemarker/core/TemplateProcessingTracer.java
rename src/main/java/freemarker/core/{_Java8.java => _Java16.java} (87%)
rename src/main/java/freemarker/core/{_Java8Impl.java => _Java16Impl.java}
(54%)
create mode 100644 src/test/java/freemarker/core/ConcatenatedSequenceTest.java
create mode 100644
src/test/java/freemarker/core/TemplateProcessingTracerTest.java
