This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a change to branch 2.3
in repository https://gitbox.apache.org/repos/asf/freemarker.git
from dda47258 Merge remote-tracking branch 'origin/2.3-gae' into 2.3
add ef7b05d6 Converted package.html-s to package-info.java-s, as otherwise
they were missing from the javadoc output in the new build.
add fa7e0093 Merge branch '2.3.33-maintenance' into 2.3-gae
add 29bb7bbd Manual: Version history update
add 8d52bc81 Build: RAT Xalan dependency not needed anymore, as docgen now
pulls in the missing 2.7.3 dependency
add f35e19ea README: Java 17 is needed instead of 16 at some places
add ebb38fff FREEMARKER-227: Fixed bug, where if classic_compatible mode
was true (rarely used), then sequence built-ins, like seq?seq_contains(value),
has failed with NullPointerException if values of incompatible types had to be
compared. The intended behavior is to convert the values to string, and then
compare them (to mimic the behavior of FreeMarker 1.x).
new f56dcdc2 Merge remote-tracking branch 'origin/2.3-gae' into 2.3
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README.md | 4 +-
buildSrc/build.gradle.kts | 3 --
...emplateSourceMatcher.java => package-info.java} | 14 ++----
.../src/main/java/freemarker/cache/package.html | 30 -----------
.../src/main/java/freemarker/core/EvalUtil.java | 12 +++--
.../package-info.java} | 7 ++-
.../src/main/java/freemarker/core/package.html | 26 ----------
.../NodeOperator.java => debug/package-info.java} | 10 ++--
.../src/main/java/freemarker/debug/package.html | 27 ----------
.../beans/package-info.java} | 29 +++--------
.../main/java/freemarker/ext/beans/package.html | 39 ---------------
.../dom/package-info.java} | 14 ++----
.../src/main/java/freemarker/ext/dom/package.html | 31 ------------
.../NodeOperator.java => jdom/package-info.java} | 10 ++--
.../src/main/java/freemarker/ext/jdom/package.html | 29 -----------
.../java/freemarker/ext/package-info.java} | 6 ++-
.../src/main/java/freemarker/ext/package.html | 25 ----------
.../java/freemarker/ext/rhino/package-info.java} | 6 ++-
.../main/java/freemarker/ext/rhino/package.html | 28 -----------
.../java/freemarker/ext/util/package-info.java} | 10 ++--
.../src/main/java/freemarker/ext/util/package.html | 23 ---------
.../xml/package-info.java} | 10 ++--
.../src/main/java/freemarker/ext/xml/package.html | 28 -----------
.../java/freemarker/log/package-info.java} | 10 ++--
.../src/main/java/freemarker/log/package.html | 27 ----------
.../package-info.java} | 14 ++----
.../src/main/java/freemarker/template/package.html | 27 ----------
.../freemarker/template/utility/package-info.java} | 10 ++--
.../java/freemarker/template/utility/package.html | 25 ----------
...ingTest.java => ClassicCompatibleBugsTest.java} | 43 ++++++++--------
.../main/java/freemarker/ext/jsp/package-info.java | 23 +++------
.../src/main/java/freemarker/ext/jsp/package.html | 33 ------------
.../java/freemarker/ext/servlet/package-info.java | 23 +++------
.../main/java/freemarker/ext/servlet/package.html | 29 -----------
.../main/java/freemarker/ext/ant/package-info.java | 7 ++-
.../src/main/java/freemarker/ext/ant/package.html | 27 ----------
.../java/freemarker/ext/jython/package-info.java | 25 +++-------
.../main/java/freemarker/ext/jython/package.html | 37 --------------
.../test/templatesuite/package-info.java | 28 +++++------
.../freemarker/test/templatesuite/package.html | 42 ----------------
freemarker-manual/src/main/docgen/en_US/book.xml | 58 +++++++++++++++++++---
.../main/java/freemarker/test/package-info.java | 11 ++--
.../src/main/java/freemarker/test/package.html | 28 -----------
43 files changed, 180 insertions(+), 768 deletions(-)
copy
freemarker-core/src/main/java/freemarker/cache/{TemplateSourceMatcher.java =>
package-info.java} (69%)
delete mode 100644 freemarker-core/src/main/java/freemarker/cache/package.html
copy
freemarker-core/src/main/java/freemarker/{ext/beans/MaybeEmptyCallableMemberDescriptor.java
=> core/package-info.java} (78%)
delete mode 100644 freemarker-core/src/main/java/freemarker/core/package.html
copy freemarker-core/src/main/java/freemarker/{ext/xml/NodeOperator.java =>
debug/package-info.java} (81%)
delete mode 100644 freemarker-core/src/main/java/freemarker/debug/package.html
copy
freemarker-core/src/main/java/freemarker/{core/TemplateHTMLOutputModel.java =>
ext/beans/package-info.java} (53%)
delete mode 100644
freemarker-core/src/main/java/freemarker/ext/beans/package.html
copy
freemarker-core/src/main/java/freemarker/{core/BackwardCompatibleTemplateNumberFormat.java
=> ext/dom/package-info.java} (71%)
delete mode 100644
freemarker-core/src/main/java/freemarker/ext/dom/package.html
copy freemarker-core/src/main/java/freemarker/ext/{xml/NodeOperator.java =>
jdom/package-info.java} (81%)
delete mode 100644
freemarker-core/src/main/java/freemarker/ext/jdom/package.html
copy
freemarker-core/src/{test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh.out
=> main/java/freemarker/ext/package-info.java} (90%)
delete mode 100644 freemarker-core/src/main/java/freemarker/ext/package.html
copy
freemarker-core/src/{test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh.out
=> main/java/freemarker/ext/rhino/package-info.java} (90%)
delete mode 100644
freemarker-core/src/main/java/freemarker/ext/rhino/package.html
copy
freemarker-core/src/{test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh.out
=> main/java/freemarker/ext/util/package-info.java} (86%)
delete mode 100644
freemarker-core/src/main/java/freemarker/ext/util/package.html
copy
freemarker-core/src/main/java/freemarker/{core/TemplateValueFormatFactory.java
=> ext/xml/package-info.java} (84%)
delete mode 100644
freemarker-core/src/main/java/freemarker/ext/xml/package.html
copy
freemarker-core/src/{test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh.out
=> main/java/freemarker/log/package-info.java} (87%)
delete mode 100644 freemarker-core/src/main/java/freemarker/log/package.html
copy
freemarker-core/src/main/java/freemarker/{core/BackwardCompatibleTemplateNumberFormat.java
=> template/package-info.java} (72%)
delete mode 100644
freemarker-core/src/main/java/freemarker/template/package.html
copy
freemarker-core/src/{test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh.out
=> main/java/freemarker/template/utility/package-info.java} (86%)
delete mode 100644
freemarker-core/src/main/java/freemarker/template/utility/package.html
copy
freemarker-core/src/test/java/freemarker/core/{BooleanFormatEnvironmentCachingTest.java
=> ClassicCompatibleBugsTest.java} (52%)
copy freemarker-core/src/main/java/freemarker/ext/beans/FieldMatcher.java =>
freemarker-javax-servlet/src/main/java/freemarker/ext/jsp/package-info.java
(63%)
delete mode 100644
freemarker-javax-servlet/src/main/java/freemarker/ext/jsp/package.html
copy freemarker-core/src/main/java/freemarker/ext/beans/FieldMatcher.java =>
freemarker-javax-servlet/src/main/java/freemarker/ext/servlet/package-info.java
(63%)
delete mode 100644
freemarker-javax-servlet/src/main/java/freemarker/ext/servlet/package.html
copy
freemarker-core/src/main/java/freemarker/core/BuiltInBannedWhenForcedAutoEscaping.java
=> freemarker-jython20/src/main/java/freemarker/ext/ant/package-info.java (77%)
delete mode 100644
freemarker-jython20/src/main/java/freemarker/ext/ant/package.html
copy
freemarker-core/src/main/java/freemarker/ext/beans/ConstructorMatcher.java =>
freemarker-jython20/src/main/java/freemarker/ext/jython/package-info.java (55%)
delete mode 100644
freemarker-jython20/src/main/java/freemarker/ext/jython/package.html
copy
freemarker-core/src/main/java/freemarker/template/utility/RichObjectWrapper.java
=>
freemarker-jython25/src/test/java/freemarker/test/templatesuite/package-info.java
(52%)
delete mode 100644
freemarker-jython25/src/test/java/freemarker/test/templatesuite/package.html
copy
freemarker-core/src/main/java/freemarker/core/TemplateValueFormatFactory.java
=> freemarker-test-utils/src/main/java/freemarker/test/package-info.java (75%)
delete mode 100644
freemarker-test-utils/src/main/java/freemarker/test/package.html
