freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [1/2] incubator-freemarker-docgen git commit: Log FreeMarker version. Also increased it to 2.3.35.
Date Mon, 23 Jan 2017 13:03:38 GMT
Repository: incubator-freemarker-docgen
Updated Branches:
  refs/heads/master 58d83ee4d -> 1a6495999


Log FreeMarker version. Also increased it to 2.3.35.


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

Branch: refs/heads/master
Commit: f99ec0ba90317456b8f48d6596aacb36f6696291
Parents: 58d83ee
Author: ddekany <ddekany@apache.org>
Authored: Mon Jan 23 14:01:56 2017 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Mon Jan 23 14:02:29 2017 +0100

----------------------------------------------------------------------
 .classpath                                    | 2 +-
 src/main/org/freemarker/docgen/Transform.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/f99ec0ba/.classpath
----------------------------------------------------------------------
diff --git a/.classpath b/.classpath
index a3c6ca7..41463ae 100644
--- a/.classpath
+++ b/.classpath
@@ -8,6 +8,6 @@
 	<classpathentry kind="lib" path="ide-dependencies/jing-20091111.jar"/>
 	<classpathentry kind="lib" path="ide-dependencies/saxon-8.7.jar"/>
 	<classpathentry kind="lib" path="ide-dependencies/xercesImpl-2.9.1.jar"/>
-	<classpathentry kind="lib" path="ide-dependencies/freemarker-2.3.25-incubating.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/FreeMarker-2.3-gae"/>
 	<classpathentry kind="output" path=".bin"/>
 </classpath>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/f99ec0ba/src/main/org/freemarker/docgen/Transform.java
----------------------------------------------------------------------
diff --git a/src/main/org/freemarker/docgen/Transform.java b/src/main/org/freemarker/docgen/Transform.java
index c379bf3..3a21f03 100644
--- a/src/main/org/freemarker/docgen/Transform.java
+++ b/src/main/org/freemarker/docgen/Transform.java
@@ -1240,7 +1240,8 @@ public final class Transform {
             throw new BugException(e);
         }
 
-        fmConfig = new Configuration(Configuration.VERSION_2_3_24);
+        logger.info("Using FreeMarker " + Configuration.getVersion());
+        fmConfig = new Configuration(Configuration.VERSION_2_3_25);
 
         TemplateLoader templateLoader = new ClassTemplateLoader(
                 Transform.class, "templates");


Mime
View raw message