This is an automated email from the ASF dual-hosted git repository.

ddekany pushed a commit to branch FREEMARKER-35
in repository https://gitbox.apache.org/repos/asf/freemarker.git

commit b3e70825c024c994434058e4826f2907e9f80293
Merge: 9742e5e2 8fc6d09b
Author: ddekany <[email protected]>
AuthorDate: Fri Dec 22 19:28:53 2023 +0100

    Merge remote-tracking branch 'origin/2.3-gae' into FREEMARKER-35
    
    # Conflicts:
    #       build.xml
    #       
freemarker-core/src/main/java/freemarker/core/DateTimeFormatterBasedTemplateTemporalFormat.java
    #       
freemarker-core/src/main/java/freemarker/core/FastLRUKeyValueStore.java
    #       
freemarker-core/src/main/java/freemarker/core/ISOLikeTemplateTemporalTemporalFormat.java
    #       
freemarker-core/src/main/java/freemarker/core/ISOTemplateTemporalFormatFactory.java
    #       
freemarker-core/src/main/java/freemarker/core/JavaTemplateTemporalFormat.java
    #       
freemarker-core/src/main/java/freemarker/core/JavaTemplateTemporalFormatFactory.java
    #       
freemarker-core/src/main/java/freemarker/core/MissingTimeZoneParserPolicy.java
    #       
freemarker-core/src/main/java/freemarker/core/TemplateTemporalFormat.java
    #       
freemarker-core/src/main/java/freemarker/core/TemplateTemporalFormatFactory.java
    #       
freemarker-core/src/main/java/freemarker/core/UnformattableTemporalTypeException.java
    #       
freemarker-core/src/main/java/freemarker/core/XSTemplateTemporalFormatFactory.java
    #       freemarker-core/src/main/java/freemarker/core/_JavaTimeBugUtils.java
    #       freemarker-core/src/main/java/freemarker/core/_JavaVersion.java
    #       freemarker-core/src/main/java/freemarker/core/_TemporalUtils.java
    #       
freemarker-core/src/main/java/freemarker/ext/beans/TemporalModel.java
    #       
freemarker-core/src/main/java/freemarker/template/SimpleTemporal.java
    #       
freemarker-core/src/main/java/freemarker/template/TemplateTemporalModel.java
    #       
freemarker-core/src/test/java/freemarker/core/AbstractTemplateTemporalFormatAbstractCachingInEnvironmentTest.java
    #       
freemarker-core/src/test/java/freemarker/core/AbstractTemporalFormatTest.java
    #       
freemarker-core/src/test/java/freemarker/core/CustomTemplateTemporalFormatTest.java
    #       
freemarker-core/src/test/java/freemarker/core/EpochMillisDivTemplateTemporalFormatFactory.java
    #       
freemarker-core/src/test/java/freemarker/core/EpochMillisTemplateTemporalFormatFactory.java
    #       
freemarker-core/src/test/java/freemarker/core/FormatCacheMemoryLeakPreventionFlushingTest.java
    #       
freemarker-core/src/test/java/freemarker/core/HTMLISOTemplateTemporalFormatFactory.java
    #       
freemarker-core/src/test/java/freemarker/core/ISOLikeTemplateTemporalFormatTest.java
    #       
freemarker-core/src/test/java/freemarker/core/JavaTemplateTemporalFormatTest.java
    #       
freemarker-core/src/test/java/freemarker/core/LocAndTZSensitiveTemplateTemporalFormatFactory.java
    #       
freemarker-core/src/test/java/freemarker/core/TemplateTemporalFormatByFormatStringCachingInEnvironmentTest.java
    #       
freemarker-core/src/test/java/freemarker/core/TemplateTemporalFormatCurrentCachingInEnvironmentTest.java
    #       
freemarker-core/src/test/java/freemarker/core/TemporalErrorMessagesTest.java
    #       
freemarker-core/src/test/java/freemarker/core/_TemporalUtilsTest.java
    #       
freemarker-core/src/test/java/freemarker/template/utility/DateUtilsPatternParsingTest.java
    #       
