Merge "update the release to 1.3.4" into casablanca

diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml
index 926e09c..ee4dab4 100644 (file)
--- a/bpmn/MSOCommonBPMN/pom.xml
+++ b/bpmn/MSOCommonBPMN/pom.xml
@@ -326,7 +326,7 @@
                <dependency>
                        <groupId>org.onap.sdc.jtosca</groupId>
                        <artifactId>jtosca</artifactId>
-                       <version>1.4.1</version>
+                       <version>1.4.4</version>
                </dependency>
                <dependency>
                        <groupId>org.springframework.boot</groupId>

diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfResource.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfResource.java
index 764d2b7..83fe051 100644 (file)
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfResource.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfResource.java
@@ -43,6 +43,8 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.openpojo.business.annotation.BusinessKey;
 
+import org.hibernate.annotations.NotFound;
+import org.hibernate.annotations.NotFoundAction;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
 
 @Entity
@@ -91,6 +93,7 @@ public class VnfResource implements Serializable {
        private Date created;
 
        @ManyToOne(fetch = FetchType.LAZY)
+       @NotFound(action = NotFoundAction.IGNORE)
        @JoinColumn(name = "HEAT_TEMPLATE_ARTIFACT_UUID")
        private HeatTemplate heatTemplates;