Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 5C5E8200D13 for ; Sat, 30 Sep 2017 12:46:47 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5AA9C1609D5; Sat, 30 Sep 2017 10:46:47 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 79D6E1609C8 for ; Sat, 30 Sep 2017 12:46:46 +0200 (CEST) Received: (qmail 77367 invoked by uid 500); 30 Sep 2017 10:46:45 -0000 Mailing-List: contact notifications-help@freemarker.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@freemarker.incubator.apache.org Delivered-To: mailing list notifications@freemarker.incubator.apache.org Received: (qmail 77358 invoked by uid 99); 30 Sep 2017 10:46:45 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 30 Sep 2017 10:46:45 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 322991A379D for ; Sat, 30 Sep 2017 10:46:45 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.221 X-Spam-Level: X-Spam-Status: No, score=-4.221 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id o-1jIpr39EUT for ; Sat, 30 Sep 2017 10:46:43 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 3DAAD5FB2D for ; Sat, 30 Sep 2017 10:46:42 +0000 (UTC) Received: (qmail 77345 invoked by uid 99); 30 Sep 2017 10:46:41 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 30 Sep 2017 10:46:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 65D5FF5759; Sat, 30 Sep 2017 10:46:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ddekany@apache.org To: notifications@freemarker.incubator.apache.org Date: Sat, 30 Sep 2017 10:46:41 -0000 Message-Id: <6613ce49de104d828799cd08be18c856@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] incubator-freemarker git commit: Manual: Updated some incompatibleImprovements version numbers in examples archived-at: Sat, 30 Sep 2017 10:46:47 -0000 Repository: incubator-freemarker Updated Branches: refs/heads/2.3 a86146b19 -> 9459a40cb Manual: Updated some incompatibleImprovements version numbers in examples Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/a3671957 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/a3671957 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/a3671957 Branch: refs/heads/2.3 Commit: a367195722c6ae024f9a041e470399ab660dc6bc Parents: 2c12980 Author: ddekany Authored: Sat Sep 30 11:59:20 2017 +0200 Committer: ddekany Committed: Sat Sep 30 11:59:20 2017 +0200 ---------------------------------------------------------------------- src/manual/en_US/book.xml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a3671957/src/manual/en_US/book.xml ---------------------------------------------------------------------- diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml index 7ba5852..5da4c42 100644 --- a/src/manual/en_US/book.xml +++ b/src/manual/en_US/book.xml @@ -7672,7 +7672,7 @@ public class RepeatDirective implements TemplateDirectiveModel { DefaultObjectWrapper has an incompatibleImprovements property, that's - highly recommended to set to 2.3.22 or higher (see the API documentation for the effects). How to set it: @@ -7701,13 +7701,13 @@ public class RepeatDirective implements TemplateDirectiveModel { If you are using the builder API: - ... = new DefaultObjectWrapperBuilder(Configuration.VERSION_2_3_25).build() + ... = new DefaultObjectWrapperBuilder(Configuration.VERSION_2_3_27).build() Or, if you are using the constructor: - ... = new DefaultObjectWrapper(Configuration.VERSION_2_3_25) + ... = new DefaultObjectWrapper(Configuration.VERSION_2_3_27) @@ -7716,7 +7716,7 @@ public class RepeatDirective implements TemplateDirectiveModel { (*.properties file or java.util.Properties object): - object_wrapper=DefaultObjectWrapper(2.3.25) + object_wrapper=DefaultObjectWrapper(2.3.27) @@ -7728,7 +7728,7 @@ public class RepeatDirective implements TemplateDirectiveModel { <init-param> <param-name>object_wrapper</param-name> - <param-value>DefaultObjectWrapper(2.3.25)</param-value> + <param-value>DefaultObjectWrapper(2.3.27)</param-value> </init-param> @@ -7889,7 +7889,7 @@ public class MyAppObjectWrapper extends DefaultObjectWrapper { our object wrapper in: // Where you initialize the cfg *singleton* (happens just once in the application life-cycle): -cfg = new Configuration(Configuration.VERSION_2_3_25); +cfg = new Configuration(Configuration.VERSION_2_3_27); ... cfg.setObjectWrapper(new MyAppObjectWrapper(cfg.getIncompatibleImprovements())); @@ -7897,7 +7897,7 @@ cfg.setObjectWrapper(new MyAppObjectWrapper(cfg.getIncompatibleImprovements())); java.util.Properties instead (and let's say it's also a .properties file): - object_wrapper=com.example.myapp.freemarker.MyAppObjectWrapper(2.3.25) + object_wrapper=com.example.myapp.freemarker.MyAppObjectWrapper(2.3.27) @@ -7961,7 +7961,7 @@ cfg.setObjectWrapper(new MyAppObjectWrapper(cfg.getIncompatibleImprovements())); the configuration with the setSharedVariable methods: - Configuration cfg = new Configuration(Configuration.VERSION_2_3_25); + Configuration cfg = new Configuration(Configuration.VERSION_2_3_27); ... cfg.setSharedVariable("warp", new WarpDirective()); cfg.setSharedVariable("company", "Foo Inc."); @@ -8162,10 +8162,10 @@ cfg.setSharedVariable("company", "Foo Inc."); the settings with the setter methods of the Configuration object, fore example: - Configuration myCfg = new Configuration(Configuration.VERSION_2_3_25); + Configuration myCfg = new Configuration(Configuration.VERSION_2_3_27); myCfg.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER); myCfg.setDefaultEncoding("UTF-8"); -DefaultObjectWrapperBuilder owb = new DefaultObjectWrapperBuilder(Configuration.VERSION_2_3_25); +DefaultObjectWrapperBuilder owb = new DefaultObjectWrapperBuilder(Configuration.VERSION_2_3_27); owb.setForceLegacyNonListCollections(false); owb.setDefaultDateType(TemplateDateModel.DATETIME); myCfg.setObjectWrapper(owb.build()); @@ -8191,12 +8191,12 @@ myCfg.setObjectWrapper(owb.build()); class="org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer"> <property name="freemarkerSettings"> <props> - <prop key="incompatible_improvements">2.3.25</prop> + <prop key="incompatible_improvements">2.3.27</prop> <prop key="template_exception_handler">rethrow</prop> <prop key="default_encoding">UTF-8</prop> <prop key="object_wrapper"> DefaultObjectWrapper( - 2.3.25, + 2.3.27, forceLegacyNonListCollections = false, defaultDateType = freemarker.template.TemplateDateModel.DATETIME) </prop> @@ -8208,11 +8208,11 @@ myCfg.setObjectWrapper(owb.build()); which looks for a freemarker.properties in the classpath: - incompatible_improvements=2.3.25 + incompatible_improvements=2.3.27 template_exception_handler=rethrow default_encoding=UTF-8 object_wrapper=DefaultObjectWrapper( \ - 2.3.25, \ + 2.3.27, \ forceLegacyNonListCollections = false, \ defaultDateType = freemarker.template.TemplateDateModel.DATETIME) @@ -10049,14 +10049,14 @@ cfg.setNumberFormat("@ua 0.####;; roundingMode=halfUp"); freemarker.template.Configuration object like: - ... = new Configuration(Configuration.VERSION_2_3_25) + ... = new Configuration(Configuration.VERSION_2_3_27) Or, alter the Configuration singleton where you initialize its other settings like: - cfg.setIncompatibleImprovements(Configuration.VERSION_2_3_25) + cfg.setIncompatibleImprovements(Configuration.VERSION_2_3_27) @@ -10064,7 +10064,7 @@ cfg.setNumberFormat("@ua 0.####;; roundingMode=halfUp"); (*.properties file or java.util.Properties object), add: - incompatible_improvements=2.3.25 + incompatible_improvements=2.3.27 @@ -10075,7 +10075,7 @@ cfg.setNumberFormat("@ua 0.####;; roundingMode=halfUp"); <init-param> <param-name>incompatible_improvements</param-name> - <param-value>2.3.25</param-value> + <param-value>2.3.27</param-value> </init-param> @@ -11281,7 +11281,7 @@ TemplateHashModel roundingModeEnums = <!-- FreeMarker engine settings: --> <init-param> <param-name>incompatible_improvements</param-name> - <param-value>2.3.25</param-value> + <param-value>2.3.27</param-value> <!-- Recommended to set to a high value. See: http://freemarker.org/docs/pgui_config_incompatible_improvements.html