From 45fa4b5827f60f15c5ceddecd95922a72c227c93 Mon Sep 17 00:00:00 2001
From: Prema Bhatt <pb6115@att.com>
Date: Thu, 8 Nov 2018 14:18:26 -0800
Subject: Updated pom.xml appc library version to 1.4.0

Issue-ID: SO-1199
Change-Id: I5c1f8d6e434ce12e370435bcae4f22485c5d249e
Signed-off-by: Prema Bhatt <pb6115@att.com>
---
 bpmn/MSOCommonBPMN/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'bpmn/MSOCommonBPMN/pom.xml')

diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml
index 456b8ae074..926e09c498 100644
--- a/bpmn/MSOCommonBPMN/pom.xml
+++ b/bpmn/MSOCommonBPMN/pom.xml
@@ -293,12 +293,12 @@
 		<dependency>
 			<groupId>org.onap.appc.client</groupId>
 			<artifactId>client-lib</artifactId>
-			<version>1.3.0</version>
+			<version>1.4.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.onap.appc.client</groupId>
 			<artifactId>client-kit</artifactId>
-			<version>1.3.0</version>
+			<version>1.4.0</version>
 		</dependency>
 
 		<dependency>
-- 
cgit 1.2.3-korg


From 53af118db25d8ae931c8a50c283e8c7caf1038f3 Mon Sep 17 00:00:00 2001
From: subhash kumar singh <subhash.kumar.singh@huawei.com>
Date: Tue, 27 Nov 2018 05:55:33 +0530
Subject: Fix model vnfresource bean annotation

Fix model vnfresource bean annotation.

Change-Id: If18ea766623ad087eae8ac9ea31258dacd192ff7
Issue-ID: SO-1252
Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
---
 bpmn/MSOCommonBPMN/pom.xml                                             | 2 +-
 .../src/main/java/org/onap/so/db/catalog/beans/VnfResource.java        | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'bpmn/MSOCommonBPMN/pom.xml')

diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml
index 926e09c498..ee4dab4d8c 100644
--- 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 764d2b7c39..83fe051233 100644
--- 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;
 
-- 
cgit 1.2.3-korg


From d7cc788c0513a1b8deff1297b7476809867558f1 Mon Sep 17 00:00:00 2001
From: subhash kumar singh <subhash.kumar.singh@huawei.com>
Date: Tue, 27 Nov 2018 06:17:38 +0530
Subject: Fix sdc-tosca version

Fix sdc-tosca version.

Change-Id: I8529162004b408238c260d48c560c799c5f41508
Issue-ID: SO-1252
Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
---
 bpmn/MSOCommonBPMN/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bpmn/MSOCommonBPMN/pom.xml')

diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml
index ee4dab4d8c..42e9cb6d92 100644
--- a/bpmn/MSOCommonBPMN/pom.xml
+++ b/bpmn/MSOCommonBPMN/pom.xml
@@ -321,7 +321,7 @@
 		<dependency>
 			<groupId>org.onap.sdc.sdc-tosca</groupId>
 			<artifactId>sdc-tosca</artifactId>
-			<version>1.4.1</version>			
+			<version>1.4.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.onap.sdc.jtosca</groupId>
-- 
cgit 1.2.3-korg