From c72b6ce0114d63180adfaa8f2b056032b5bd8144 Mon Sep 17 00:00:00 2001
From: sampadawagde <sampada.wagde@gmail.com>
Date: Fri, 17 Apr 2020 12:29:42 +0530
Subject: [PATCH 1/5] JAVA-916: Migrate jhipster to parent-boot-2

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

diff --git a/hystrix/pom.xml b/hystrix/pom.xml
index 8c505c9104..1cf8713b91 100644
--- a/hystrix/pom.xml
+++ b/hystrix/pom.xml
@@ -8,9 +8,9 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-1</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-1</relativePath>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>

From 47595b7ccc555d5eee4b18fb192e4b4e9e1e3bcc Mon Sep 17 00:00:00 2001
From: sampadawagde <sampada.wagde@gmail.com>
Date: Sat, 18 Apr 2020 19:11:47 +0530
Subject: [PATCH 2/5] JAVA-914: Removed empty pom files

---
 cas/cas-server/pom.xml | 0
 cas/pom.xml            | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 cas/cas-server/pom.xml
 delete mode 100644 cas/pom.xml

diff --git a/cas/cas-server/pom.xml b/cas/cas-server/pom.xml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/cas/pom.xml b/cas/pom.xml
deleted file mode 100644
index e69de29bb2..0000000000

From 576bf0290361f26d7df8ea78d394239e8ff80c72 Mon Sep 17 00:00:00 2001
From: sampadawagde <sampada.wagde@gmail.com>
Date: Sat, 18 Apr 2020 19:12:36 +0530
Subject: [PATCH 3/5] JAVA-914: Updated module README to include relevant info

---
 cas/README.md | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/cas/README.md b/cas/README.md
index 16775a8a02..6ceeaea0c4 100644
--- a/cas/README.md
+++ b/cas/README.md
@@ -1,7 +1,18 @@
 ## CAS
 
-This module contains articles about the Central Authentication Service (CAS)
+This module contains articles about the Central Authentication Service (CAS).
+
+The module consists of 2 submodules:
+1. `cas-server` - it requires JDK11 and uses the Gradle War Overlay style to ease setup and deployment. To  start the server, simply run:
+
+`./gradlew run
+  -Dorg.gradle.java.home=$JAVA11_HOME
+  -Pargs="-Dcas.standalone.configurationDirectory=/cas-server/src/main/resources/etc/cas/config"`
+
+The server starts at https://localhost:8443. `casuser`/`Mellon` are the username and password for logging in.
+
+2. `cas-secured-app` - A Maven based Springboot Application
 
 ### Relevant Articles: 
 
-- [CAS SSO With Spring Security](baeldung.com/spring-security-cas-sso)
\ No newline at end of file
+- [CAS SSO With Spring Security](https://www.baeldung.com/spring-security-cas-sso)
\ No newline at end of file

From e82bdc46d4c931cb14b03e8f69d433990d9df640 Mon Sep 17 00:00:00 2001
From: sampadawagde <sampada.wagde@gmail.com>
Date: Sat, 18 Apr 2020 19:13:22 +0530
Subject: [PATCH 4/5] JAVA-914: Updated main pom to include cas as commented
 module

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

diff --git a/pom.xml b/pom.xml
index 9e3b354d74..394a566011 100644
--- a/pom.xml
+++ b/pom.xml
@@ -387,7 +387,7 @@
                 <module>bazel</module>
                 <module>blade</module>
                 <module>bootique</module>
-
+                <!-- <module>cas</module> --> <!-- Not a maven project -->
                 <module>cdi</module>
                 <module>checker-plugin</module>
                 <!-- <module>clojure</module> --> <!-- Not a maven project -->
@@ -900,7 +900,7 @@
                 <module>bazel</module>
                 <module>blade</module>
                 <module>bootique</module>
-
+                <!-- <module>cas</module> --> <!-- Not a maven project -->
                 <module>cdi</module>
                 <module>checker-plugin</module>
                 <!-- <module>clojure</module> --> <!-- Not a maven project -->

From 55c978c44aeac47437b28fe6850a695df9b8f5a6 Mon Sep 17 00:00:00 2001
From: sampadawagde <sampada.wagde@gmail.com>
Date: Sat, 18 Apr 2020 19:17:28 +0530
Subject: [PATCH 5/5] Revert "JAVA-916: Migrate jhipster to parent-boot-2"

This reverts commit c72b6ce0114d63180adfaa8f2b056032b5bd8144.
---
 hystrix/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hystrix/pom.xml b/hystrix/pom.xml
index 1cf8713b91..8c505c9104 100644
--- a/hystrix/pom.xml
+++ b/hystrix/pom.xml
@@ -8,9 +8,9 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
+        <artifactId>parent-boot-1</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
+        <relativePath>../parent-boot-1</relativePath>
     </parent>
 
     <dependencies>