freemarker-jython25/src/test/resources/freemarker/test/templatesuite/templates/temporal.ftl
    #       freemarker-jython25/src/test/resources/logback-test-ci.xml

 .github/workflows/ci.yml                           |  51 +-
 .gitignore                                         |   1 +
 LICENSE                                            |   5 -
 README.md                                          | 123 +--
 build.gradle.kts                                   | 596 +++++++++++++
 build.xml                                          | 974 ---------------------
 .../build.gradle.kts                               |  11 +-
 .../settings.gradle.kts                            |   8 +-
 .../kotlin/freemarker/build/ChecksumFileTask.kt    |  81 ++
 .../kotlin/freemarker/build/CompileJavaccTask.kt   | 234 +++++
 .../freemarker/build/FreemarkerPathExtensions.kt   |  10 +-
 .../freemarker/build/FreemarkerRootExtension.kt    | 285 ++++++
 .../freemarker/build/FreemarkerRootPlugin.kt       | 126 +++
 .../freemarker/build/FreemarkerVersionService.kt   |  81 ++
 .../kotlin/freemarker/build/ManualBuildTask.kt     |  69 ++
 .../freemarker/build/SignatureConfiguration.kt     |  21 +-
 .../main/kotlin/freemarker/build/SignatureTask.kt  |  62 ++
 .../gradle-plugins/freemarker-root.properties      |   9 +-
 .../main/java/freemarker/cache/AndMatcher.java     |   0
 .../freemarker/cache/ByteArrayTemplateLoader.java  |   0
 .../main/java/freemarker/cache/CacheStorage.java   |   0
 .../freemarker/cache/CacheStorageWithGetSize.java  |   0
 .../java/freemarker/cache/ClassTemplateLoader.java |   0
 .../freemarker/cache/ConcurrentCacheStorage.java   |   0
 .../ConditionalTemplateConfigurationFactory.java   |   0
 .../freemarker/cache/FileExtensionMatcher.java     |   0
 .../java/freemarker/cache/FileNameGlobMatcher.java |   0
 .../java/freemarker/cache/FileTemplateLoader.java  |   0
 .../FirstMatchTemplateConfigurationFactory.java    |   0
 .../cache/MergingTemplateConfigurationFactory.java |   0
 .../java/freemarker/cache/MruCacheStorage.java     |   0
 .../java/freemarker/cache/MultiTemplateLoader.java |   0
 .../main/java/freemarker/cache/NotMatcher.java     |   0
 .../java/freemarker/cache/NullCacheStorage.java    |   0
 .../src}/main/java/freemarker/cache/OrMatcher.java |   0
 .../java/freemarker/cache/PathGlobMatcher.java     |   0
 .../java/freemarker/cache/PathRegexMatcher.java    |   0
 .../java/freemarker/cache/SoftCacheStorage.java    |   0
 .../freemarker/cache/StatefulTemplateLoader.java   |   0
 .../freemarker/cache/StringTemplateLoader.java     |   0
 .../java/freemarker/cache/StrongCacheStorage.java  |   0
 .../main/java/freemarker/cache/TemplateCache.java  |   0
 .../cache/TemplateConfigurationFactory.java        |   0
 .../TemplateConfigurationFactoryException.java     |   0
 .../main/java/freemarker/cache/TemplateLoader.java |   0
 .../java/freemarker/cache/TemplateLoaderUtils.java |   0
 .../freemarker/cache/TemplateLookupContext.java    |   0
 .../freemarker/cache/TemplateLookupResult.java     |   0
 .../freemarker/cache/TemplateLookupStrategy.java   |   0
 .../java/freemarker/cache/TemplateNameFormat.java  |   0
 .../freemarker/cache/TemplateSourceMatcher.java    |   0
 .../java/freemarker/cache/URLTemplateLoader.java   |   0
 .../java/freemarker/cache/URLTemplateSource.java   |   0
 .../src}/main/java/freemarker/cache/_CacheAPI.java |   0
 .../src}/main/java/freemarker/cache/package.html   |   0
 .../core/APINotSupportedTemplateException.java     |   0
 .../freemarker/core/AbstractJSONLikeFormat.java    |   0
 .../java/freemarker/core/AddConcatExpression.java  |   0
 .../AliasTargetTemplateValueFormatException.java   |   0
 .../core/AliasTemplateDateFormatFactory.java       |   0
 .../core/AliasTemplateNumberFormatFactory.java     |   0
 .../main/java/freemarker/core/AndExpression.java   |   0
 .../java/freemarker/core/ArithmeticEngine.java     |   0
 .../java/freemarker/core/ArithmeticExpression.java |   0
 .../src}/main/java/freemarker/core/Assignment.java |   0
 .../freemarker/core/AssignmentInstruction.java     |   0
 .../main/java/freemarker/core/AttemptBlock.java    |   0
 .../main/java/freemarker/core/AutoEscBlock.java    |   0
 .../BackwardCompatibleTemplateNumberFormat.java    |   0
 .../main/java/freemarker/core/BlockAssignment.java |   0
 .../main/java/freemarker/core/BodyInstruction.java |   0
 .../java/freemarker/core/BooleanExpression.java    |   0
 .../main/java/freemarker/core/BooleanLiteral.java  |   0
 .../java/freemarker/core/BoundedRangeModel.java    |   0
 .../java/freemarker/core/BreakInstruction.java     |   0
 .../freemarker/core/BreakOrContinueException.java  |   0
 .../main/java/freemarker/core/BugException.java    |   0
 .../src}/main/java/freemarker/core/BuiltIn.java    |   0
 .../core/BuiltInBannedWhenAutoEscaping.java        |   0
 .../core/BuiltInBannedWhenForcedAutoEscaping.java  |   0
 .../main/java/freemarker/core/BuiltInForDate.java  |   0
 .../java/freemarker/core/BuiltInForHashEx.java     |   0
 .../freemarker/core/BuiltInForLegacyEscaping.java  |   0
 .../freemarker/core/BuiltInForLoopVariable.java    |   0
 .../freemarker/core/BuiltInForMarkupOutput.java    |   0
 .../main/java/freemarker/core/BuiltInForNode.java  |   0
 .../java/freemarker/core/BuiltInForNodeEx.java     |   0
 .../java/freemarker/core/BuiltInForNumber.java     |   0
 .../java/freemarker/core/BuiltInForSequence.java   |   0
 .../java/freemarker/core/BuiltInForString.java     |   0
 .../core/BuiltInWithDirectCallOptimization.java    |   0
 .../core/BuiltInWithParseTimeParameters.java       |   0
 .../java/freemarker/core/BuiltInsForCallables.java |   0
 .../java/freemarker/core/BuiltInsForDates.java     |   0
 .../core/BuiltInsForExistenceHandling.java         |   0
 .../java/freemarker/core/BuiltInsForHashes.java    |   0
 .../freemarker/core/BuiltInsForLoopVariables.java  |   0
 .../freemarker/core/BuiltInsForMarkupOutputs.java  |   0
 .../freemarker/core/BuiltInsForMultipleTypes.java  |   0
 .../java/freemarker/core/BuiltInsForNodes.java     |   1 -
 .../java/freemarker/core/BuiltInsForNumbers.java   |   0
 .../core/BuiltInsForOutputFormatRelated.java       |   0
 .../java/freemarker/core/BuiltInsForSequences.java |   0
 .../freemarker/core/BuiltInsForStringsBasic.java   |   0
 .../core/BuiltInsForStringsEncoding.java           |   0
 .../freemarker/core/BuiltInsForStringsMisc.java    |   0
 .../freemarker/core/BuiltInsForStringsRegexp.java  |   0
 .../core/BuiltInsWithLazyConditionals.java         |   0
 .../main/java/freemarker/core/BuiltinVariable.java |   0
 .../src}/main/java/freemarker/core/CFormat.java    |   0
 .../main/java/freemarker/core/CSSOutputFormat.java |   0
 .../freemarker/core/CTemplateNumberFormat.java     |   0
 ...CallPlaceCustomDataInitializationException.java |   0
 .../src}/main/java/freemarker/core/Case.java       |   0
 .../freemarker/core/CollectionAndSequence.java     |   0
 .../core/CombinedMarkupOutputFormat.java           |   0
 .../main/java/freemarker/core/CommandLine.java     |   0
 .../src}/main/java/freemarker/core/Comment.java    |   0
 .../freemarker/core/CommonMarkupOutputFormat.java  |   0
 .../core/CommonTemplateMarkupOutputModel.java      |   0
 .../java/freemarker/core/ComparisonExpression.java |   0
 .../main/java/freemarker/core/CompressedBlock.java |   0
 .../java/freemarker/core/ConditionalBlock.java     |   0
 .../main/java/freemarker/core/Configurable.java    |   0
 .../java/freemarker/core/ContinueInstruction.java  |   0
 .../main/java/freemarker/core/CustomAttribute.java |   0
 ...teTimeFormatterBasedTemplateTemporalFormat.java |   0
 .../src}/main/java/freemarker/core/DebugBreak.java |   0
 .../java/freemarker/core/DefaultToExpression.java  |   0
 .../core/DefaultTruncateBuiltinAlgorithm.java      |   0
 .../java/freemarker/core/DirectiveCallPlace.java   |   0
 .../main/java/freemarker/core/DollarVariable.java  |   0
 .../src}/main/java/freemarker/core/Dot.java        |   0
 .../main/java/freemarker/core/DynamicKeyName.java  |   0
 .../src}/main/java/freemarker/core/ElseOfList.java |   0
 .../main/java/freemarker/core/Environment.java     |   1 -
 .../main/java/freemarker/core/EscapeBlock.java     |   0
 .../src}/main/java/freemarker/core/EvalUtil.java   |   0
 .../java/freemarker/core/ExistsExpression.java     |   0
 .../src}/main/java/freemarker/core/Expression.java |   0
 .../freemarker/core/ExpressionWithFixedResult.java |   0
 .../core/ExtendedDecimalFormatParser.java          |   0
 .../java/freemarker/core/FallbackInstruction.java  |   0
 .../java/freemarker/core/FastLRUKeyValueStore.java |   0
 .../java/freemarker/core/FlowControlException.java |   0
 .../java/freemarker/core/FlushInstruction.java     |   0
 .../main/java/freemarker/core/FreeMarkerTree.java  |   0
 .../freemarker/core/GetOptionalTemplateMethod.java |   0
 .../java/freemarker/core/HTMLOutputFormat.java     |   0
 .../main/java/freemarker/core/HashLiteral.java     |   0
 .../main/java/freemarker/core/ICIChainMember.java  |   0
 .../freemarker/core/ISOLikeTemplateDateFormat.java |   1 -
 .../core/ISOLikeTemplateDateFormatFactory.java     |   0
 .../ISOLikeTemplateTemporalTemporalFormat.java     |   0
 .../freemarker/core/ISOTemplateDateFormat.java     |   0
 .../core/ISOTemplateDateFormatFactory.java         |   0
 .../core/ISOTemplateTemporalFormatFactory.java     |   0
 .../src}/main/java/freemarker/core/Identifier.java |   0
 .../src}/main/java/freemarker/core/IfBlock.java    |   0
 .../src}/main/java/freemarker/core/Include.java    |   0
 .../IntermediateStreamOperationLikeBuiltIn.java    |   0
 .../main/java/freemarker/core/Interpolation.java   |   0
 .../src}/main/java/freemarker/core/Interpret.java  |   0
 .../core/InvalidFormatParametersException.java     |   0
 .../core/InvalidFormatStringException.java         |   0
 .../freemarker/core/InvalidReferenceException.java |   0
 .../src}/main/java/freemarker/core/Items.java      |   0
 .../main/java/freemarker/core/IteratorBlock.java   |   0
 .../main/java/freemarker/core/JSONCFormat.java     |   0
 .../java/freemarker/core/JSONOutputFormat.java     |   0
 .../src}/main/java/freemarker/core/JSONParser.java |   0
 .../main/java/freemarker/core/JavaCFormat.java     |   0
 .../java/freemarker/core/JavaScriptCFormat.java    |   0
 .../freemarker/core/JavaScriptOrJSONCFormat.java   |   0
 .../freemarker/core/JavaScriptOutputFormat.java    |   0
 .../freemarker/core/JavaTemplateDateFormat.java    |   0
 .../core/JavaTemplateDateFormatFactory.java        |   0
 .../freemarker/core/JavaTemplateNumberFormat.java  |   0
 .../core/JavaTemplateNumberFormatFactory.java      |   0
 .../core/JavaTemplateTemporalFormat.java           |   0
 .../core/JavaTemplateTemporalFormatFactory.java    |   0
 .../core/LazilyGeneratedCollectionModel.java       |   0
 .../core/LazilyGeneratedCollectionModelEx.java     |   0
 ...neratedCollectionModelWithAlreadyKnownSize.java |   0
 ...GeneratedCollectionModelWithSameSizeCollEx.java |   0
 ...ilyGeneratedCollectionModelWithSameSizeSeq.java |   0
 ...ilyGeneratedCollectionModelWithUnknownSize.java |   0
 .../core/LazyCollectionTemplateModelIterator.java  |   0
 .../java/freemarker/core/LazySequenceIterator.java |   0
 .../main/java/freemarker/core/LegacyCFormat.java   |   0
 .../core/LegacyConstructorParserConfiguration.java |   0
 .../main/java/freemarker/core/LibraryLoad.java     |   0
 .../java/freemarker/core/ListElseContainer.java    |   0
 .../main/java/freemarker/core/ListLiteral.java     |   0
 .../core/ListableRightUnboundedRangeModel.java     |   0
 .../main/java/freemarker/core/LocalContext.java    |   0
 .../java/freemarker/core/LocalContextStack.java    |   0
 .../freemarker/core/LocalLambdaExpression.java     |   0
 .../src}/main/java/freemarker/core/Macro.java      |   0
 .../java/freemarker/core/MarkupOutputFormat.java   |   0
 .../core/MarkupOutputFormatBoundBuiltIn.java       |   0
 .../src}/main/java/freemarker/core/MethodCall.java |   0
 .../src}/main/java/freemarker/core/MiscUtil.java   |   0
 .../core/MissingTimeZoneParserPolicy.java          |   0
 .../main/java/freemarker/core/MixedContent.java    |   0
 .../core/NestedContentNotSupportedException.java   |   0
 .../src}/main/java/freemarker/core/NewBI.java      |   0
 .../main/java/freemarker/core/NoAutoEscBlock.java  |   0
 .../main/java/freemarker/core/NoEscapeBlock.java   |   0
 .../java/freemarker/core/NonBooleanException.java  |   0
 .../java/freemarker/core/NonDateException.java     |   0
 .../freemarker/core/NonExtendedHashException.java  |   0
 .../freemarker/core/NonExtendedNodeException.java  |   0
 .../java/freemarker/core/NonHashException.java     |   0
 .../core/NonListableRightUnboundedRangeModel.java  |   0
 .../freemarker/core/NonMarkupOutputException.java  |   0
 .../java/freemarker/core/NonMethodException.java   |   0
 .../freemarker/core/NonNamespaceException.java     |   0
 .../java/freemarker/core/NonNodeException.java     |   0
 .../freemarker/core/NonNumericalException.java     |   0
 .../java/freemarker/core/NonSequenceException.java |   0
 .../core/NonSequenceOrCollectionException.java     |   0
 .../java/freemarker/core/NonStringException.java   |   0
 .../core/NonStringOrTemplateOutputException.java   |   0
 .../core/NonUserDefinedDirectiveLikeException.java |   0
 .../main/java/freemarker/core/NotExpression.java   |   0
 .../main/java/freemarker/core/NumberLiteral.java   |   0
 .../main/java/freemarker/core/NumericalOutput.java |   0
 .../core/OptInTemplateClassResolver.java           |   0
 .../main/java/freemarker/core/OrExpression.java    |   0
 .../main/java/freemarker/core/OutputFormat.java    |   0
 .../java/freemarker/core/OutputFormatBlock.java    |   0
 .../freemarker/core/OutputFormatBoundBuiltIn.java  |   0
 .../main/java/freemarker/core/ParameterRole.java   |   0
 .../freemarker/core/ParentheticalExpression.java   |   0
 .../main/java/freemarker/core/ParseException.java  |   0
 .../java/freemarker/core/ParserConfiguration.java  |   0
 .../core/ParsingNotSupportedException.java         |   0
 .../freemarker/core/PlainTextOutputFormat.java     |   0
 .../main/java/freemarker/core/PropertySetting.java |   0
 .../main/java/freemarker/core/RTFOutputFormat.java |   0
 .../src}/main/java/freemarker/core/Range.java      |   0
 .../src}/main/java/freemarker/core/RangeModel.java |   0
 .../main/java/freemarker/core/RecoveryBlock.java   |   0
 .../main/java/freemarker/core/RecurseNode.java     |   0
 .../main/java/freemarker/core/RegexpHelper.java    |   0
 .../java/freemarker/core/ReturnInstruction.java    |   0
 .../freemarker/core/RightUnboundedRangeModel.java  |   0
 .../src}/main/java/freemarker/core/Sep.java        |   0
 .../java/freemarker/core/SequenceIterator.java     |   0
 .../core/SingleIterationCollectionModel.java       |   0
 .../main/java/freemarker/core/SpecialBuiltIn.java  |   0
 .../java/freemarker/core/StandardCFormats.java     |   0
 .../main/java/freemarker/core/StopException.java   |   0
 .../main/java/freemarker/core/StopInstruction.java |   0
 .../java/freemarker/core/StringArraySequence.java  |   0
 .../main/java/freemarker/core/StringLiteral.java   |   0
 .../java/freemarker/core/SuppressFBWarnings.java   |  12 +-
 .../main/java/freemarker/core/SwitchBlock.java     |   0
 .../freemarker/core/TemplateClassResolver.java     |   0
 .../core/TemplateCombinedMarkupOutputModel.java    |   0
 .../freemarker/core/TemplateConfiguration.java     |   0
 .../java/freemarker/core/TemplateDateFormat.java   |   0
 .../freemarker/core/TemplateDateFormatFactory.java |   0
 .../main/java/freemarker/core/TemplateElement.java |   0
 .../core/TemplateElementArrayBuilder.java          |   0
 .../freemarker/core/TemplateElementsToVisit.java   |   0
 .../java/freemarker/core/TemplateFormatUtil.java   |   0
 .../freemarker/core/TemplateHTMLOutputModel.java   |   0
 .../freemarker/core/TemplateMarkupOutputModel.java |   0
 .../java/freemarker/core/TemplateNullModel.java    |   0
 .../java/freemarker/core/TemplateNumberFormat.java |   0
 .../core/TemplateNumberFormatFactory.java          |   0
 .../main/java/freemarker/core/TemplateObject.java  |   0
 .../freemarker/core/TemplatePostProcessor.java     |   0
 .../core/TemplatePostProcessorException.java       |   0
 .../freemarker/core/TemplateProcessingTracer.java  |   0
 .../freemarker/core/TemplateRTFOutputModel.java    |   0
 .../freemarker/core/TemplateTemporalFormat.java    |   0
 .../core/TemplateTemporalFormatFactory.java        |   0
 .../java/freemarker/core/TemplateValueFormat.java  |   0
 .../core/TemplateValueFormatException.java         |   0
 .../core/TemplateValueFormatFactory.java           |   0
 .../freemarker/core/TemplateXHTMLOutputModel.java  |   0
 .../freemarker/core/TemplateXMLOutputModel.java    |   0
 .../src}/main/java/freemarker/core/TextBlock.java  |   0
 ...adInterruptionSupportTemplatePostProcessor.java |   0
 .../main/java/freemarker/core/TokenMgrError.java   |   0
 .../main/java/freemarker/core/TransformBlock.java  |   0
 .../main/java/freemarker/core/TrimInstruction.java |   0
 .../freemarker/core/TruncateBuiltinAlgorithm.java  |   0
 .../freemarker/core/UnaryPlusMinusExpression.java  |   0
 .../freemarker/core/UncheckedParseException.java   |   0
 .../core/UndefinedCustomFormatException.java       |   0
 .../freemarker/core/UndefinedOutputFormat.java     |   0
 .../freemarker/core/UnexpectedTypeException.java   |   0
 .../core/UnformattableTemporalTypeException.java   |   0
 .../core/UnformattableValueException.java          |   0
 .../main/java/freemarker/core/UnifiedCall.java     |   1 -
 ...nownDateTypeFormattingUnsupportedException.java |   0
 ...UnknownDateTypeParsingUnsupportedException.java |   0
 .../freemarker/core/UnparsableValueException.java  |   0
 .../core/UnregisteredOutputFormatException.java    |   0
 .../src}/main/java/freemarker/core/VisitNode.java  |   0
 .../java/freemarker/core/XHTMLOutputFormat.java    |   0
 .../main/java/freemarker/core/XMLOutputFormat.java |   0
 .../src}/main/java/freemarker/core/XSCFormat.java  |   0
 .../java/freemarker/core/XSTemplateDateFormat.java |   0
 .../core/XSTemplateDateFormatFactory.java          |   0
 .../core/XSTemplateTemporalFormatFactory.java      |   0
 .../java/freemarker/core/_ArrayEnumeration.java    |   0
 .../main/java/freemarker/core/_ArrayIterator.java  |   0
 .../src}/main/java/freemarker/core/_CoreAPI.java   |   0
 .../java/freemarker/core/_CoreLocaleUtils.java     |   0
 .../java/freemarker/core/_CoreStringUtils.java     |   0
 .../main/java/freemarker/core/_DelayedAOrAn.java   |   0
 .../core/_DelayedConversionToString.java           |   0
 .../core/_DelayedFTLTypeDescription.java           |   0
 .../freemarker/core/_DelayedGetCanonicalForm.java  |   0
 .../java/freemarker/core/_DelayedGetMessage.java   |   0
 .../core/_DelayedGetMessageWithoutStackTop.java    |   0
 .../main/java/freemarker/core/_DelayedJQuote.java  |   0
 .../freemarker/core/_DelayedJoinWithComma.java     |   0
 .../main/java/freemarker/core/_DelayedOrdinal.java |   0
 .../freemarker/core/_DelayedShortClassName.java    |   0
 .../java/freemarker/core/_DelayedToString.java     |   0
 .../freemarker/core/_ErrorDescriptionBuilder.java  |   0
 .../src}/main/java/freemarker/core/_Java16.java    |   0
 .../java/freemarker/core/_JavaTimeBugUtils.java    |   0
 .../main/java/freemarker/core/_JavaVersion.java    |   0
 .../main/java/freemarker/core/_JavaVersions.java   |   0
 .../main/java/freemarker/core/_MarkupBuilder.java  |   0
 .../main/java/freemarker/core/_MessageUtil.java    |   0
 .../freemarker/core/_MiscTemplateException.java    |   0
 .../_ObjectBuilderSettingEvaluationException.java  |   0
 .../core/_ObjectBuilderSettingEvaluator.java       |   0
 .../_ParserConfigurationWithInheritedFormat.java   |   0
 .../core/_SettingEvaluationEnvironment.java        |   0
 .../main/java/freemarker/core/_SortedArraySet.java |   0
 .../freemarker/core/_TemplateModelException.java   |   0
 .../main/java/freemarker/core/_TemporalUtils.java  |   0
 .../java/freemarker/core/_TimeZoneBuilder.java     |   0
 ..._UnexpectedTypeErrorExplainerTemplateModel.java |   0
 .../freemarker/core/_UnmodifiableCompositeSet.java |   0
 .../java/freemarker/core/_UnmodifiableSet.java     |   0
 .../src}/main/java/freemarker/core/package.html    |   0
 .../main/java/freemarker/debug/Breakpoint.java     |   0
 .../main/java/freemarker/debug/DebugModel.java     |   0
 .../java/freemarker/debug/DebuggedEnvironment.java |   0
 .../src}/main/java/freemarker/debug/Debugger.java  |   0
 .../main/java/freemarker/debug/DebuggerClient.java |   0
 .../java/freemarker/debug/DebuggerListener.java    |   0
 .../debug/EnvironmentSuspendedEvent.java           |   0
 .../java/freemarker/debug/impl/DebuggerServer.java |   0
 .../freemarker/debug/impl/DebuggerService.java     |   0
 .../freemarker/debug/impl/RmiDebugModelImpl.java   |   0
 .../debug/impl/RmiDebuggedEnvironmentImpl.java     |   1 -
 .../freemarker/debug/impl/RmiDebuggerImpl.java     |   0
 .../debug/impl/RmiDebuggerListenerImpl.java        |   0
 .../freemarker/debug/impl/RmiDebuggerService.java  |   1 -
 .../freemarker/debug/impl/SuppressFBWarnings.java  |  16 +-
 .../src}/main/java/freemarker/debug/package.html   |   0
 .../main/java/freemarker/ext/beans/APIModel.java   |   0
 .../ext/beans/AllowAllMemberAccessPolicy.java      |   0
 .../java/freemarker/ext/beans/ArgumentTypes.java   |   0
 .../main/java/freemarker/ext/beans/ArrayModel.java |   0
 .../main/java/freemarker/ext/beans/BeanModel.java  |   0
 .../java/freemarker/ext/beans/BeansModelCache.java |   1 -
 .../java/freemarker/ext/beans/BeansWrapper.java    |   0
 .../freemarker/ext/beans/BeansWrapperBuilder.java  |   0
 .../ext/beans/BeansWrapperConfiguration.java       |   0
 .../ext/beans/BeansWrapperSingletonHolder.java     |   0
 .../ext/beans/BlacklistMemberAccessPolicy.java     |   0
 .../java/freemarker/ext/beans/BooleanModel.java    |   0
 .../ext/beans/CallableMemberDescriptor.java        |   0
 .../freemarker/ext/beans/CharacterOrString.java    |   0
 .../ext/beans/ClassBasedModelFactory.java          |   0
 .../freemarker/ext/beans/ClassChangeNotifier.java  |   0
 .../freemarker/ext/beans/ClassIntrospector.java    |   0
 .../ext/beans/ClassIntrospectorBuilder.java        |   0
 .../ext/beans/ClassMemberAccessPolicy.java         |   0
 .../freemarker/ext/beans/CollectionAdapter.java    |   0
 .../java/freemarker/ext/beans/CollectionModel.java |   0
 .../freemarker/ext/beans/ConstructorMatcher.java   |   0
 .../main/java/freemarker/ext/beans/DateModel.java  |   0
 .../ext/beans/DefaultMemberAccessPolicy.java       |   0
 .../ext/beans/EmptyCallableMemberDescriptor.java   |   0
 .../ext/beans/EmptyMemberAndArguments.java         |   0
 .../freemarker/ext/beans/EnumerationModel.java     |   0
 .../ext/beans/ExecutableMemberSignature.java       |   0
 .../ext/beans/FastPropertyDescriptor.java          |   0
 .../java/freemarker/ext/beans/FieldMatcher.java    |   0
 .../java/freemarker/ext/beans/HashAdapter.java     |   0
 .../ext/beans/InvalidPropertyException.java        |   0
 .../java/freemarker/ext/beans/IteratorModel.java   |   0
 .../ext/beans/JRebelClassChangeNotifier.java       |   0
 .../ext/beans/LegacyDefaultMemberAccessPolicy.java |   0
 .../main/java/freemarker/ext/beans/MapModel.java   |   0
 .../beans/MaybeEmptyCallableMemberDescriptor.java  |   0
 .../ext/beans/MaybeEmptyMemberAndArguments.java    |   0
 .../freemarker/ext/beans/MemberAccessPolicy.java   |   0
 .../freemarker/ext/beans/MemberAndArguments.java   |   0
 .../java/freemarker/ext/beans/MemberMatcher.java   |   0
 .../MemberSelectorListMemberAccessPolicy.java      |   0
 .../ext/beans/MethodAppearanceFineTuner.java       |   0
 .../java/freemarker/ext/beans/MethodMatcher.java   |   0
 .../java/freemarker/ext/beans/MethodSorter.java    |   0
 .../beans/NonPrimitiveArrayBackedReadOnlyList.java |   0
 .../java/freemarker/ext/beans/NumberModel.java     |   0
 .../ext/beans/OverloadedFixArgsMethods.java        |   0
 .../freemarker/ext/beans/OverloadedMethods.java    |   0
 .../ext/beans/OverloadedMethodsModel.java          |   0
 .../ext/beans/OverloadedMethodsSubset.java         |   1 -
 .../freemarker/ext/beans/OverloadedNumberUtil.java |   0
 .../ext/beans/OverloadedVarArgsMethods.java        |   0
 .../ext/beans/PrimtiveArrayBackedReadOnlyList.java |   0
 .../beans/ReflectionCallableMemberDescriptor.java  |   0
 .../freemarker/ext/beans/ResourceBundleModel.java  |   0
 .../java/freemarker/ext/beans/SequenceAdapter.java |   0
 .../main/java/freemarker/ext/beans/SetAdapter.java |   0
 .../java/freemarker/ext/beans/SimpleMapModel.java  |   0
 .../java/freemarker/ext/beans/SimpleMethod.java    |   0
 .../freemarker/ext/beans/SimpleMethodModel.java    |   0
 .../freemarker/ext/beans/SingletonCustomizer.java  |   0
 .../java/freemarker/ext/beans/StaticModel.java     |   0
 .../java/freemarker/ext/beans/StaticModels.java    |   0
 .../java/freemarker/ext/beans/StringModel.java     |   0
 .../freemarker/ext/beans/SuppressFBWarnings.java   |  13 +-
 .../freemarker/ext/beans/TemplateAccessible.java   |   0
 .../java/freemarker/ext/beans/TemporalModel.java   |   0
 .../main/java/freemarker/ext/beans/TypeFlags.java  |   0
 .../ext/beans/WhitelistMemberAccessPolicy.java     |   0
 .../main/java/freemarker/ext/beans/_BeansAPI.java  |   0
 .../java/freemarker/ext/beans/_EnumModels.java     |   0
 .../java/freemarker/ext/beans/_MethodUtil.java     |   0
 .../main/java/freemarker/ext/beans/package.html    |   0
 .../src}/main/java/freemarker/ext/dom/AtAtKey.java |   0
 .../freemarker/ext/dom/AttributeNodeModel.java     |   0
 .../freemarker/ext/dom/CharacterDataNodeModel.java |   0
 .../java/freemarker/ext/dom/DocumentModel.java     |   0
 .../java/freemarker/ext/dom/DocumentTypeModel.java |   0
 .../java/freemarker/ext/dom/DomStringUtil.java     |   0
 .../main/java/freemarker/ext/dom/ElementModel.java |   0
 .../java/freemarker/ext/dom/JaxenXPathSupport.java |   0
 .../java/freemarker/ext/dom/NodeListModel.java     |   0
 .../main/java/freemarker/ext/dom/NodeModel.java    |   0
 .../java/freemarker/ext/dom/NodeOutputter.java     |   0
 .../main/java/freemarker/ext/dom/PINodeModel.java  |   0
 .../ext/dom/SunInternalXalanXPathSupport.java      |   0
 .../main/java/freemarker/ext/dom/Transform.java    |   0
 .../main/java/freemarker/ext/dom/XPathSupport.java |   0
 .../java/freemarker/ext/dom/XalanXPathSupport.java |   0
 .../main/java/freemarker/ext/dom/_ExtDomApi.java   |   0
 .../src}/main/java/freemarker/ext/dom/package.html |   0
 .../java/freemarker/ext/jdom/NodeListModel.java    |   0
 .../main/java/freemarker/ext/jdom/package.html     |   0
 .../src}/main/java/freemarker/ext/package.html     |   0
 .../freemarker/ext/rhino/RhinoFunctionModel.java   |   0
 .../freemarker/ext/rhino/RhinoScriptableModel.java |   0
 .../java/freemarker/ext/rhino/RhinoWrapper.java    |   0
 .../main/java/freemarker/ext/rhino/package.html    |   0
 .../java/freemarker/ext/util/IdentityHashMap.java  |   0
 .../main/java/freemarker/ext/util/ModelCache.java  |   0
 .../java/freemarker/ext/util/ModelFactory.java     |   0
 .../freemarker/ext/util/WrapperTemplateModel.java  |   0
 .../main/java/freemarker/ext/util/package.html     |   0
 .../main/java/freemarker/ext/xml/Namespaces.java   |   0
 .../main/java/freemarker/ext/xml/Navigator.java    |   0
 .../java/freemarker/ext/xml/NodeListModel.java     |   0
 .../main/java/freemarker/ext/xml/NodeOperator.java |   0
 .../java/freemarker/ext/xml/_Dom4jNavigator.java   |   0
 .../java/freemarker/ext/xml/_DomNavigator.java     |   0
 .../java/freemarker/ext/xml/_JaxenNamespaces.java  |   0
 .../java/freemarker/ext/xml/_JdomNavigator.java    |   0
 .../src}/main/java/freemarker/ext/xml/package.html |   0
 .../log/CommonsLoggingLoggerFactory.java           |   0
 .../src}/main/java/freemarker/log/Logger.java      |   0
 .../main/java/freemarker/log/LoggerFactory.java    |   0
 .../java/freemarker/log/SLF4JLoggerFactory.java    |   0
 .../java/freemarker/log/_AvalonLoggerFactory.java  |   0
 .../log/_CommonsLoggingLoggerFactory.java          |   0
 .../java/freemarker/log/_JULLoggerFactory.java     |   0
 .../java/freemarker/log/_Log4jLoggerFactory.java   |   0
 .../java/freemarker/log/_Log4jOverSLF4JTester.java |   0
 .../java/freemarker/log/_NullLoggerFactory.java    |   0
 .../java/freemarker/log/_SLF4JLoggerFactory.java   |   0
 .../src}/main/java/freemarker/log/package.html     |   0
 .../freemarker/template/AdapterTemplateModel.java  |   0
 .../template/AttemptExceptionReporter.java         |   0
 .../java/freemarker/template/Configuration.java    |   0
 .../freemarker/template/DefaultArrayAdapter.java   |   0
 .../template/DefaultEnumerationAdapter.java        |   1 -
 .../template/DefaultIterableAdapter.java           |   0
 .../template/DefaultIteratorAdapter.java           |   1 -
 .../freemarker/template/DefaultListAdapter.java    |   0
 .../freemarker/template/DefaultMapAdapter.java     |   0
 .../template/DefaultNonListCollectionAdapter.java  |   0
 .../freemarker/template/DefaultObjectWrapper.java  |   0
 .../template/DefaultObjectWrapperBuilder.java      |   0
 .../DefaultObjectWrapperConfiguration.java         |   0
 .../main/java/freemarker/template/EmptyMap.java    |   0
 .../template/FalseTemplateBooleanModel.java        |   0
 .../freemarker/template/GeneralPurposeNothing.java |   0
 .../IteratorToTemplateModelIteratorAdapter.java    |   0
 .../java/freemarker/template/LocalizedString.java  |   0
 .../template/LoggingAttemptExceptionReporter.java  |   0
 .../template/MalformedTemplateNameException.java   |   0
 .../template/MapKeyValuePairIterator.java          |   0
 .../java/freemarker/template/ObjectWrapper.java    |   1 -
 .../template/ObjectWrapperAndUnwrapper.java        |   0
 .../template/ResourceBundleLocalizedString.java    |   0
 .../template/SerializableTemplateBooleanModel.java |   0
 .../java/freemarker/template/SimpleCollection.java |   0
 .../main/java/freemarker/template/SimpleDate.java  |   0
 .../main/java/freemarker/template/SimpleHash.java  |   0
 .../main/java/freemarker/template/SimpleList.java  |   0
 .../java/freemarker/template/SimpleNumber.java     |   0
 .../freemarker/template/SimpleObjectWrapper.java   |   0
 .../java/freemarker/template/SimpleScalar.java     |   0
 .../java/freemarker/template/SimpleSequence.java   |   0
 .../java/freemarker/template/SimpleTemporal.java   |   0
 .../freemarker/template/SuppressFBWarnings.java    |   9 +-
 .../main/java/freemarker/template/Template.java    |   0
 .../freemarker/template/TemplateBooleanModel.java  |   0
 .../template/TemplateCollectionModel.java          |   0
 .../template/TemplateCollectionModelEx.java        |   0
 .../freemarker/template/TemplateDateModel.java     |   0
 .../freemarker/template/TemplateDirectiveBody.java |   0
 .../template/TemplateDirectiveModel.java           |   0
 .../freemarker/template/TemplateException.java     |   0
 .../template/TemplateExceptionHandler.java         |   0
 .../freemarker/template/TemplateHashModel.java     |   0
 .../freemarker/template/TemplateHashModelEx.java   |   0
 .../freemarker/template/TemplateHashModelEx2.java  |   0
 .../freemarker/template/TemplateMethodModel.java   |   0
 .../freemarker/template/TemplateMethodModelEx.java |   0
 .../java/freemarker/template/TemplateModel.java    |   0
 .../freemarker/template/TemplateModelAdapter.java  |   0
 .../template/TemplateModelException.java           |   0
 .../freemarker/template/TemplateModelIterator.java |   0
 .../template/TemplateModelListSequence.java        |   0
 .../template/TemplateModelWithAPISupport.java      |   0
 .../freemarker/template/TemplateNodeModel.java     |   0
 .../freemarker/template/TemplateNodeModelEx.java   |   0
 .../template/TemplateNotFoundException.java        |   0
 .../freemarker/template/TemplateNumberModel.java   |   0
 .../freemarker/template/TemplateScalarModel.java   |   0
 .../freemarker/template/TemplateSequenceModel.java |   0
 .../freemarker/template/TemplateTemporalModel.java |   0
 .../template/TemplateTransformModel.java           |   0
 .../java/freemarker/template/TransformControl.java |   0
 .../template/TrueTemplateBooleanModel.java         |   0
 .../main/java/freemarker/template/Version.java     |   0
 .../freemarker/template/WrappingTemplateModel.java |   0
 .../java/freemarker/template/_ObjectWrappers.java  |   0
 .../java/freemarker/template/_TemplateAPI.java     |   0
 .../java/freemarker/template/_VersionInts.java     |   0
 .../main/java/freemarker/template/package.html     |   0
 .../freemarker/template/utility/CaptureOutput.java |   0
 .../freemarker/template/utility/ClassUtil.java     |   0
 .../template/utility/CollectionUtils.java          |   0
 .../freemarker/template/utility/Collections12.java |   0
 .../freemarker/template/utility/Constants.java     |   0
 .../freemarker/template/utility/DOMNodeModel.java  |   0
 .../java/freemarker/template/utility/DateUtil.java |   0
 .../freemarker/template/utility/DeepUnwrap.java    |   0
 .../java/freemarker/template/utility/Execute.java  |   0
 .../freemarker/template/utility/HtmlEscape.java    |   0
 .../template/utility/NormalizeNewlines.java        |   0
 .../template/utility/NullArgumentException.java    |   0
 .../freemarker/template/utility/NullWriter.java    |   0
 .../freemarker/template/utility/NumberUtil.java    |   0
 .../template/utility/ObjectConstructor.java        |   0
 .../freemarker/template/utility/ObjectFactory.java |   0
 .../utility/ObjectWrapperWithAPISupport.java       |   0
 .../freemarker/template/utility/OptimizerUtil.java |   0
 .../template/utility/RichObjectWrapper.java        |   0
 .../template/utility/SecurityUtilities.java        |   0
 .../template/utility/StandardCompress.java         |   0
 .../freemarker/template/utility/StringUtil.java    |   0
 .../template/utility/TemplateModelUtils.java       |   0
 .../freemarker/template/utility/ToCanonical.java   |   0
 .../utility/UndeclaredThrowableException.java      |   0
 .../utility/UnrecognizedTimeZoneException.java     |   0
 .../utility/UnsupportedNumberClassException.java   |   0
 .../template/utility/WriteProtectable.java         |   0
 .../freemarker/template/utility/XmlEscape.java     |   0
 .../java/freemarker/template/utility/package.html  |   0
 .../src/main/javacc/freemarker/core}/FTL.jj        |   0
 .../freemarker/adhoc/IdentifierCharGenerator.java  |   0
 .../main/misc/overloadedNumberRules/README.txt     |   0
 .../main/misc/overloadedNumberRules/config.fmpp    |   0
 .../main/misc/overloadedNumberRules/generator.ftl  |   0
 .../main/misc/overloadedNumberRules/prices.ods     | Bin
 .../freemarker/version.properties                  |   0
 .../ext/beans/DefaultMemberAccessPolicy-rules      |   0
 .../freemarker/ext/beans/unsafeMethods.properties  |   0
 .../freemarker/cache/FileTemplateLoaderTest.java   |   0
 .../freemarker/cache/MultiTemplateLoaderTest.java  |   0
 .../java/freemarker/cache/TemplateCacheTest.java   |   0
 .../cache/TemplateConfigurationFactoryTest.java    |   0
 .../freemarker/cache/TemplateNameFormatTest.java   |   0
 .../cache/TemplateSourceMatcherTest.java           |   0
 .../freemarker/core/ASTBasedErrorMessagesTest.java |   0
 .../src}/test/java/freemarker/core/ASTTest.java    |   4 +
 .../core/AbsoluteTemplateNameBITest.java           |   0
 ...oralFormatAbstractCachingInEnvironmentTest.java |   0
 .../core/AbstractTemporalFormatTest.java           |   0
 .../core/AppMetaTemplateDateFormatFactory.java     |   0
 .../freemarker/core/ArgsSpecialVariableTest.java   |   0
 .../java/freemarker/core/ArithmeticEngineTest.java |   0
 .../java/freemarker/core/AttemptLoggingTest.java   |   0
 .../core/BaseNTemplateNumberFormatFactory.java     |   0
 .../core/BooleanFormatEnvironmentCachingTest.java  |   0
 .../core/BreakAndContinuePlacementTest.java        |   0
 .../java/freemarker/core/CAndCnBuiltInTest.java    |   0
 .../java/freemarker/core/CFormatTemplateTest.java  |   0
 .../freemarker/core/CTemplateNumberFormatTest.java |   0
 .../freemarker/core/CallerTemplateNameTest.java    |   0
 .../test/java/freemarker/core/CamelCaseTest.java   |   0
 .../java/freemarker/core/CanonicalFormTest.java    |   4 +
 .../freemarker/core/CapturingAssignmentTest.java   |   0
 .../freemarker/core/CoercionToTextualTest.java     |   0
 .../core/CombinedMarkupOutputFormatTest.java       |   0
 .../freemarker/core/ConcatenatedSequenceTest.java  |   0
 .../java/freemarker/core/ConfigurableTest.java     |   0
 .../java/freemarker/core/CoreLocaleUtilsTest.java  |   0
 .../test/java/freemarker/core/CustomCFormat.java   |   0
 .../freemarker/core/CustomHTMLOutputFormat.java    |   0
 .../freemarker/core/CustomTemplateHTMLModel.java   |   0
 .../core/CustomTemplateTemporalFormatTest.java     |   0
 .../test/java/freemarker/core/DateFormatTest.java  |   0
 .../core/DefaultTruncateBuiltinAlgorithmTest.java  |   0
 .../freemarker/core/DirectiveCallPlaceTest.java    |   0
 .../java/freemarker/core/DummyOutputFormat.java    |   0
 .../java/freemarker/core/EncodingOverrideTest.java |   0
 .../java/freemarker/core/EndTagSyntaxTest.java     |   0
 .../core/EnvironmentCustomStateTest.java           |   0
 .../core/EnvironmentGetTemplateVariantsTest.java   |   0
 .../EpochMillisDivTemplateDateFormatFactory.java   |   0
 ...pochMillisDivTemplateTemporalFormatFactory.java |   0
 .../core/EpochMillisTemplateDateFormatFactory.java |   0
 .../EpochMillisTemplateTemporalFormatFactory.java  |   0
 .../java/freemarker/core/EvalJsonBuiltInTest.java  |   0
 .../freemarker/core/ExtendedDecimalFormatTest.java |   0
 .../test/java/freemarker/core/FilterBiTest.java    |   0
 ...ormatCacheMemoryLeakPreventionFlushingTest.java |   0
 .../freemarker/core/GetOptionalTemplateTest.java   |   0
 .../core/HTMLISOTemplateDateFormatFactory.java     |   0
 .../core/HTMLISOTemplateTemporalFormatFactory.java |   0
 .../java/freemarker/core/HTMLOutputFormatTest.java |   0
 .../java/freemarker/core/HeaderParsingTest.java    |   0
 .../core/HexTemplateNumberFormatFactory.java       |   0
 .../core/ISOLikeTemplateTemporalFormatTest.java    |   0
 .../IncludeAndImportConfigurableLayersTest.java    |   0
 .../java/freemarker/core/IncludeAndImportTest.java |   0
 .../freemarker/core/InterpolationSyntaxTest.java   |   0
 .../core/InterpretAndEvalTemplateNameTest.java     |   0
 .../core/InterpretSettingInheritanceTest.java      |   0
 .../java/freemarker/core/IteratorIssuesTest.java   |   0
 .../test/java/freemarker/core/JSONParserTest.java  |   0
 .../core/JavaTemplateTemporalFormatTest.java       |   0
 .../java/freemarker/core/LambdaParsingTest.java    |   0
 .../java/freemarker/core/LamdaAndEscapeTest.java   |   0
 .../core/LazilyGeneratedCollectionTest.java        |   0
 .../core/LegacyFMParserConstructorsTest.java       |   0
 .../freemarker/core/ListBreakContinueTest.java     |   0
 .../test/java/freemarker/core/ListErrorsTest.java  |   0
 .../core/ListWithStreamLikeBuiltinsTest.java       |   0
 ...LocAndTZSensitiveTemplateDateFormatFactory.java |   0
 ...ndTZSensitiveTemplateTemporalFormatFactory.java |   0
 ...LocaleSensitiveTemplateNumberFormatFactory.java |   0
 .../src}/test/java/freemarker/core/MapBiTest.java  |   0
 .../test/java/freemarker/core/MinMaxBITest.java    |   0
 .../freemarker/core/MiscErrorMessagesTest.java     |   0
 .../java/freemarker/core/NullTransparencyTest.java |   0
 .../test/java/freemarker/core/NumberBiTest.java    |   0
 .../java/freemarker/core/NumberFormatTest.java     |   0
 .../core/OptInTemplateClassResolverTest.java       |   4 +
 .../java/freemarker/core/OutputFormatTest.java     |   0
 .../ParseTimeParameterBIErrorMessagesTest.java     |   0
 .../freemarker/core/ParsingErrorMessagesTest.java  |   0
 .../core/PrintfGTemplateNumberFormatFactory.java   |   0
 .../java/freemarker/core/RTFOutputFormatTest.java  |   0
 .../test/java/freemarker/core/SQLTimeZoneTest.java |   0
 .../freemarker/core/SeldomEscapedOutputFormat.java |   0
 .../java/freemarker/core/SequenceBuiltInTest.java  |   0
 .../java/freemarker/core/SettingDirectiveTest.java |   0
 .../java/freemarker/core/SpecialVariableTest.java  |   0
 .../core/StringLiteralInterpolationTest.java       |   0
 .../test/java/freemarker/core/TabSizeTest.java     |   0
 .../freemarker/core/TagSyntaxVariationsTest.java   |   4 +
 .../core/TakeWhileAndDropWhileBiTest.java          |   0
 .../freemarker/core/TemplatGetEncodingTest.java    |   0
 .../freemarker/core/TemplateConfigurationTest.java |   0
 ...TemplateConfigurationWithTemplateCacheTest.java |   0
 .../freemarker/core/TemplateDummyOutputModel.java  |   0
 .../freemarker/core/TemplateLevelSettings.java     |   0
 .../core/TemplateNameSpecialVariablesTest.java     |   0
 .../core/TemplateProcessingTracerTest.java         |   0
 .../core/TemplateSeldomEscapedOutputModel.java     |   0
 ...rmatByFormatStringCachingInEnvironmentTest.java |   0
 ...poralFormatCurrentCachingInEnvironmentTest.java |   0
 .../core/TemplateTransformModelTest.java           |   0
 .../freemarker/core/TemporalErrorMessagesTest.java |   0
 .../core/ThreadInterruptingSupportTest.java        |   0
 .../java/freemarker/core/TruncateBuiltInTest.java  |   0
 .../freemarker/core/TypeErrorMessagesTest.java     |   0
 .../core/UncheckedExceptionHandlingTest.java       |   0
 .../java/freemarker/core/UnclosedCommentTest.java  |   0
 .../freemarker/core/WhitespaceStrippingTest.java   |   0
 .../java/freemarker/core/WithArgsBuiltInTest.java  |   0
 .../freemarker/core/XHTMLOutputFormatTest.java     |   0
 .../java/freemarker/core/XMLOutputFormatTest.java  |   0
 .../java/freemarker/core/_TemporalUtilsTest.java   |   0
 .../beans/AbstractParallelIntrospectionTest.java   |   4 +
 .../ext/beans/BeansAPINewInstanceTest.java         |   4 +
 .../freemarker/ext/beans/BeansWrapperBasics.java   |   0
 .../ext/beans/BeansWrapperCachesTest.java          |   0
 .../freemarker/ext/beans/BeansWrapperMiscTest.java |   0
 .../ext/beans/BeansWrapperReadOnlyTest.java        |   4 +
 .../ext/beans/BeansWrapperSingletonsTest.java      |   4 +
 .../freemarker/ext/beans/BridgeMethodsBean.java    |   0
 .../ext/beans/BridgeMethodsBeanBase.java           |   0
 .../CommonSupertypeForUnwrappingHintTest.java      |   4 +
 .../ext/beans/DefaultMemberAccessPolicyTest.java   |   0
 ...DefaultObjectWrapperMemberAccessPolicyTest.java |   0
 .../java/freemarker/ext/beans/EnumModelsTest.java  |   0
 .../freemarker/ext/beans/ErrorMessagesTest.java    |   0
 .../ext/beans/FineTuneMethodAppearanceTest.java    |   0
 .../GetPropertyNameFromReaderMethodNameTest.java   |   0
 .../beans/GetlessMethodsAsPropertyGettersRule.java |   0
 .../freemarker/ext/beans/IsApplicableTest.java     |   4 +
 .../ext/beans/IsMoreSpecificParameterTypeTest.java |   4 +
 .../beans/Java8BeansWrapperBridgeMethodsTest.java  |   0
 .../ext/beans/Java8BeansWrapperTest.java           |   0
 .../Java8BridgeMethodsWithDefaultMethodBean.java   |   0
 .../Java8BridgeMethodsWithDefaultMethodBean2.java  |   0
 ...ava8BridgeMethodsWithDefaultMethodBeanBase.java |   0
 ...va8BridgeMethodsWithDefaultMethodBeanBase2.java |   0
 .../ext/beans/Java8DefaultMethodsBean.java         |   0
 .../ext/beans/Java8DefaultMethodsBeanBase.java     |   0
 .../beans/Java9InstrospectorBugWorkaroundTest.java |   0
 .../beans/LegacyDefaultMemberAccessPolicyTest.java |   0
 .../ext/beans/ManyObjectsOfDifferentClasses.java   |   0
 .../ext/beans/ManyStaticsOfDifferentClasses.java   |   0
 .../ext/beans/MemberAccessMonitoringTest.java      |   0
 .../MemberSelectorListMemberAccessPolicyTest.java  |   0
 .../freemarker/ext/beans/MethodMatcherTest.java    |   0
 .../java/freemarker/ext/beans/MethodUtilTest.java  |   0
 .../java/freemarker/ext/beans/MethodUtilTest2.java |   0
 .../ext/beans/MiscNumericalOperationsTest.java     |   3 +
 .../java/freemarker/ext/beans/ModelCacheTest.java  |   0
 .../ext/beans/OverloadedNumberUtilTest.java        |   4 +
 .../ext/beans/ParameterListPreferabilityTest.java  |   4 +
 .../ext/beans/PrallelObjectIntrospectionTest.java  |   0
 .../ext/beans/PrallelStaticIntrospectionTest.java  |   0
 .../freemarker/ext/beans/StaticModelsTest.java     |   0
 .../java/freemarker/ext/beans/TypeFlagsTest.java   |   4 +
 .../ext/dom/DOMConvenienceStaticsTest.java         |   0
 .../java/freemarker/ext/dom/DOMSiblingTest.java    |   0
 .../src}/test/java/freemarker/ext/dom/DOMTest.java |   0
 .../manual/AbsoluteTemplateNameBIExample.java      |   0
 .../freemarker/manual/AutoEscapingExample.java     |   0
 .../manual/ConfigureOutputFormatExamples.java      |   0
 .../freemarker/manual/CustomFormatsExample.java    |   0
 .../test/java/freemarker/manual/ExamplesTest.java  |   0
 .../freemarker/manual/GettingStartedExample.java   |   0
 .../src}/test/java/freemarker/manual/Product.java  |   0
 .../manual/TemplateConfigurationExamples.java      |   0
 .../UnitAwareTemplateNumberFormatFactory.java      |   0
 .../manual/UnitAwareTemplateNumberModel.java       |   0
 .../java/freemarker/manual/WithArgsExamples.java   |   0
 .../freemarker/manual/WithArgsLastExamples.java    |   0
 .../template/ActualNamingConvetionTest.java        |   0
 .../freemarker/template/ActualTagSyntaxTest.java   |   0
 .../freemarker/template/ConfigurationTest.java     |   3 +
 .../freemarker/template/CustomAttributeTest.java   |   0
 .../java/freemarker/template/ExceptionTest.java    |   5 +
 .../java/freemarker/template/GetSourceTest.java    |   0
 .../template/IncudeFromNamelessTest.java           |   4 +
 .../template/JavaCCExceptionAsEOFFixTest.java      |   0
 .../template/MistakenlyPublicImportAPIsTest.java   |   0
 .../template/MistakenlyPublicMacroAPIsTest.java    |   0
 .../freemarker/template/NullConfigurationTest.java |   0
 .../template/StaticObjectWrappersTest.java         |   0
 .../template/TemplateConstructorsTest.java         |   0
 .../template/TemplateLanguageVersionTest.java      |   0
 .../template/TemplateLookupStrategyTest.java       |   0
 .../test/java/freemarker/template/VersionTest.java |   0
 .../freemarker/template/utility/ConstantsTest.java |   0
 .../freemarker/template/utility/DateUtilTest.java  |   4 +
 .../utility/DateUtilsPatternParsingTest.java       |   0
 .../template/utility/DeepUnwrapTest.java           |   0
 .../template/utility/NumberUtilTest.java           |   3 +
 .../template/utility/StringUtilTest.java           |   0
 .../template/utility/TemplateModelUtilTest.java    |   0
 .../freemarker/test/MonitoredTemplateLoader.java   |   0
 .../test/RuntimeEnvironmentReporterTest.java       |   0
 .../test/java/freemarker/test/TemplateTest.java    |   4 +-
 .../src}/test/java/freemarker/test/TreeView.java   |   0
 .../src}/test/resources/freemarker/cache/test.ftl  |   0
 .../src}/test/resources/freemarker/core/ast-1.ast  |   0
 .../src}/test/resources/freemarker/core/ast-1.ftl  |   0
 .../resources/freemarker/core/ast-assignments.ast  |   0
 .../resources/freemarker/core/ast-assignments.ftl  |   0
 .../resources/freemarker/core/ast-builtins.ast     |   0
 .../resources/freemarker/core/ast-builtins.ftl     |   0
 .../test/resources/freemarker/core/ast-lambda.ast  |   0
 .../test/resources/freemarker/core/ast-lambda.ftl  |   0
 .../resources/freemarker/core/ast-locations.ast    |   0
 .../resources/freemarker/core/ast-locations.ftl    |   0
 .../core/ast-mixedcontentsimplifications.ast       |   0
 .../core/ast-mixedcontentsimplifications.ftl       |   0
 .../core/ast-multipleignoredchildren.ast           |   0
 .../core/ast-multipleignoredchildren.ftl           |   0
 .../freemarker/core/ast-nestedignoredchildren.ast  |   0
 .../freemarker/core/ast-nestedignoredchildren.ftl  |   0
 .../test/resources/freemarker/core/ast-range.ast   |   0
 .../test/resources/freemarker/core/ast-range.ftl   |   0
 .../freemarker/core/ast-strlitinterpolation.ast    |   0
 .../freemarker/core/ast-strlitinterpolation.ftl    |   0
 .../freemarker/core/ast-whitespacestripping.ast    |   0
 .../freemarker/core/ast-whitespacestripping.ftl    |   0
 .../resources/freemarker/core/cano-assignments.ftl |   0
 .../freemarker/core/cano-assignments.ftl.out       |   0
 .../resources/freemarker/core/cano-builtins.ftl    |   0
 .../freemarker/core/cano-builtins.ftl.out          |   0
 .../freemarker/core/cano-identifier-escaping.ftl   |   0
 .../core/cano-identifier-escaping.ftl.out          |   0
 .../test/resources/freemarker/core/cano-macros.ftl |   0
 .../resources/freemarker/core/cano-macros.ftl.out  |   0
 .../freemarker/core/cano-strlitinterpolation.ftl   |   0
 .../core/cano-strlitinterpolation.ftl.out          |   0
 .../core/encodingOverride-ISO-8859-1.ftl           |   0
 .../freemarker/core/encodingOverride-UTF-8.ftl     |   0
 .../freemarker/ext/dom/DOMSiblingTest.xml          |   0
 .../manual/AbsoluteTemplateNameBIExample-foo.ftl   |   0
 .../manual/AbsoluteTemplateNameBIExample-lib.ftl   |   0
 .../manual/AutoEscapingExample-capture.ftlh        |   0
 .../manual/AutoEscapingExample-capture.ftlh.out    |   0
 .../manual/AutoEscapingExample-convert.ftlh        |   0
 .../manual/AutoEscapingExample-convert.ftlh.out    |   0
 .../manual/AutoEscapingExample-convert2.ftl        |   0
 .../manual/AutoEscapingExample-convert2.ftl.out    |   0
 .../manual/AutoEscapingExample-infoBox.ftlh        |   0
 .../manual/AutoEscapingExample-infoBox.ftlh.out    |   0
 .../manual/AutoEscapingExample-markup.ftlh         |   0
 .../manual/AutoEscapingExample-markup.ftlh.out     |   0
 .../manual/AutoEscapingExample-stringConcat.ftlh   |   0
 .../AutoEscapingExample-stringConcat.ftlh.out      |   0
 .../manual/AutoEscapingExample-stringLiteral.ftlh  |   0
 .../AutoEscapingExample-stringLiteral.ftlh.out     |   0
 .../manual/AutoEscapingExample-stringLiteral2.ftlh |   0
 .../AutoEscapingExample-stringLiteral2.ftlh.out    |   0
 .../ConfigureOutputFormatExamples1.properties      |   0
 .../ConfigureOutputFormatExamples2.properties      |   0
 .../manual/CustomFormatsExample-alias1.ftlh        |   0
 .../manual/CustomFormatsExample-alias1.ftlh.out    |   0
 .../manual/CustomFormatsExample-alias2.ftlh        |   0
 .../manual/CustomFormatsExample-alias2.ftlh.out    |   0
 .../manual/CustomFormatsExample-modelAware.ftlh    |   0
 .../CustomFormatsExample-modelAware.ftlh.out       |   0
 .../TemplateConfigurationExamples1.properties      |   0
 .../TemplateConfigurationExamples2.properties      |   0
 .../TemplateConfigurationExamples3.properties      |   0
 ...thArgsExamples-usingWithArgsSpecialVariable.ftl |   0
 ...gsExamples-usingWithArgsSpecialVariable.ftl.out |   0
 .../freemarker/manual/WithArgsLastExamples.ftl     |   0
 .../freemarker/manual/WithArgsLastExamples.ftl.out |   0
 .../dir/AbsoluteTemplateNameBIExample-foo.ftl      |   0
 .../dir/AbsoluteTemplateNameBIExample-main.ftl     |   0
 .../dir/AbsoluteTemplateNameBIExample-main.ftl.out |   0
 .../test/resources/freemarker/manual/test.ftlh     |   0
 .../resources/freemarker/template/toCache1.ftl     |   0
 .../resources/freemarker/template/toCache2.ftl     |   0
 .../main/java/freemarker/core/_Java16Impl.java     |   0
 .../freemarker/cache/WebappTemplateLoader.java     |   0
 .../ext/jsp/CustomTagAndELFunctionCombiner.java    |   0
 .../java/freemarker/ext/jsp/EventForwarding.java   |   0
 .../freemarker/ext/jsp/FreeMarkerJspFactory.java   |   0
 .../freemarker/ext/jsp/FreeMarkerJspFactory2.java  |   0
 .../freemarker/ext/jsp/FreeMarkerPageContext.java  |   0
 .../java/freemarker/ext/jsp/FreemarkerTag.java     |   0
 .../java/freemarker/ext/jsp/JspContextModel.java   |   0
 .../java/freemarker/ext/jsp/JspTagModelBase.java   |   0
 .../java/freemarker/ext/jsp/JspWriterAdapter.java  |   0
 .../freemarker/ext/jsp/PageContextFactory.java     |   0
 .../ext/jsp/SimpleTagDirectiveModel.java           |   0
 .../java/freemarker/ext/jsp/TagTransformModel.java |   0
 .../java/freemarker/ext/jsp/TaglibFactory.java     |   0
 .../java/freemarker/ext/jsp/TaglibMethodUtil.java  |   0
 .../ext/jsp/_FreeMarkerPageContext2.java           |   0
 .../src}/main/java/freemarker/ext/jsp/package.html |   0
 .../ext/servlet/AllHttpScopesHashModel.java        |   0
 .../freemarker/ext/servlet/FreemarkerServlet.java  |   1 -
 .../ext/servlet/HttpRequestHashModel.java          |   0
 .../servlet/HttpRequestParametersHashModel.java    |   0
 .../ext/servlet/HttpSessionHashModel.java          |   0
 .../java/freemarker/ext/servlet/IncludePage.java   |   0
 .../freemarker/ext/servlet/InitParamParser.java    |   0
 .../ext/servlet/ServletContextHashModel.java       |   0
 .../freemarker/ext/servlet/SuppressFBWarnings.java |  16 +-
 .../main/java/freemarker/ext/servlet/package.html  |   0
 .../ext/jsp/FreeMarkerJspApplicationContext.java   |   0
 .../freemarker/ext/jsp/FreeMarkerJspFactory21.java |   0
 .../ext/jsp/_FreeMarkerPageContext21.java          |   0
 .../ext/jsp/JspTestFreemarkerServlet.java          |   0
 ...spTestFreemarkerServletWithDefaultOverride.java |   0
 .../ext/jsp/RealServletContainertTest.java         |   0
 .../java/freemarker/ext/jsp/TLDParsingTest.java    |   0
 .../freemarker/ext/jsp/TaglibMethodUtilTest.java   |   0
 .../jsp/taglibmembers/AttributeAccessorTag.java    |   0
 .../ext/jsp/taglibmembers/AttributeInfoTag.java    |   0
 .../ext/jsp/taglibmembers/EnclosingClass.java      |   0
 .../ext/jsp/taglibmembers/GetAndSetTag.java        |   0
 .../ext/jsp/taglibmembers/TestFunctions.java       |   0
 .../ext/jsp/taglibmembers/TestSimpleTag.java       |   0
 .../ext/jsp/taglibmembers/TestSimpleTag2.java      |   0
 .../ext/jsp/taglibmembers/TestSimpleTag3.java      |   0
 .../freemarker/ext/jsp/taglibmembers/TestTag.java  |   0
 .../freemarker/ext/jsp/taglibmembers/TestTag2.java |   0
 .../freemarker/ext/jsp/taglibmembers/TestTag3.java |   0
 .../config/WebappLocalFreemarkerServlet.java       |   0
 .../ext/servlet/FreemarkerServletTest.java         |   0
 .../ext/servlet/InitParamParserTest.java           |   0
 .../freemarker/template/MockServletContext.java    |   0
 .../template/TemplateNotFoundMessageTest.java      |   0
 .../test/servlet/DefaultModel2TesterAction.java    |   0
 .../java/freemarker/test/servlet/Model2Action.java |   0
 .../test/servlet/Model2TesterServlet.java          |   0
 .../freemarker/test/servlet/WebAppTestCase.java    |   0
 .../META-INF/tldDiscovery MetaInfTldSources-1.tld  |   0
 .../freemarker/ext/jsp/TLDParsingTest.tld          |   0
 .../ext/jsp/templates/classpath-test.ftl           |   0
 .../ext/jsp/tldDiscovery-ClassPathTlds-1.tld       |   0
 .../ext/jsp/tldDiscovery-ClassPathTlds-2.tld       |   0
 .../freemarker/ext/jsp/webapps/basic/CONTENTS.txt  |   0
 .../basic/WEB-INF/el-function-tag-name-clash.tld   |   0
 .../ext/jsp/webapps/basic/WEB-INF/el-functions.tld |   0
 .../basic/WEB-INF/expected/attributes-2.3.0.txt    |   0
 .../WEB-INF/expected/attributes-2.3.22-future.txt  |   0
 .../webapps/basic/WEB-INF/expected/attributes.txt  |   0
 .../webapps/basic/WEB-INF/expected/customTags1.txt |   0
 .../ext/jsp/webapps/basic/WEB-INF/test.tld         |   0
 .../ext/jsp/webapps/basic/WEB-INF/web.xml          |   0
 .../ext/jsp/webapps/basic/attributes.ftl           |   0
 .../ext/jsp/webapps/basic/customELFunctions1.ftl   |   0
 .../ext/jsp/webapps/basic/customELFunctions1.jsp   |   0
 .../ext/jsp/webapps/basic/customTags1.ftl          |   0
 .../jsp/webapps/basic/elFunctionsTagNameClash.ftl  |   0
 .../jsp/webapps/basic/elFunctionsTagNameClash.jsp  |   0
 .../ext/jsp/webapps/basic/[email protected] |   0
 .../freemarker/ext/jsp/webapps/basic/trivial.ftl   |   0
 .../freemarker/ext/jsp/webapps/basic/trivial.jsp   |   0
 .../freemarker/ext/jsp/webapps/config/CONTENTS.txt |   0
 .../webapps/config/WEB-INF/classes/sub/test.ftl    |   0
 .../jsp/webapps/config/WEB-INF/classes/test.ftl    |   0
 .../config/WEB-INF/lib/templates.jar/sub/test2.ftl |   0
 .../jsp/webapps/config/WEB-INF/templates/test.ftl  |   0
 .../ext/jsp/webapps/config/WEB-INF/web.xml         |   0
 .../freemarker/ext/jsp/webapps/config/test.ftl     |   0
 .../freemarker/ext/jsp/webapps/errors/CONTENTS.txt |   0
 .../ext/jsp/webapps/errors/WEB-INF/web.xml         |   0
 .../ext/jsp/webapps/errors/failing-parsetime.ftlnv |   0
 .../ext/jsp/webapps/errors/failing-parsetime.jsp   |   0
 .../ext/jsp/webapps/errors/failing-runtime.ftl     |   0
 .../ext/jsp/webapps/errors/failing-runtime.jsp     |   0
 .../ext/jsp/webapps/errors/not-failing.ftl         |   0
 .../ext/jsp/webapps/multipleLoaders/CONTENTS.txt   |   0
 .../multipleLoaders/WEB-INF/templates/test.ftl     |   0
 .../jsp/webapps/multipleLoaders/WEB-INF/web.xml    |   0
 .../ext/jsp/webapps/tldDiscovery/CONTENTS.txt      |   0
 .../WEB-INF/expected/subdir/test-rel.txt           |   0
 .../WEB-INF/expected/test-noClasspath.txt          |   0
 .../tldDiscovery/WEB-INF/expected/test1.txt        |   0
 .../webapps/tldDiscovery/WEB-INF/fmtesttag 2.tld   |   0
 .../webapps/tldDiscovery/WEB-INF/fmtesttag4.tld    |   0
 .../lib/taglib-foo.jar/META-INF/foo bar.tld        |   0
 .../WEB-INF/subdir-with-tld/fmtesttag3.tld         |   0
 .../WEB-INF/taglib 2.jar/META-INF/taglib.tld       |   0
 .../ext/jsp/webapps/tldDiscovery/WEB-INF/web.xml   |   0
 .../tldDiscovery/not-auto-scanned/fmtesttag.tld    |   0
 .../jsp/webapps/tldDiscovery/subdir/test-rel.ftl   |   0
 .../jsp/webapps/tldDiscovery/test-noClasspath.ftl  |   0
 .../ext/jsp/webapps/tldDiscovery/test1.ftl         |   0
 .../resources}/freemarker/test/servlet/web.xml     |   0
 .../java/freemarker/ext/ant/FreemarkerXmlTask.java |   0
 .../java/freemarker/ext/ant/JythonAntTask.java     |   0
 .../ext/ant/UnlinkedJythonOperations.java          |   0
 .../ext/ant/UnlinkedJythonOperationsImpl.java      |   0
 .../src}/main/java/freemarker/ext/ant/package.html |   0
 .../freemarker/ext/jython/JythonHashModel.java     |   0
 .../java/freemarker/ext/jython/JythonModel.java    |   0
 .../freemarker/ext/jython/JythonModelCache.java    |   0
 .../freemarker/ext/jython/JythonNumberModel.java   |   0
 .../freemarker/ext/jython/JythonSequenceModel.java |   0
 .../ext/jython/JythonVersionAdapter.java           |   0
 .../ext/jython/JythonVersionAdapterHolder.java     |   0
 .../java/freemarker/ext/jython/JythonWrapper.java  |   0
 .../ext/jython/_Jython20And21VersionAdapter.java   |   0
 .../main/java/freemarker/ext/jython/package.html   |   0
 .../freemarker/template/utility/JythonRuntime.java |   0
 .../ext/jython/_Jython22VersionAdapter.java        |   0
 .../ext/jython/_Jython25VersionAdapter.java        |   0
 .../freemarker/core/ObjectBuilderSettingsTest.java |   0
 .../freemarker/core/subpkg/PackageVisibleAll.java  |   0
 .../core/subpkg/PackageVisibleAllWithBuilder.java  |   0
 .../PackageVisibleAllWithBuilderBuilder.java       |   0
 .../PackageVisibleWithPublicConstructor.java       |   0
 .../java/freemarker/core/subpkg/PublicAll.java     |   0
 .../core/subpkg/PublicWithMixedConstructors.java   |   0
 .../PublicWithPackageVisibleConstructor.java       |   0
 .../template/DefaultObjectWrapperTest.java         |   0
 .../template/SimpleObjectWrapperTest.java          |   0
 .../test/templatesuite/TemplateTestCase.java       |   0
 .../test/templatesuite/TemplateTestSuite.java      |   3 +
 .../freemarker/test/templatesuite/package.html     |   0
 .../test/templatesuite/expected/arithmetic.txt     |   0
 .../test/templatesuite/expected/bean-maps.txt      |   0
 .../test/templatesuite/expected/beans.txt          |   0
 .../templatesuite/expected/boolean-formatting.txt  |   0
 .../test/templatesuite/expected/boolean.txt        |   0
 .../templatesuite/expected/charset-in-header.txt   |   0
 .../templatesuite/expected/classic-compatible.txt  |   0
 .../test/templatesuite/expected/comment.txt        |   0
 .../test/templatesuite/expected/comparisons.txt    |   0
 .../test/templatesuite/expected/compress.txt       |   0
 .../templatesuite/expected/dateformat-java.txt     |   0
 .../test/templatesuite/expected/default-xmlns.txt  |   0
 .../test/templatesuite/expected/default.txt        |   0
 .../expected/encoding-builtins-ici-2.3.20.txt      |   0
 .../templatesuite/expected/encoding-builtins.txt   |   0
 .../test/templatesuite/expected/escapes.txt        |   0
 .../test/templatesuite/expected/exception.txt      |   0
 .../test/templatesuite/expected/exception2.txt     |   0
 .../test/templatesuite/expected/exception3.txt     |   0
 .../test/templatesuite/expected/exthash.txt        |   0
 .../test/templatesuite/expected/hashconcat.txt     |   0
 .../test/templatesuite/expected/hashliteral.txt    |   0
 .../test/templatesuite/expected/helloworld.txt     |   0
 .../templatesuite/expected/identifier-escaping.txt |   0
 .../expected/identifier-non-ascii.txt              |   0
 .../freemarker/test/templatesuite/expected/if.txt  |   0
 .../test/templatesuite/expected/import.txt         |   0
 .../test/templatesuite/expected/include.txt        |   0
 .../test/templatesuite/expected/include2.txt       |   0
 .../test/templatesuite/expected/interpret.txt      |   0
 .../test/templatesuite/expected/iterators.txt      |   0
 .../test/templatesuite/expected/lastcharacter.txt  |   0
 .../test/templatesuite/expected/list-bis.txt       |   0
 .../test/templatesuite/expected/list.txt           |   0
 .../test/templatesuite/expected/list2.txt          |   0
 .../test/templatesuite/expected/list3.txt          |   0
 .../test/templatesuite/expected/listhash.txt       |   0
 .../expected/listhashliteral-ici-2.3.20.txt        |   0
 .../expected/listhashliteral-ici-2.3.21.txt        |   0
 .../test/templatesuite/expected/listliteral.txt    |   0
 .../test/templatesuite/expected/localization.txt   |   0
 .../test/templatesuite/expected/logging.txt        |   0
 .../test/templatesuite/expected/loopvariable.txt   |   0
 .../test/templatesuite/expected/macros-return.txt  |   0
 .../test/templatesuite/expected/macros.txt         |   0
 .../test/templatesuite/expected/macros2.txt        |   0
 .../test/templatesuite/expected/multimodels.txt    |   0
 .../test/templatesuite/expected/nested.txt         |   0
 .../templatesuite/expected/new-allowsnothing.txt   |   0
 .../templatesuite/expected/new-defaultresolver.txt |   0
 .../test/templatesuite/expected/new-optin.txt      |   0
 .../test/templatesuite/expected/new-safer.txt      |   0
 .../templatesuite/expected/new-unrestricted.txt    |   0
 .../test/templatesuite/expected/newlines1.txt      |   0
 .../test/templatesuite/expected/newlines2.txt      |   0
 .../templatesuite/expected/non-strict-syntax.txt   |   0
 .../test/templatesuite/expected/noparse.txt        |   0
 .../test/templatesuite/expected/number-format.txt  |   0
 .../test/templatesuite/expected/number-literal.txt |   0
 .../test/templatesuite/expected/number-to-date.txt |   0
 .../test/templatesuite/expected/numerical-cast.txt |   0
 .../templatesuite/expected/output-encoding1.txt    |   0
 .../templatesuite/expected/output-encoding2.txt    | Bin
 .../templatesuite/expected/output-encoding3.txt    |   0
 .../test/templatesuite/expected/precedence.txt     |   0
 .../test/templatesuite/expected/recover.txt        |   0
 .../test/templatesuite/expected/root.txt           |   0
 .../templatesuite/expected/sequence-builtins.txt   |   0
 .../test/templatesuite/expected/specialvars.txt    |   0
 .../test/templatesuite/expected/strictinheader.txt |   0
 .../expected/string-builtins-regexps-matches.txt   |   0
 .../expected/string-builtins-regexps.txt           |   0
 .../templatesuite/expected/string-builtins1.txt    |   0
 .../templatesuite/expected/string-builtins2.txt    |   0
 .../templatesuite/expected/stringbimethods.txt     |   0
 .../test/templatesuite/expected/stringliteral.txt  | Bin
 .../test/templatesuite/expected/switch.txt         |   0
 .../test/templatesuite/expected/transforms.txt     |   0
 .../expected/type-builtins-ici-2.3.21.txt          |   0
 .../expected/type-builtins-ici-2.3.24.txt          |   0
 .../test/templatesuite/expected/type-builtins.txt  |   0
 .../test/templatesuite/expected/var-layers.txt     |   0
 .../test/templatesuite/expected/varargs.txt        |   0
 .../test/templatesuite/expected/variables.txt      |   0
 .../templatesuite/expected/whitespace-trim.txt     |   0
 .../templatesuite/expected/wstrip-in-header.txt    |   0
 .../test/templatesuite/expected/wstripping.txt     |   0
 .../test/templatesuite/expected/xml-fragment.txt   |   0
 .../templatesuite/expected/xml-ns_prefix-scope.txt |   0
 .../freemarker/test/templatesuite/expected/xml.txt |   0
 .../test/templatesuite/expected/xmlns1.txt         |   0
 .../test/templatesuite/expected/xmlns3.txt         |   0
 .../test/templatesuite/expected/xmlns4.txt         |   0
 .../test/templatesuite/expected/xmlns5.txt         |   0
 .../models/BeansTestResources.properties           |   0
 .../test/templatesuite/models/defaultxmlns1.xml    |   0
 .../templatesuite/models/xml-ns_prefix-scope.xml   |   0
 .../freemarker/test/templatesuite/models/xml.xml   |   0
 .../test/templatesuite/models/xmlfragment.xml      |   0
 .../freemarker/test/templatesuite/models/xmlns.xml |   0
 .../test/templatesuite/models/xmlns2.xml           |   0
 .../test/templatesuite/models/xmlns3.xml           |   0
 .../test/templatesuite/templates/api-builtins.ftl  |   0
 .../test/templatesuite/templates/arithmetic.ftl    |   0
 .../test/templatesuite/templates/assignments.ftl   |   0
 .../test/templatesuite/templates/bean-maps.ftl     |   0
 .../test/templatesuite/templates/beans.ftl         |   0
 .../templatesuite/templates/boolean-formatting.ftl |   0
 .../test/templatesuite/templates/boolean.ftl       |   0
 .../templatesuite/templates/charset-in-header.ftl  |   0
 .../templates/charset-in-header_inc1.ftl           |   0
 .../templates/charset-in-header_inc2.ftl           |   0
 .../templates/classic-compatible-mode2.ftl         |   0
 .../templatesuite/templates/classic-compatible.ftl |   0
 .../test/templatesuite/templates/comment.ftl       |   0
 .../test/templatesuite/templates/comparisons.ftl   |   0
 .../test/templatesuite/templates/compress.ftl      |   0
 .../templatesuite/templates/date-type-builtins.ftl |   0
 .../templates/dateformat-iso-bi-common.ftl         |   0
 .../templates/dateformat-iso-bi-ici-2.3.21.ftl     |   0
 .../templatesuite/templates/dateformat-iso-bi.ftl  |   0
 .../templates/dateformat-iso-like.ftl              |   0
 .../templatesuite/templates/dateformat-java.ftl    |   0
 .../test/templatesuite/templates/dateparsing.ftl   |   0
 .../test/templatesuite/templates/default-xmlns.ftl |   0
 .../test/templatesuite/templates/default.ftl       |   0
 .../templatesuite/templates/encoding-builtins.ftl  |   0
 .../test/templatesuite/templates/escapes.ftl       |   0
 .../test/templatesuite/templates/exception.ftl     |   0
 .../test/templatesuite/templates/exception2.ftl    |   0
 .../test/templatesuite/templates/exception3.ftl    |   0
 .../templates/existence-operators.ftl              |   0
 .../test/templatesuite/templates/hashconcat.ftl    |   0
 .../test/templatesuite/templates/hashliteral.ftl   |   0
 .../test/templatesuite/templates/helloworld.ftl    |   0
 .../templates/identifier-escaping.ftl              |   0
 .../templates/identifier-non-ascii.ftl             |   0
 .../freemarker/test/templatesuite/templates/if.ftl |   0
 .../test/templatesuite/templates/import.ftl        |   0
 .../test/templatesuite/templates/import_lib.ftl    |   0
 .../test/templatesuite/templates/include.ftl       |   0
 .../templates/include2-included-encoding.ftl       |   0
 .../templatesuite/templates/include2-included.ftl  |   0
 .../test/templatesuite/templates/include2.ftl      |   0
 .../test/templatesuite/templates/included.ftl      |   0
 .../test/templatesuite/templates/interpret.ftl     |   0
 .../test/templatesuite/templates/iterators.ftl     |   0
 .../test/templatesuite/templates/lastcharacter.ftl |   0
 .../test/templatesuite/templates/list-bis.ftl      |   0
 .../test/templatesuite/templates/list.ftl          |   0
 .../test/templatesuite/templates/list2.ftl         |   0
 .../test/templatesuite/templates/list3.ftl         |   0
 .../test/templatesuite/templates/listhash.ftl      |   0
 .../templatesuite/templates/listhashliteral.ftl    |   0
 .../test/templatesuite/templates/listliteral.ftl   |   0
 .../test/templatesuite/templates/localization.ftl  |   0
 .../templatesuite/templates/localization_en.ftl    |   0
 .../templatesuite/templates/localization_en_AU.ftl |   0
 .../test/templatesuite/templates/logging.ftl       |   0
 .../test/templatesuite/templates/loopvariable.ftl  |   0
 .../test/templatesuite/templates/macros-return.ftl |   0
 .../test/templatesuite/templates/macros.ftl        |   0
 .../test/templatesuite/templates/macros2.ftl       |   0
 .../test/templatesuite/templates/multimodels.ftl   |   0
 .../test/templatesuite/templates/nested.ftl        |   0
 .../test/templatesuite/templates/nestedinclude.ftl |   0
 .../templatesuite/templates/new-allowsnothing.ftl  |   0
 .../templates/new-defaultresolver.ftl              |   0
 .../test/templatesuite/templates/new-optin.ftl     |   0
 .../test/templatesuite/templates/new-safer.ftl     |   0
 .../templatesuite/templates/new-unrestricted.ftl   |   0
 .../test/templatesuite/templates/newlines1.ftl     |   0
 .../test/templatesuite/templates/newlines2.ftl     |   0
 .../templatesuite/templates/non-strict-syntax.ftl  |   0
 .../test/templatesuite/templates/noparse.ftl       |   0
 .../test/templatesuite/templates/number-format.ftl |   0
 .../templatesuite/templates/number-literal.ftl     |   0
 .../templates/number-math-builtins.ftl             |   0
 .../templatesuite/templates/number-to-date.ftl     |   0
 .../templatesuite/templates/numerical-cast.ftl     |   0
 .../templatesuite/templates/output-encoding1.ftl   |   0
 .../templatesuite/templates/output-encoding2.ftl   |   0
 .../templatesuite/templates/output-encoding3.ftl   |   0
 .../overloaded-methods-2-bwici-2.3.20.ftl          |   0
 .../overloaded-methods-2-bwici-2.3.21.ftl          |   0
 .../templates/overloaded-methods-2-common.ftl      |   0
 .../overloaded-methods-2-desc-bwici-2.3.20.ftl     |   0
 .../overloaded-methods-2-inc-bwici-2.3.20.ftl      |   0
 .../templates/overloaded-methods-23bc.ftl          |   0
 .../test/templatesuite/templates/precedence.ftl    |   0
 .../test/templatesuite/templates/range-common.ftl  |   0
 .../templatesuite/templates/range-ici-2.3.20.ftl   |   0
 .../templatesuite/templates/range-ici-2.3.21.ftl   |   0
 .../test/templatesuite/templates/range-lazy.ftl    |   0
 .../test/templatesuite/templates/recover.ftl       |   0
 .../test/templatesuite/templates/root.ftl          |   0
 .../templatesuite/templates/sequence-builtins.ftl  |   0
 .../test/templatesuite/templates/setting.ftl       |   0
 .../templates/simplehash-char-key.ftl              |   0
 .../test/templatesuite/templates/specialvars.ftl   |   0
 .../templatesuite/templates/strictinheader.ftl     |   0
 .../templates/strictinheader_inc1.ftl              |   0
 .../templates/strictinheader_inc2.ftl              |   0
 .../templates/string-builtin-coercion.ftl          |   0
 .../templates/string-builtins-ici-2.3.19.ftl       |   0
 .../templates/string-builtins-ici-2.3.20.ftl       |   0
 .../templates/string-builtins-regexps-matches.ftl  |   0
 .../templates/string-builtins-regexps.ftl          |   0
 .../templatesuite/templates/string-builtins1.ftl   |   0
 .../templatesuite/templates/string-builtins2.ftl   |   0
 .../templatesuite/templates/string-builtins3.ftl   |   0
 .../templatesuite/templates/stringbimethods.ftl    |   0
 .../test/templatesuite/templates/stringliteral.ftl |   0
 .../templates/subdir/include-subdir.ftl            |   0
 .../templates/subdir/include-subdir2.ftl           |   0
 .../templatesuite/templates/subdir/new-optin-2.ftl |   0
 .../templatesuite/templates/subdir/new-optin.ftl   |   0
 .../templates/subdir/subsub/new-optin.ftl          |   0
 .../templatesuite/templates/switch-builtin.ftl     |   0
 .../test/templatesuite/templates/switch.ftl        |   0
 .../test/templatesuite/templates/temporal.ftl      |   0
 .../test/templatesuite/templates/then-builtin.ftl  |   0
 .../test/templatesuite/templates/transforms.ftl    |   0
 .../test/templatesuite/templates/type-builtins.ftl |   0
 .../test/templatesuite/templates/undefined.ftl     |   0
 .../test/templatesuite/templates/url.ftl           |   0
 .../test/templatesuite/templates/var-layers.ftl    |   0
 .../test/templatesuite/templates/varargs.ftl       |   0
 .../test/templatesuite/templates/variables.ftl     |   0
 .../test/templatesuite/templates/varlayers_lib.ftl |   0
 .../templatesuite/templates/whitespace-trim.ftl    |   0
 .../templates/wsstripinheader_inc.ftl              |   0
 .../templatesuite/templates/wstrip-in-header.ftl   |   0
 .../test/templatesuite/templates/xml-fragment.ftl  |   0
 .../templates/xml-ns_prefix-scope-lib.ftl          |   0
 .../templates/xml-ns_prefix-scope-main.ftl         |   0
 .../test/templatesuite/templates/xml.ftl           |   0
 .../test/templatesuite/templates/xmlns1.ftl        |   0
 .../test/templatesuite/templates/xmlns3.ftl        |   0
 .../test/templatesuite/templates/xmlns4.ftl        |   0
 .../test/templatesuite/templates/xmlns5.ftl        |   0
 .../freemarker/test/templatesuite/testcases.xml    |   0
 .../src}/test/resources/logback-test-ci.xml        |   0
 .../src/main/docgen}/en_US/book.xml                |  27 +-
 .../docgen}/en_US/docgen-help/editors-readme.txt   |   0
 .../docgen}/en_US/docgen-misc/copyrightComment.txt |   0
 .../docgen}/en_US/docgen-misc/googleAnalytics.html |   0
 .../figures/model2sketch_with_alpha.png            | Bin
 .../docgen-originals/figures/odg-convert-howto.txt |   0
 .../en_US/docgen-originals/figures/overview.odg    | Bin
 .../docgen-originals/figures/tree_with_alpha.png   | Bin
 .../src/main/docgen}/en_US/docgen.cjson            |   0
 .../src/main/docgen}/en_US/favicon.png             | Bin
 .../main/docgen}/en_US/figures/model2sketch.png    | Bin
 .../src/main/docgen}/en_US/figures/overview.png    | Bin
 .../src/main/docgen}/en_US/figures/tree.png        | Bin
 .../src/main/docgen}/en_US/logo.png                | Bin
 .../src/main}/java/freemarker/core/ASTPrinter.java |   0
 .../ext/beans/AlphabeticalMethodSorter.java        |   0
 .../ext/beans/BeansWrapperDesc2003020.java         |   0
 .../ext/beans/BeansWrapperDesc2003021.java         |   0
 .../ext/beans/BeansWrapperInc2003020.java          |   0
 .../ext/beans/BeansWrapperInc2003021.java          |   0
 .../ext/beans/BeansWrapperWithShortedMethods.java  |   0
 .../ext/beans/DefaultObjectWrapperDesc2003020.java |   0
 .../ext/beans/DefaultObjectWrapperDesc2003021.java |   0
 .../ext/beans/DefaultObjectWrapperDesc2003022.java |   0
 .../ext/beans/DefaultObjectWrapperInc2003020.java  |   0
 .../ext/beans/DefaultObjectWrapperInc2003021.java  |   0
 .../ext/beans/DefaultObjectWrapperInc2003022.java  |   0
 .../DefaultObjectWrapperWithSortedMethods.java     |   0
 .../ext/beans/Java7MembersOnlyBeansWrapper.java    |   0
 .../java/freemarker/ext/beans/RationalNumber.java  |   0
 .../CopyrightCommentRemoverTemplateLoader.java     |   0
 .../java/freemarker/test/ResourcesExtractor.java   |   0
 .../java/freemarker/test/hamcerst/Matchers.java    |   0
 .../test/hamcerst/StringContainsIgnoringCase.java  |   0
 .../src/main}/java/freemarker/test/package.html    |   0
 .../templatesuite/models/AllTemplateModels.java    |   0
 .../test/templatesuite/models/BeanTestClass.java   |   0
 .../templatesuite/models/BeanTestInterface.java    |   0
 .../templatesuite/models/BeanTestSuperclass.java   |   0
 .../models/BooleanAndScalarModel.java              |   0
 .../models/BooleanAndStringTemplateModel.java      |   0
 .../test/templatesuite/models/BooleanHash1.java    |   0
 .../test/templatesuite/models/BooleanHash2.java    |   0
 .../test/templatesuite/models/BooleanList1.java    |   0
 .../test/templatesuite/models/BooleanList2.java    |   0
 .../models/BooleanVsStringMethods.java             |   0
 .../test/templatesuite/models/EnumTestClass.java   |   0
 .../test/templatesuite/models/ExceptionModel.java  |   0
 .../templatesuite/models/HashAndScalarModel.java   |   0
 .../test/templatesuite/models/JavaObjectInfo.java  |   0
 .../test/templatesuite/models/LegacyList.java      |   0
 .../test/templatesuite/models/Listables.java       |   0
 .../test/templatesuite/models/MultiModel1.java     |   0
 .../test/templatesuite/models/MultiModel2.java     |   0
 .../test/templatesuite/models/MultiModel3.java     |   0
 .../test/templatesuite/models/MultiModel4.java     |   0
 .../test/templatesuite/models/MultiModel5.java     |   0
 .../test/templatesuite/models/NewTestModel.java    |   0
 .../test/templatesuite/models/NewTestModel2.java   |   0
 .../templatesuite/models/NumberAndStringModel.java |   0
 .../models/OverloadedConstructor.java              |   0
 .../templatesuite/models/OverloadedMethods.java    |   0
 .../templatesuite/models/OverloadedMethods2.java   |   0
 .../templatesuite/models/SimpleTestMethod.java     |   0
 .../templatesuite/models/TransformHashWrapper.java |   0
 .../models/TransformMethodWrapper1.java            |   0
 .../models/TransformMethodWrapper2.java            |   0
 .../test/templatesuite/models/TransformModel1.java |   0
 .../test/templatesuite/models/VarArgTestModel.java |   0
 .../freemarker/test/utility/AssertDirective.java   |   0
 .../test/utility/AssertEqualsDirective.java        |   0
 .../test/utility/AssertFailsDirective.java         |   0
 .../AssertationFailedInTemplateException.java      |   0
 .../test/utility/BadParameterTypeException.java    |   0
 .../java/freemarker/test/utility/FileTestCase.java | 123 ++-
 .../utility/MissingRequiredParameterException.java |   0
 .../freemarker/test/utility/NoOutputDirective.java |   0
 .../test/utility/ParameterException.java           |   0
 .../java/freemarker/test/utility/TestUtil.java     |   0
 .../utility/UnsupportedParameterException.java     |   0
 .../src/main}/resources/logback-test.xml           |   0
 gradle.properties                                  |  35 +
 .../repositories.gradle.kts                        |  36 +-
 gradle/wrapper/gradle-wrapper.jar                  | Bin 0 -> 43462 bytes
 gradle/wrapper/gradle-wrapper.properties           |   6 +
 gradlew                                            | 249 ++++++
 gradlew.bat                                        |  92 ++
 ivy.xml                                            | 193 ----
 ivysettings-ci.xml                                 |  34 -
 ivysettings.xml                                    |  41 -
 osgi.bnd                                           |   3 -
 rat-excludes                                       |  31 +-
 .../EnclosingClass.java => settings.gradle.kts     |  16 +-
 1354 files changed, 2291 insertions(+), 1505 deletions(-)

