You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by sg...@apache.org on 2021/02/09 01:20:13 UTC
[freemarker-generator] 01/01: FREEMARKER-175 [freemarker-generator]
Use latest FreeMarker version
This is an automated email from the ASF dual-hosted git repository.
sgoeschl pushed a commit to branch FREEMARKER-175
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
commit 97a94188d256870844367b0b8298e1d51a5402d3
Author: Siegfried Goeschl <si...@gmail.com>
AuthorDate: Tue Feb 9 02:19:56 2021 +0100
FREEMARKER-175 [freemarker-generator] Use latest FreeMarker version
---
freemarker-generator-cli/CHANGELOG.md | 2 ++
.../apache/freemarker/generator/cli/config/ConfigurationSupplier.java | 3 +--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/freemarker-generator-cli/CHANGELOG.md b/freemarker-generator-cli/CHANGELOG.md
index 9fa802d..0e2c798 100644
--- a/freemarker-generator-cli/CHANGELOG.md
+++ b/freemarker-generator-cli/CHANGELOG.md
@@ -20,6 +20,7 @@ All notable changes to this project will be documented in this file. We try to a
* [FREEMARKER-129] Provide a `toString()` method for all tools
### Changed
+* [FREEMARKER-175] Use latest FreeMarker version
* [FREEMARKER-173] Allow to pass arbitrary key/value pairs to DataSource when using NamedURIs
* [FREEMARKER-172] Use lower-case keys for DataSource metadata map
* [FREEMARKER-148] Make usage of "DataSources" more "Freemarker" like
@@ -74,3 +75,4 @@ All notable changes to this project will be documented in this file. We try to a
[FREEMARKER-172]: https://issues.apache.org/jira/browse/FREEMARKER-172
[FREEMARKER-173]: https://issues.apache.org/jira/browse/FREEMARKER-173
[FREEMARKER-174]: https://issues.apache.org/jira/browse/FREEMARKER-174
+[FREEMARKER-175]: https://issues.apache.org/jira/browse/FREEMARKER-175
diff --git a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/ConfigurationSupplier.java b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/ConfigurationSupplier.java
index 820f50d..0739651 100644
--- a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/ConfigurationSupplier.java
+++ b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/ConfigurationSupplier.java
@@ -25,7 +25,6 @@ import java.util.Properties;
import java.util.function.Supplier;
import java.util.stream.Stream;
-import static freemarker.template.Configuration.VERSION_2_3_29;
import static java.util.Objects.requireNonNull;
import static org.apache.freemarker.generator.base.FreeMarkerConstants.Configuration.SETTING_PREFIX;
@@ -34,7 +33,7 @@ import static org.apache.freemarker.generator.base.FreeMarkerConstants.Configura
*/
public class ConfigurationSupplier implements Supplier<Configuration> {
- private static final Version FREEMARKER_VERSION = VERSION_2_3_29;
+ private static final Version FREEMARKER_VERSION = Configuration.VERSION_2_3_30;
private final Settings settings;
private final Supplier<TemplateLoader> templateLoader;