[freemarker] branch FREEMARKER-35 updated (e3e3185 -> b80b632)

[dd...@apache.org]

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

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


    from e3e3185  Switched to Java 8 as minimum requirement. It's not feasible to support Java 8 time API otherwise, since it's statically referred from TemplateTemporalModel.
     add 88ebbaa  Increased version number to 2.3.31-SNAPSHOT
     new b80b632  Merge remote-tracking branch 'origin/2.3-gae' into FREEMARKER-35

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/main/java/freemarker/template/Configuration.java            | 3 +++
 src/main/java/freemarker/template/_TemplateAPI.java             | 1 +
 src/main/resources/freemarker/version.properties                | 8 ++++----
 src/test/java/freemarker/template/DefaultObjectWrapperTest.java | 1 +
 4 files changed, 9 insertions(+), 4 deletions(-)

[freemarker] 01/01: Merge remote-tracking branch 'origin/2.3-gae' into FREEMARKER-35

[dd...@apache.org]

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 b80b6322b51354bd0b6cc4f0cb2db7a4ebfad15e
Merge: e3e3185 88ebbaa
Author: ddekany <dd...@apache.org>
AuthorDate: Sat Apr 11 18:04:32 2020 +0200

    Merge remote-tracking branch 'origin/2.3-gae' into FREEMARKER-35

 src/main/java/freemarker/template/Configuration.java            | 3 +++
 src/main/java/freemarker/template/_TemplateAPI.java             | 1 +
 src/main/resources/freemarker/version.properties                | 8 ++++----
 src/test/java/freemarker/template/DefaultObjectWrapperTest.java | 1 +
 4 files changed, 9 insertions(+), 4 deletions(-)