diff --cc 
freemarker-core/src/main/java/freemarker/core/DateTimeFormatterBasedTemplateTemporalFormat.java
index 46c4db0c,00000000..46c4db0c
mode 100644,000000..100644
--- 
a/freemarker-core/src/main/java/freemarker/core/DateTimeFormatterBasedTemplateTemporalFormat.java
+++ 
b/freemarker-core/src/main/java/freemarker/core/DateTimeFormatterBasedTemplateTemporalFormat.java
diff --cc 
freemarker-core/src/main/java/freemarker/core/FastLRUKeyValueStore.java
index 12dc508d,00000000..12dc508d
mode 100644,000000..100644
--- a/freemarker-core/src/main/java/freemarker/core/FastLRUKeyValueStore.java
+++ b/freemarker-core/src/main/java/freemarker/core/FastLRUKeyValueStore.java
diff --cc 
freemarker-core/src/main/java/freemarker/core/ISOLikeTemplateTemporalTemporalFormat.java
index 036995c7,00000000..036995c7
mode 100644,000000..100644
--- 
a/freemarker-core/src/main/java/freemarker/core/ISOLikeTemplateTemporalTemporalFormat.java
+++ 
b/freemarker-core/src/main/java/freemarker/core/ISOLikeTemplateTemporalTemporalFormat.java
diff --cc 
freemarker-core/src/main/java/freemarker/core/ISOTemplateTemporalFormatFactory.java
index 4a532ce2,00000000..4a532ce2
mode 100644,000000..100644
--- 
a/freemarker-core/src/main/java/freemarker/core/ISOTemplateTemporalFormatFactory.java
+++ 
b/freemarker-core/src/main/java/freemarker/core/ISOTemplateTemporalFormatFactory.java
diff --cc 
freemarker-core/src/main/java/freemarker/core/JavaTemplateTemporalFormat.java
index d891d968,00000000..d891d968
mode 100644,000000..100644
--- 
a/freemarker-core/src/main/java/freemarker/core/JavaTemplateTemporalFormat.java
+++ 
b/freemarker-core/src/main/java/freemarker/core/JavaTemplateTemporalFormat.java
diff --cc 
freemarker-core/src/main/java/freemarker/core/JavaTemplateTemporalFormatFactory.java
index b88c0dc8,00000000..b88c0dc8
mode 100644,000000..100644
--- 
a/freemarker-core/src/main/java/freemarker/core/JavaTemplateTemporalFormatFactory.java
+++ 
b/freemarker-core/src/main/java/freemarker/core/JavaTemplateTemporalFormatFactory.java
diff --cc 
freemarker-core/src/main/java/freemarker/core/MissingTimeZoneParserPolicy.java
index 32ece249,00000000..32ece249
mode 100644,000000..100644
--- 
a/freemarker-core/src/main/java/freemarker/core/MissingTimeZoneParserPolicy.java
+++ 
b/freemarker-core/src/main/java/freemarker/core/MissingTimeZoneParserPolicy.java
diff --cc 
freemarker-core/src/main/java/freemarker/core/TemplateTemporalFormat.java
index b7ebdbf2,00000000..b7ebdbf2
mode 100644,000000..100644
--- a/freemarker-core/src/main/java/freemarker/core/TemplateTemporalFormat.java
+++ b/freemarker-core/src/main/java/freemarker/core/TemplateTemporalFormat.java
diff --cc 
freemarker-core/src/main/java/freemarker/core/XSTemplateTemporalFormatFactory.java
index 31719ccc,00000000..31719ccc
mode 100644,000000..100644
--- 
a/freemarker-core/src/main/java/freemarker/core/XSTemplateTemporalFormatFactory.java
+++ 
b/freemarker-core/src/main/java/freemarker/core/XSTemplateTemporalFormatFactory.java
diff --cc freemarker-core/src/main/java/freemarker/core/_JavaTimeBugUtils.java
index 9efc05a2,00000000..9efc05a2
mode 100644,000000..100644
--- a/freemarker-core/src/main/java/freemarker/core/_JavaTimeBugUtils.java
+++ b/freemarker-core/src/main/java/freemarker/core/_JavaTimeBugUtils.java
diff --cc freemarker-core/src/main/java/freemarker/core/_JavaVersion.java
index 3e61c713,00000000..3e61c713
mode 100644,000000..100644
--- a/freemarker-core/src/main/java/freemarker/core/_JavaVersion.java
+++ b/freemarker-core/src/main/java/freemarker/core/_JavaVersion.java
diff --cc freemarker-core/src/main/java/freemarker/core/_TemporalUtils.java
index cb879fa8,00000000..cb879fa8
mode 100644,000000..100644
--- a/freemarker-core/src/main/java/freemarker/core/_TemporalUtils.java
+++ b/freemarker-core/src/main/java/freemarker/core/_TemporalUtils.java
diff --cc freemarker-core/src/main/java/freemarker/ext/beans/TemporalModel.java
index 16a69fec,00000000..16a69fec
mode 100644,000000..100644
--- a/freemarker-core/src/main/java/freemarker/ext/beans/TemporalModel.java
+++ b/freemarker-core/src/main/java/freemarker/ext/beans/TemporalModel.java
diff --cc 
freemarker-core/src/main/java/freemarker/template/TemplateTemporalModel.java
index 90cae267,00000000..90cae267
mode 100644,000000..100644
--- 
a/freemarker-core/src/main/java/freemarker/template/TemplateTemporalModel.java
+++ 
b/freemarker-core/src/main/java/freemarker/template/TemplateTemporalModel.java
diff --cc 
freemarker-core/src/test/java/freemarker/core/AbstractTemplateTemporalFormatAbstractCachingInEnvironmentTest.java
index 93a320dd,00000000..93a320dd
mode 100644,000000..100644
--- 
a/freemarker-core/src/test/java/freemarker/core/AbstractTemplateTemporalFormatAbstractCachingInEnvironmentTest.java
+++ 
b/freemarker-core/src/test/java/freemarker/core/AbstractTemplateTemporalFormatAbstractCachingInEnvironmentTest.java
diff --cc 
freemarker-core/src/test/java/freemarker/core/AbstractTemporalFormatTest.java
index 58dd771a,00000000..58dd771a
mode 100644,000000..100644
--- 
a/freemarker-core/src/test/java/freemarker/core/AbstractTemporalFormatTest.java
+++ 
b/freemarker-core/src/test/java/freemarker/core/AbstractTemporalFormatTest.java
diff --cc 
freemarker-core/src/test/java/freemarker/core/CustomTemplateTemporalFormatTest.java
index 6e257600,00000000..6e257600
mode 100644,000000..100644
--- 
a/freemarker-core/src/test/java/freemarker/core/CustomTemplateTemporalFormatTest.java
+++ 
b/freemarker-core/src/test/java/freemarker/core/CustomTemplateTemporalFormatTest.java
diff --cc 
freemarker-core/src/test/java/freemarker/core/EpochMillisTemplateTemporalFormatFactory.java
index 2094f1d6,00000000..2094f1d6
mode 100644,000000..100644
--- 
a/freemarker-core/src/test/java/freemarker/core/EpochMillisTemplateTemporalFormatFactory.java
+++ 
b/freemarker-core/src/test/java/freemarker/core/EpochMillisTemplateTemporalFormatFactory.java
diff --cc 
freemarker-core/src/test/java/freemarker/core/FormatCacheMemoryLeakPreventionFlushingTest.java
index 2d705f3f,00000000..2d705f3f
mode 100644,000000..100644
--- 
a/freemarker-core/src/test/java/freemarker/core/FormatCacheMemoryLeakPreventionFlushingTest.java
+++ 
b/freemarker-core/src/test/java/freemarker/core/FormatCacheMemoryLeakPreventionFlushingTest.java
diff --cc 
freemarker-core/src/test/java/freemarker/core/HTMLISOTemplateTemporalFormatFactory.java
index b8492039,00000000..b8492039
mode 100644,000000..100644
--- 
a/freemarker-core/src/test/java/freemarker/core/HTMLISOTemplateTemporalFormatFactory.java
+++ 
b/freemarker-core/src/test/java/freemarker/core/HTMLISOTemplateTemporalFormatFactory.java
diff --cc 
freemarker-core/src/test/java/freemarker/core/ISOLikeTemplateTemporalFormatTest.java
index 7850b4bd,00000000..7850b4bd
mode 100644,000000..100644
--- 
a/freemarker-core/src/test/java/freemarker/core/ISOLikeTemplateTemporalFormatTest.java
+++ 
b/freemarker-core/src/test/java/freemarker/core/ISOLikeTemplateTemporalFormatTest.java
diff --cc 
freemarker-core/src/test/java/freemarker/core/JavaTemplateTemporalFormatTest.java
index 2c68309d,00000000..2c68309d
mode 100644,000000..100644
--- 
a/freemarker-core/src/test/java/freemarker/core/JavaTemplateTemporalFormatTest.java
+++ 
b/freemarker-core/src/test/java/freemarker/core/JavaTemplateTemporalFormatTest.java
diff --cc 
freemarker-core/src/test/java/freemarker/core/LocAndTZSensitiveTemplateTemporalFormatFactory.java
index 7051b75d,00000000..7051b75d
mode 100644,000000..100644
--- 
a/freemarker-core/src/test/java/freemarker/core/LocAndTZSensitiveTemplateTemporalFormatFactory.java
+++ 
b/freemarker-core/src/test/java/freemarker/core/LocAndTZSensitiveTemplateTemporalFormatFactory.java
diff --cc 
freemarker-core/src/test/java/freemarker/core/TemplateTemporalFormatByFormatStringCachingInEnvironmentTest.java
index 04b5b63a,00000000..04b5b63a
mode 100644,000000..100644
--- 
a/freemarker-core/src/test/java/freemarker/core/TemplateTemporalFormatByFormatStringCachingInEnvironmentTest.java
+++ 
b/freemarker-core/src/test/java/freemarker/core/TemplateTemporalFormatByFormatStringCachingInEnvironmentTest.java
diff --cc 
freemarker-core/src/test/java/freemarker/core/TemplateTemporalFormatCurrentCachingInEnvironmentTest.java
index 9e481bf7,00000000..9e481bf7
mode 100644,000000..100644
--- 
a/freemarker-core/src/test/java/freemarker/core/TemplateTemporalFormatCurrentCachingInEnvironmentTest.java
+++ 
b/freemarker-core/src/test/java/freemarker/core/TemplateTemporalFormatCurrentCachingInEnvironmentTest.java
diff --cc 
freemarker-core/src/test/java/freemarker/core/TemporalErrorMessagesTest.java
index 4747a0ee,00000000..4747a0ee
mode 100644,000000..100644
--- 
a/freemarker-core/src/test/java/freemarker/core/TemporalErrorMessagesTest.java
+++ 
b/freemarker-core/src/test/java/freemarker/core/TemporalErrorMessagesTest.java
diff --cc freemarker-core/src/test/java/freemarker/core/_TemporalUtilsTest.java
index bdfd755d,00000000..bdfd755d
mode 100644,000000..100644
--- a/freemarker-core/src/test/java/freemarker/core/_TemporalUtilsTest.java
+++ b/freemarker-core/src/test/java/freemarker/core/_TemporalUtilsTest.java
diff --cc 
freemarker-core/src/test/java/freemarker/template/utility/DateUtilsPatternParsingTest.java
index df8e740b,00000000..df8e740b
mode 100644,000000..100644
--- 
a/freemarker-core/src/test/java/freemarker/template/utility/DateUtilsPatternParsingTest.java
+++ 
b/freemarker-core/src/test/java/freemarker/template/utility/DateUtilsPatternParsingTest.java
diff --cc 
freemarker-jython25/src/test/resources/freemarker/test/templatesuite/templates/temporal.ftl
index b6309e1e,00000000..b6309e1e
mode 100644,000000..100644
--- 
a/freemarker-jython25/src/test/resources/freemarker/test/templatesuite/templates/temporal.ftl
+++ 
b/freemarker-jython25/src/test/resources/freemarker/test/templatesuite/templates/temporal.ftl


Reply via email to