svn commit: r1666949 - in /ofbiz/trunk: .classpath LICENSE framework/base/lib/freemarker-2.3.21.jar framework/base/lib/freemarker-2.3.22.jar framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java

[jacopoc]

Author: jacopoc
Date: Mon Mar 16 10:31:13 2015
New Revision: 1666949

URL: http://svn.apache.org/r1666949
Log:
Upgrade to latest bug fix release of Freemarker: 2.3.22

Added:
    ofbiz/trunk/framework/base/lib/freemarker-2.3.22.jar   (with props)
Removed:
    ofbiz/trunk/framework/base/lib/freemarker-2.3.21.jar
Modified:
    ofbiz/trunk/.classpath
    ofbiz/trunk/LICENSE
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java

Modified: ofbiz/trunk/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=1666949&r1=1666948&r2=1666949&view=diff
==============================================================================
--- ofbiz/trunk/.classpath (original)
+++ ofbiz/trunk/.classpath Mon Mar 16 10:31:13 2015
@@ -20,7 +20,7 @@
     <classpathentry kind="lib" path="framework/base/lib/clhm-release-1.0-lru.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/hamcrest-all-1.2.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/fop-1.1.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/freemarker-2.3.21.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/freemarker-2.3.22.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/httpclient-4.3.6.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/httpclient-cache-4.3.6.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/httpcore-4.3.3.jar"/>

Modified: ofbiz/trunk/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=1666949&r1=1666948&r2=1666949&view=diff
==============================================================================
--- ofbiz/trunk/LICENSE (original)
+++ ofbiz/trunk/LICENSE Mon Mar 16 10:31:13 2015
@@ -18,7 +18,7 @@ framework/base/lib/avalon-framework-4.2.
 framework/base/lib/batik-all-1.7.jar
 framework/base/lib/barcode4j-2.1-barcode4j-fop-ext-complete.jar
 framework/base/lib/clhm-release-1.0-lru.jar
-framework/base/lib/freemarker-2.3.21.jar
+framework/base/lib/freemarker-2.3.22.jar
 framework/base/lib/httpclient-4.3.6.jar
 framework/base/lib/httpclient-cache-4.3.6.jar
 framework/base/lib/httpcore-4.3.3.jar

Added: ofbiz/trunk/framework/base/lib/freemarker-2.3.22.jar
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/lib/freemarker-2.3.22.jar?rev=1666949&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/trunk/framework/base/lib/freemarker-2.3.22.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java?rev=1666949&r1=1666948&r2=1666949&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java Mon Mar 16 10:31:13 2015
@@ -77,7 +77,7 @@ public class FreeMarkerWorker {
 
     public static final String module = FreeMarkerWorker.class.getName();
 
-    public static final Version version = new Version(2, 3, 21);
+    public static final Version version = new Version(2, 3, 22);
 
     // use soft references for this so that things from Content records don't kill all of our memory, or maybe not for performance reasons... hmmm, leave to config file...
     private static final UtilCache<String, Template> cachedTemplates = UtilCache.createUtilCache("template.ftl.general", 0, 0, false);