freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [27/27] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae' into 2.3
Date Sat, 03 Feb 2018 21:17:10 GMT
Merge remote-tracking branch 'origin/2.3-gae' into 2.3


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/4ffe4b35
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/4ffe4b35
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/4ffe4b35

Branch: refs/heads/2.3
Commit: 4ffe4b354a1377aef80d886e83cc0fc9c747fe04
Parents: bda2c83 5f4b7f3
Author: ddekany <ddekany@apache.org>
Authored: Sat Feb 3 22:16:14 2018 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Sat Feb 3 22:16:14 2018 +0100

----------------------------------------------------------------------
 .travis.yml                                     |  17 +++
 README.md                                       |  20 +++-
 RELEASE-NOTES                                   |   2 +-
 build.xml                                       |   4 +-
 ivy.xml                                         |   6 +-
 src/dist/bin/documentation/index.html           |   4 +-
 src/main/java/freemarker/core/BuiltIn.java      |   2 +-
 .../java/freemarker/ext/beans/BeansWrapper.java |  49 +++++++-
 .../freemarker/ext/beans/ClassIntrospector.java |   4 +-
 .../ext/beans/MethodAppearanceFineTuner.java    |  13 ++-
 src/main/java/freemarker/ext/dom/package.html   |   2 +-
 .../freemarker/ext/jsp/JspTagModelBase.java     |   2 +-
 .../ext/jsp/SimpleTagDirectiveModel.java        |   8 +-
 .../java/freemarker/ext/jsp/TaglibFactory.java  |   2 +-
 .../java/freemarker/ext/servlet/package.html    |   2 +-
 src/main/java/freemarker/template/Template.java |   2 +-
 .../freemarker/template/TemplateNodeModel.java  |   2 +-
 src/main/java/freemarker/template/package.html  |   2 +-
 .../resources/freemarker/version.properties     |   1 -
 src/manual/en_US/apache-incubator.png           | Bin 0 -> 7167 bytes
 src/manual/en_US/book.xml                       | 114 +++++++++++++++----
 src/manual/en_US/docgen.cjson                   |  29 +++--
 src/manual/zh_CN/apache-incubator.png           | Bin 0 -> 7167 bytes
 src/manual/zh_CN/book.xml                       |  22 ++--
 src/manual/zh_CN/docgen.cjson                   |  25 ++--
 .../freemarker/core/SequenceBuiltInTest.java    |   2 -
 .../ext/beans/FineTuneMethodAppearanceTest.java |  78 ++++++++++++-
 .../test/templatesuite/TemplateTestCase.java    |   7 ++
 28 files changed, 334 insertions(+), 87 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4ffe4b35/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index eac6618,0be09d4..d58572a
--- a/build.xml
+++ b/build.xml
@@@ -835,9 -835,10 +835,9 @@@
    
    <name>Apache FreeMarker</name>
    <description>
 -    Google App Engine compliant variation of FreeMarker.
      FreeMarker is a "template engine"; a generic tool to generate text output based on templates.
    </description>
-   <url>http://freemarker.org/</url>
+   <url>https://freemarker.apache.org/</url>
    <organization>
      <name>Apache Software Foundation</name>
      <url>http://apache.org</url>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4ffe4b35/src/main/java/freemarker/template/Template.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4ffe4b35/src/main/resources/freemarker/version.properties
----------------------------------------------------------------------


Mime
View raw message