From de684bc3ccf0b79a8d23ce76e1a4b975f84cabec Mon Sep 17 00:00:00 2001
From: Dhawal Kapil <dhawalkapil@gmail.com>
Date: Thu, 6 Sep 2018 23:38:54 +0530
Subject: [PATCH 1/3] BAEL-8842 Update spring-freemarker project

- Updated freemarker module's spring and freemarker version to latest
---
 spring-freemarker/pom.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/spring-freemarker/pom.xml b/spring-freemarker/pom.xml
index 96607f7f10..cebbb47713 100644
--- a/spring-freemarker/pom.xml
+++ b/spring-freemarker/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.freemarker.example</groupId>
+    <groupId>com.baeldung.freemarker</groupId>
     <artifactId>spring-freemarker</artifactId>
     <packaging>war</packaging>
     <version>1.0-SNAPSHOT</version>
@@ -9,8 +9,8 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <artifactId>parent-spring-5</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
     </parent>
 
     <dependencies>
@@ -48,8 +48,8 @@
     </dependencies>
 
     <properties>
-        <spring.version>4.3.4.RELEASE</spring.version>
-        <freemarker.version>2.3.23</freemarker.version>
+        <spring.version>5.0.8.RELEASE</spring.version>
+        <freemarker.version>2.3.28</freemarker.version>
         <servletapi.version>3.1.0</servletapi.version>
         <failOnMissingWebXml>false</failOnMissingWebXml>
     </properties>

From d1baef79973e6512655de05bf9e5e62fcf6e0983 Mon Sep 17 00:00:00 2001
From: Dhawal Kapil <dhawalkapil@gmail.com>
Date: Fri, 7 Sep 2018 00:33:33 +0530
Subject: [PATCH 2/3] Update pom.xml

---
 spring-freemarker/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-freemarker/pom.xml b/spring-freemarker/pom.xml
index cebbb47713..9da0f1430d 100644
--- a/spring-freemarker/pom.xml
+++ b/spring-freemarker/pom.xml
@@ -9,7 +9,7 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-spring-5</artifactId>
+        <artifactId>parent-modules</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
@@ -54,4 +54,4 @@
         <failOnMissingWebXml>false</failOnMissingWebXml>
     </properties>
 
-</project>
\ No newline at end of file
+</project>

From 873deb1d65bfa145506e06319c637b9965b7292d Mon Sep 17 00:00:00 2001
From: Dhawal Kapil <dhawalkapil@gmail.com>
Date: Fri, 7 Sep 2018 00:33:50 +0530
Subject: [PATCH 3/3] Update pom.xml

---
 spring-freemarker/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-freemarker/pom.xml b/spring-freemarker/pom.xml
index 9da0f1430d..f0626195fd 100644
--- a/spring-freemarker/pom.xml
+++ b/spring-freemarker/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>