Merge branch 'master' into release/1.6.0

qbicsoftware · Oct 24, 2022 · 39719de · 39719de
2 parents 4487c52 + 7ef132c
commit 39719de
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/offer-manager-app/pom.xml b/offer-manager-app/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>offer-manager</artifactId>
         <groupId>life.qbic</groupId>
-        <version>1.5.4</version>
+        <version>1.5.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>war</packaging>
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>life.qbic</groupId>
             <artifactId>offer-manager-domain</artifactId>
-            <version>1.5.4</version>
+            <version>1.5.6</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/offer-manager-domain/pom.xml b/offer-manager-domain/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>offer-manager</artifactId>
 		<groupId>life.qbic</groupId>
-		<version>1.5.4</version>
+		<version>1.5.6</version>
 	</parent>
 	<dependencies>
 		<dependency>

diff --git a/offer-manager-domain/src/main/groovy/life/qbic/business/persons/Person.groovy b/offer-manager-domain/src/main/groovy/life/qbic/business/persons/Person.groovy
@@ -41,6 +41,9 @@ class Person {
     @Column(name = "active", columnDefinition = "tinyint", nullable = false)
     boolean isActive = true
 
+    @Column(name = "reference_id", nullable = false)
+    private String referenceId
+
     @ManyToMany(cascade = [CascadeType.DETACH, CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH])
     @JoinTable(name = "person_affiliation", joinColumns = [ @JoinColumn(name = "person_id") ],
             inverseJoinColumns = [ @JoinColumn(name = "affiliation_id")])
@@ -63,6 +66,7 @@ class Person {
         this.title = title
         this.email = email
         this.affiliations = affiliations
+        this.referenceId = UUID.randomUUID().toString()
     }
 
     Integer getId() {

diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>offer-manager</artifactId>
-	<version>1.5.4</version> <!-- <<QUBE_FORCE_BUMP>> -->
+	<version>1.5.6</version> <!-- <<QUBE_FORCE_BUMP>> -->
 	<groupId>life.qbic</groupId>
 	<name>The new offer manager</name>
 	<url>https://github.com/qbicsoftware/offer-manager-2-portlet</url>