[freemarker-generator] branch master updated: FREEMARKER-182 Upgrade to Apache FreeMarker 2.3.31

[sgoeschl]

This is an automated email from the ASF dual-hosted git repository.

sgoeschl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git


The following commit(s) were added to refs/heads/master by this push:
     new 82bd725  FREEMARKER-182 Upgrade to Apache FreeMarker 2.3.31
82bd725 is described below

commit 82bd72594de252dadce9547522f659cf70181483
Author: Siegfried Goeschl <siegfried.goes...@gmail.com>
AuthorDate: Mon May 24 19:56:42 2021 +0200

    FREEMARKER-182 Upgrade to Apache FreeMarker 2.3.31
---
 .../freemarker/generator/cli/config/ConfigurationSupplier.java       | 2 +-
 .../java/org/apache/freemarker/generator/maven/UnitTestHelper.java   | 5 ++---
 .../apache/freemarker/generator/tools/freemarker/FreeMarkerTool.java | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

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 0739651..593f7f7 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
@@ -33,7 +33,7 @@ import static 
org.apache.freemarker.generator.base.FreeMarkerConstants.Configura
  */
 public class ConfigurationSupplier implements Supplier<Configuration> {
 
-    private static final Version FREEMARKER_VERSION = 
Configuration.VERSION_2_3_30;
+    private static final Version FREEMARKER_VERSION = 
Configuration.VERSION_2_3_31;
 
     private final Settings settings;
     private final Supplier<TemplateLoader> templateLoader;
diff --git 
a/freemarker-generator-maven-plugin/src/test/java/org/apache/freemarker/generator/maven/UnitTestHelper.java
 
b/freemarker-generator-maven-plugin/src/test/java/org/apache/freemarker/generator/maven/UnitTestHelper.java
index 96c70df..1675504 100644
--- 
a/freemarker-generator-maven-plugin/src/test/java/org/apache/freemarker/generator/maven/UnitTestHelper.java
+++ 
b/freemarker-generator-maven-plugin/src/test/java/org/apache/freemarker/generator/maven/UnitTestHelper.java
@@ -31,7 +31,7 @@ public class UnitTestHelper {
 
     public static Configuration configuration(File testDir) {
         try {
-            final Configuration configuration = new 
Configuration(Configuration.VERSION_2_3_30);
+            final Configuration configuration = new 
Configuration(Configuration.VERSION_2_3_31);
             configuration.setDefaultEncoding("UTF-8");
             configuration.setTemplateLoader(new FileTemplateLoader(testDir));
             return configuration;
@@ -58,8 +58,7 @@ public class UnitTestHelper {
                         .map(Path::toFile)
                         .forEach(File::delete);
             }
-        }
-        catch (IOException e) {
+        } catch (IOException e) {
             throw new RuntimeException("Failed to delete output directory", e);
         }
 
diff --git 
a/freemarker-generator-tools/src/main/java/org/apache/freemarker/generator/tools/freemarker/FreeMarkerTool.java
 
b/freemarker-generator-tools/src/main/java/org/apache/freemarker/generator/tools/freemarker/FreeMarkerTool.java
index 217aa8f..2ab8977 100644
--- 
a/freemarker-generator-tools/src/main/java/org/apache/freemarker/generator/tools/freemarker/FreeMarkerTool.java
+++ 
b/freemarker-generator-tools/src/main/java/org/apache/freemarker/generator/tools/freemarker/FreeMarkerTool.java
@@ -49,7 +49,7 @@ public class FreeMarkerTool {
      */
     public synchronized BeansWrapper getBeansWrapper() {
         if (beansWrapper == null) {
-            beansWrapper = new 
BeansWrapperBuilder(Configuration.VERSION_2_3_30).build();
+            beansWrapper = new 
BeansWrapperBuilder(Configuration.VERSION_2_3_31).build();
         }
         return beansWrapper;
     }