From 81b2f70dac328d96d788d7746a57fbeb3978e543 Mon Sep 17 00:00:00 2001
From: Filip Hrisafov <filip.hrisafov@gmail.com>
Date: Sun, 2 Oct 2022 19:36:20 +0200
Subject: [PATCH] #3039 Upgrade FreeMarker to 2.3.31

---
 distribution/pom.xml                    | 2 +-
 distribution/src/main/assembly/dist.xml | 6 +-----
 parent/pom.xml                          | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/distribution/pom.xml b/distribution/pom.xml
index 11fb7c9f3..be82f52b3 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -66,7 +66,7 @@
                                     <groupId>org.freemarker</groupId>
                                     <artifactId>freemarker</artifactId>
                                     <outputDirectory>${project.build.directory}/freemarker-unpacked</outputDirectory>
-                                    <includes>META-INF/LICENSE.txt,META-INF/NOTICE.txt</includes>
+                                    <includes>META-INF/LICENSE</includes>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>
diff --git a/distribution/src/main/assembly/dist.xml b/distribution/src/main/assembly/dist.xml
index f519e5fc9..f0c727f8d 100644
--- a/distribution/src/main/assembly/dist.xml
+++ b/distribution/src/main/assembly/dist.xml
@@ -42,11 +42,7 @@
             <outputDirectory>/</outputDirectory>
         </file>
         <file>
-            <source>target/freemarker-unpacked/META-INF/NOTICE.txt</source>
-            <outputDirectory>/</outputDirectory>
-        </file>
-        <file>
-            <source>target/freemarker-unpacked/META-INF/LICENSE.txt</source>
+            <source>target/freemarker-unpacked/META-INF/LICENSE</source>
             <outputDirectory>etc/freemarker</outputDirectory>
         </file>
         <file>
diff --git a/parent/pom.xml b/parent/pom.xml
index 3f536034c..e87db1455 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -109,7 +109,7 @@
             <dependency>
                 <groupId>org.freemarker</groupId>
                 <artifactId>freemarker</artifactId>
-                <version>2.3.21</version>
+                <version>2.3.31</version>
             </dependency>
             <dependency>
                 <groupId>org.assertj</groupId>