Remove unnecessary #setSettings(); Logging correction; VersionEditor for conversion between string and Version
Merge commit 'refs/pull/24/head' of https://github.com/apache/incubator-freemarker into 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/ed304385 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/ed304385 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/ed304385 Branch: refs/heads/3 Commit: ed304385653c612de88f9980586fdc2769f13a2e Parents: 3332072 85c4321 Author: ddekany <ddek...@apache.org> Authored: Mon Jun 19 11:27:57 2017 +0200 Committer: ddekany <ddek...@apache.org> Committed: Mon Jun 19 11:28:40 2017 +0200 ---------------------------------------------------------------------- .../freemarker/core/VersionEditorTest.java | 119 +++++++++++++++++++ .../apache/freemarker/core/VersionEditor.java | 53 +++++++++ .../spring/ConfigurationFactoryBean.java | 19 --- .../apache/freemarker/spring/_SpringLogs.java | 35 ++++++ .../SpringResourceTemplateLoader.java | 59 +++++++-- .../spring/ConfigurationFactoryBeanTest.java | 79 +++++++++--- .../freemarker/spring/VersionPropertyTest.java | 76 ++++++++++++ .../SpringResourceTemplateLoaderTest.java | 5 +- 8 files changed, 403 insertions(+), 42 deletions(-) ----------------------------------------------------------------------
