This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a change to branch 3
in repository https://gitbox.apache.org/repos/asf/freemarker.git
from d70778b3 Merge pull request #81 from kelemen/gradle-github-actions-v3
new ef0c4296 Forward ported from 2.3-gae: Don't generate Google Analytics.
(For simplicity I just copied the whole manual, but it's for FM2.)
new 10e31294 Forward ported from 2.3-gae: Typo fixes, and some minor
javadoc improvements
new 1c8ea677 Forward ported from 2.3-gae: Added ?cUpperCase, and
?cLowerCase
new f27a1276 Forward ported from 2.3-gae: FREEMARKER-198: To avoid
deadlock when class initialization happens on multiple threads (like
_TemplateAPI->DefaultObjectWrapper, and DefaultObjectWrapper->_TemplateAPI),
factored out static fields from _TemplateAPI into their owns classes.
new 6c535b8f Forward ported from 2.3-gae: PR #77
new 53728100 Forward ported from 2.3-gae: Replace String with
StringBuilder in ElementModel (PR #82)
new 80a71b7d Forward ported from 2.3-gae: [FREEMARKER-187] Build failed on
some systems due to character encoding issue
new d2773c44 Forward ported from 2.3-gae: Fix: Typos "clalc." in
TemplateException (PR #76)
new cfb0651b Forward ported from 2.3-gae: Fix HTLM typos (PR #73)
The 9 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:
FM3-CHANGE-LOG.txt | 2 +-
.../freemarker/converter/_ConverterUtils.java | 2 +-
.../apache/freemarker/core/ConfigurationTest.java | 85 +-
.../core/model/impl/DefaultObjectWrapperTest.java | 60 +-
.../templatesuite/expected/string-builtins1.txt | 1 +
.../templatesuite/templates/string-builtins1.f3ac | 7 +
.../org/apache/freemarker/core/ASTExpBuiltIn.java | 49 +-
.../freemarker/core/BuiltInsForStringsBasic.java | 36 +-
.../org/apache/freemarker/core/JSONParser.java | 15 +-
.../org/apache/freemarker/core/NativeSequence.java | 10 +-
.../apache/freemarker/core/TemplateException.java | 15 +-
.../java/org/apache/freemarker/core/_CoreAPI.java | 6 +-
.../org/apache/freemarker/core/_DelayedAOrAn.java | 2 +-
.../core/_DelayedConversionToString.java | 2 +-
.../freemarker/core/_DelayedGetCanonicalForm.java | 2 +-
.../apache/freemarker/core/_DelayedGetMessage.java | 2 +-
.../core/_DelayedGetMessageWithoutStackTop.java | 2 +-
.../org/apache/freemarker/core/_DelayedJQuote.java | 2 +-
.../freemarker/core/_DelayedJQuotedListing.java | 6 +-
.../freemarker/core/_DelayedJoinWithComma.java | 2 +-
.../_DelayedTemplateLanguageTypeDescription.java | 2 +-
.../freemarker/core/_ErrorDescriptionBuilder.java | 10 +-
.../java/org/apache/freemarker/core/_Java8.java | 2 +-
.../org/apache/freemarker/core/_Java8Impl.java | 2 +-
.../_ObjectBuilderSettingEvaluationException.java | 2 +-
.../core/_ObjectBuilderSettingEvaluator.java | 52 +-
.../core/_SettingEvaluationEnvironment.java | 6 +-
..._UnexpectedTypeErrorExplainerTemplateModel.java | 2 +-
.../{_CharsetBuilder.java => _VersionInts.java} | 25 +-
.../impl/BigDecimalArithmeticEngine.java | 6 +-
.../freemarker/core/debug/_DebuggerService.java | 10 +-
.../core/model/TemplateMarkupOutputModel.java | 4 +-
.../outputformat/CommonMarkupOutputFormat.java | 14 +-
.../core/outputformat/MarkupOutputFormat.java | 10 +-
.../impl/DefaultTruncateBuiltinAlgorithm.java | 4 +-
.../templateresolver/TemplateLoadingSource.java | 8 +-
.../freemarker/core/util/_ArrayAdapterList.java | 2 +-
.../freemarker/core/util/_ArrayIterator.java | 2 +-
.../apache/freemarker/core/util/_ClassUtils.java | 8 +-
.../freemarker/core/util/_CollectionUtils.java | 12 +-
.../apache/freemarker/core/util/_DateUtils.java | 8 +-
.../apache/freemarker/core/util/_JavaVersions.java | 2 +-
.../apache/freemarker/core/util/_NumberUtils.java | 2 +-
.../freemarker/core/util/_SortedArraySet.java | 2 +-
.../apache/freemarker/core/util/_StringUtils.java | 10 +-
.../core/util/_UnmodifiableCompositeSet.java | 2 +-
.../freemarker/core/util/_UnmodifiableSet.java | 2 +-
.../core/valueformat/TemplateNumberFormat.java | 6 +-
.../org/apache/freemarker/dom/ElementModel.java | 10 +-
freemarker-manual/src/main/docgen/en_US/book.xml | 43816 ++++++++++++++++++-
.../src/main/docgen/en_US/docgen.cjson | 39 +-
.../examples/AutoEscapingExample-convert.f3ah | 2 +-
.../examples/AutoEscapingExample-convert.f3ah.out | 2 +-
.../src/test/resources/META-INF/malformed.tld | 31 -
.../CopyrightCommentRemoverTemplateLoader.java | 18 +-
55 files changed, 44013 insertions(+), 430 deletions(-)
copy
freemarker-core/src/main/java/org/apache/freemarker/core/{_CharsetBuilder.java
=> _VersionInts.java} (61%)
delete mode 100644 freemarker-servlet/src/test/resources/META-INF/malformed.tld
