You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2023/12/08 21:59:45 UTC

(freemarker) branch FREEMARKER-35 updated (5a766442 -> d1097c24)

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 5a766442 Adjusted Temporal tests for the post-JDK11 format defaults
     add 35e1664e Dropped support for Java 7, to simplify build. Now minimum is Java 8.
     new d1097c24 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:
 .github/workflows/ci.yml  |  7 -------
 README.md                 |  2 +-
 build.properties.sample   |  1 -
 build.xml                 | 14 +++++++-------
 osgi.bnd                  |  8 ++++----
 src/manual/en_US/book.xml |  3 +++
 6 files changed, 15 insertions(+), 20 deletions(-)

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

Posted by 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 d1097c2432903a7a7c29a361819f08b1425e4fb9
Merge: 5a766442 35e1664e
Author: ddekany <dd...@apache.org>
AuthorDate: Fri Dec 8 22:55:56 2023 +0100

    Merge remote-tracking branch 'origin/2.3-gae' into FREEMARKER-35
    
    # Conflicts:
    #       build.properties.sample
    #       build.xml
    #       src/main/java/freemarker/core/UnformattableTemporalTypeException.java
    #       src/main/java/freemarker/template/SimpleTemporal.java

 .github/workflows/ci.yml  |  7 -------
 README.md                 |  2 +-
 build.properties.sample   |  1 -
 build.xml                 | 14 +++++++-------
 osgi.bnd                  |  8 ++++----
 src/manual/en_US/book.xml |  3 +++
 6 files changed, 15 insertions(+), 20 deletions(-)

diff --cc build.xml
index 22db00b5,8dc70332..375c1033
--- a/build.xml
+++ b/build.xml
@@@ -252,7 -253,7 +252,7 @@@
        debug="on" optimize="off" target="1.8" source="1.8" encoding="utf-8"
        includeantruntime="false"
        classpathref="ivy.dep.jsp2.0"
--      bootclasspath="${boot.classpath.j2se1.8}"
++      bootclasspath="${boot.classpath.j2se1.7}"
        includes="
          freemarker/ext/jsp/**,
          freemarker/ext/servlet/**,