svn commit: r1666952 - in /ofbiz/branches/release14.12: ./ .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:37:16 2015
New Revision: 1666952

URL: http://svn.apache.org/r1666952
Log:
Applied fix from trunk for revision: 1666949
===

Upgrade to latest bug fix release of Freemarker: 2.3.22


Added:
    ofbiz/branches/release14.12/framework/base/lib/freemarker-2.3.22.jar
      - copied unchanged from r1666949, ofbiz/trunk/framework/base/lib/freemarker-2.3.22.jar
Removed:
    ofbiz/branches/release14.12/framework/base/lib/freemarker-2.3.21.jar
Modified:
    ofbiz/branches/release14.12/   (props changed)
    ofbiz/branches/release14.12/.classpath
    ofbiz/branches/release14.12/LICENSE
    ofbiz/branches/release14.12/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java

Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 16 10:37:16 2015
@@ -8,4 +8,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939
+/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949

Modified: ofbiz/branches/release14.12/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/.classpath?rev=1666952&r1=1666951&r2=1666952&view=diff
==============================================================================
--- ofbiz/branches/release14.12/.classpath (original)
+++ ofbiz/branches/release14.12/.classpath Mon Mar 16 10:37:16 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/branches/release14.12/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/LICENSE?rev=1666952&r1=1666951&r2=1666952&view=diff
==============================================================================
--- ofbiz/branches/release14.12/LICENSE (original)
+++ ofbiz/branches/release14.12/LICENSE Mon Mar 16 10:37:16 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

Modified: ofbiz/branches/release14.12/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java?rev=1666952&r1=1666951&r2=1666952&view=diff
==============================================================================
--- ofbiz/branches/release14.12/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java (original)
+++ ofbiz/branches/release14.12/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java Mon Mar 16 10:37:16 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);