From 48046cbcc75555f2f21bbdf2da505a915d60c7d5 Mon Sep 17 00:00:00 2001
From: "Addula, Ajay Kumar Reddy" <ajay.kumar6@anthem.com>
Date: Thu, 30 Jul 2020 17:17:39 -0400
Subject: [PATCH 1/3] adding Suffix and Prefix

---
 .../java/com/antheminc/oss/nimbus/entity/person/Name.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nimbus-core/src/main/java/com/antheminc/oss/nimbus/entity/person/Name.java b/nimbus-core/src/main/java/com/antheminc/oss/nimbus/entity/person/Name.java
index 85e9748fb..44fc40d3b 100644
--- a/nimbus-core/src/main/java/com/antheminc/oss/nimbus/entity/person/Name.java
+++ b/nimbus-core/src/main/java/com/antheminc/oss/nimbus/entity/person/Name.java
@@ -39,6 +39,10 @@ public class Name extends AbstractEntity.IdLong {
 
 	private String middleName;
 	
+	private String suffix;
+	
+	private String prefix;
+	
 	@JsonIgnore
 	private String fullName;
 	

From 2b354243d3da1990f9ba392ad29bf1a7cd5d127c Mon Sep 17 00:00:00 2001
From: "Addula, Ajay Kumar Reddy" <ajay.kumar6@anthem.com>
Date: Sun, 2 Aug 2020 17:29:38 -0400
Subject: [PATCH 2/3] pom version 1.3.1.M14

---
 nimbus-core/pom.xml          | 2 +-
 nimbus-entity-dsl/pom.xml    | 2 +-
 nimbus-extn-activiti/pom.xml | 2 +-
 nimbus-starter/pom.xml       | 4 ++--
 nimbus-test/pom.xml          | 2 +-
 nimbus-ui/pom.xml            | 2 +-
 pom.xml                      | 4 ++--
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/nimbus-core/pom.xml b/nimbus-core/pom.xml
index 858699ae2..99f002ea0 100644
--- a/nimbus-core/pom.xml
+++ b/nimbus-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.antheminc.oss</groupId>
 		<artifactId>nimbus-parent</artifactId>
-		<version>1.3.1.M6</version>
+		<version>1.3.1.M14</version>
 	</parent>
 	
 	<artifactId>nimbus-core</artifactId>
diff --git a/nimbus-entity-dsl/pom.xml b/nimbus-entity-dsl/pom.xml
index a294d9e3d..c735cbcb1 100644
--- a/nimbus-entity-dsl/pom.xml
+++ b/nimbus-entity-dsl/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.antheminc.oss</groupId>
 		<artifactId>nimbus-parent</artifactId>
-		<version>1.3.1.M6</version>
+		<version>1.3.1.M14</version>
 	</parent>
 
 	<artifactId>nimbus-entity-dsl</artifactId> 
diff --git a/nimbus-extn-activiti/pom.xml b/nimbus-extn-activiti/pom.xml
index 033b9a510..1813b3316 100644
--- a/nimbus-extn-activiti/pom.xml
+++ b/nimbus-extn-activiti/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.antheminc.oss</groupId>
 		<artifactId>nimbus-parent</artifactId>
-		<version>1.3.1.M6</version>
+		<version>1.3.1.M14</version>
 	</parent>
 	
 	<artifactId>nimbus-extn-activiti</artifactId>
diff --git a/nimbus-starter/pom.xml b/nimbus-starter/pom.xml
index f765504ff..f13d77876 100644
--- a/nimbus-starter/pom.xml
+++ b/nimbus-starter/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.antheminc.oss</groupId>
 	<artifactId>nimbus-starter</artifactId>
-    <version>1.3.1.M6</version>
+    <version>1.3.1.M14</version>
 	<url>http://www.oss.antheminc.com/</url>
 	<developers>
 		<developer>
@@ -57,7 +57,7 @@
 	<description>framework starter project</description>
 
 	<properties>
-		<nimbus.version>1.3.1.M6</nimbus.version>
+		<nimbus.version>1.3.1.M14</nimbus.version>
 	</properties>
 
 	<dependencies>	
diff --git a/nimbus-test/pom.xml b/nimbus-test/pom.xml
index c144a4b21..443d4fd35 100644
--- a/nimbus-test/pom.xml
+++ b/nimbus-test/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.antheminc.oss</groupId>
 		<artifactId>nimbus-parent</artifactId>
-		<version>1.3.1.M6</version>
+		<version>1.3.1.M14</version>
 	</parent>
   	
   	<artifactId>nimbus-test</artifactId>
diff --git a/nimbus-ui/pom.xml b/nimbus-ui/pom.xml
index 3f45d92d2..63a49ce9b 100644
--- a/nimbus-ui/pom.xml
+++ b/nimbus-ui/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.antheminc.oss</groupId>
 		<artifactId>nimbus-parent</artifactId>
-		<version>1.3.1.M6</version>
+		<version>1.3.1.M14</version>
 	</parent>
 	
 	<name>nimbus-ui</name>
diff --git a/pom.xml b/pom.xml
index 67a404151..b183d5b84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.antheminc.oss</groupId>
 	<artifactId>nimbus-parent</artifactId>
-	<version>1.3.1.M6</version>
+	<version>1.3.1.M14</version>
 	<name>nimbus-parent</name>
 	<packaging>pom</packaging>
 	<description>Anthem open source nimbus project </description>
@@ -75,7 +75,7 @@
         <univocity.version>2.8.1</univocity.version>
         <!-- nimbus-core -->
         <parentDir>..</parentDir>
-        <nimbus.version>1.3.1.M6</nimbus.version>
+        <nimbus.version>1.3.1.M14</nimbus.version>
         <nimbus.core.version>${nimbus.version}</nimbus.core.version>
         <nimbus.ui.version>${nimbus.version}</nimbus.ui.version>
         <nimbus.dsl.version>${nimbus.core.version}</nimbus.dsl.version> <!-- DSL matches core's version -->

From cdfe5144f8aec027161c39ce67419a07df988c95 Mon Sep 17 00:00:00 2001
From: "Addula, Ajay Kumar Reddy" <ajay.kumar6@anthem.com>
Date: Mon, 31 Aug 2020 12:41:39 -0400
Subject: [PATCH 3/3] fix merge conflicts

---
 nimbus-extn-activiti/pom.xml | 4 ----
 nimbus-starter/pom.xml       | 8 --------
 2 files changed, 12 deletions(-)

diff --git a/nimbus-extn-activiti/pom.xml b/nimbus-extn-activiti/pom.xml
index e4d0dcbc5..280566060 100644
--- a/nimbus-extn-activiti/pom.xml
+++ b/nimbus-extn-activiti/pom.xml
@@ -4,11 +4,7 @@
 	<parent>
 		<groupId>com.antheminc.oss</groupId>
 		<artifactId>nimbus-parent</artifactId>
-<<<<<<< HEAD
-		<version>1.3.1.M14</version>
-=======
 		<version>1.3.1.M13</version>
->>>>>>> 7e81775764fac4e780b8a31b5be7031ff9e1c022
 	</parent>
 	
 	<artifactId>nimbus-extn-activiti</artifactId>
diff --git a/nimbus-starter/pom.xml b/nimbus-starter/pom.xml
index cd67cdfd9..acd91b365 100644
--- a/nimbus-starter/pom.xml
+++ b/nimbus-starter/pom.xml
@@ -5,11 +5,7 @@
 
 	<groupId>com.antheminc.oss</groupId>
 	<artifactId>nimbus-starter</artifactId>
-<<<<<<< HEAD
-    <version>1.3.1.M14</version>
-=======
     <version>1.3.1.M13</version>
->>>>>>> 7e81775764fac4e780b8a31b5be7031ff9e1c022
 	<url>http://www.oss.antheminc.com/</url>
 	<developers>
 		<developer>
@@ -61,11 +57,7 @@
 	<description>framework starter project</description>
 
 	<properties>
-<<<<<<< HEAD
-		<nimbus.version>1.3.1.M14</nimbus.version>
-=======
 		<nimbus.version>1.3.1.M13</nimbus.version>
->>>>>>> 7e81775764fac4e780b8a31b5be7031ff9e1c022
 	</properties>
 
 	<dependencies>