From bc3d33151c5c20332e301e06d0a263806edd9502 Mon Sep 17 00:00:00 2001
From: Michael C Good <31810784+michaelcgood@users.noreply.github.com>
Date: Mon, 6 Nov 2017 17:44:53 -0500
Subject: [PATCH] BAEL-1238 (#2974)

* michael.good703@gmail.com

michael.good703@gmail.com

* michael.good703@gmail.com

michael.good703@gmail.com

* michael.good703@gmail.com

michael.good703@gmail.com

* update

* michael.good703@gmail.com

Had to add @SpringBootApplication(exclude = MySQLAutoconfiguration.class)

* Updated for 3.3.0.Final

BAEL-1238

* Update pom.xml

* BAEL-1238

Added new module spring-boot-keycloak and removed Keycloak code from spring-boot module

* Minor changes to pom.xml

* Update CustomConverterTest.java

* Update StringToEmployeeConverter.java

* Update GenericBigDecimalConverter.java

* Update MyFeatures.java

* Update .gitignore

* Formatting changes

* "Resolving conflicts"

* Updated spring-boot to remove keycloak

* Updated to see

* Update

* Updated

* Found remnant file and deleted it

* Update pom.xml

Added spring-boot-keycloak module

* Added reference to parent-boot-5

I changed the parent from org.springframework.boot to parent-boot-5.

* Update GenericBigDecimalConverter.java

Copy current GenericBigDecimalConverter to resolve any conflicts

* Update StringToEmployeeConverter.java

Copy current version to resolve any conflicts

* Update pom.xml

* Update pom.xml

* Delete remnant files

* Updated pom.xml

* Update pom.xml
---
 pom.xml                      |  1 +
 spring-boot-keycloak/pom.xml | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index c2dee7d2f9..8fa402b69e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,6 +149,7 @@
         <module>spring-batch</module>
         <module>spring-bom</module>
         <module>spring-boot</module>
+	<module>spring-boot-keycloak</module>
         <module>spring-boot-bootstrap</module>
         <module>spring-cloud-data-flow</module>
         <module>spring-cloud</module>
diff --git a/spring-boot-keycloak/pom.xml b/spring-boot-keycloak/pom.xml
index 657f96a265..ab76d0af43 100644
--- a/spring-boot-keycloak/pom.xml
+++ b/spring-boot-keycloak/pom.xml
@@ -12,10 +12,12 @@
 	<description>This is a simple application demonstrating integration between Keycloak and Spring Boot.</description>
 
 	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.8.RELEASE</version>
-		<relativePath /> <!-- lookup parent from repository -->
+
+		<groupId>com.baeldung</groupId>
+		<artifactId>parent-boot-4</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>../parent-boot-4</relativePath>
+
 	</parent>
 
 	<properties>