From 62cd6aaaf74aa91ee0037c0e155c8e7284f07567 Mon Sep 17 00:00:00 2001
From: Arthur Martella <amartell@research.att.com>
Date: Fri, 8 Sep 2017 13:27:46 -0400
Subject: 1710 Rebase - Second Attempt

This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit:
54483fc6606ddb1591a2e9da61bff8712325f924
Wed Sep 6 18:12:56 2017 -0400

Rebasing was done on a branch on top of this commit in so/master in ONAP:
93fbdfbe46104f8859d4754040f979cb7997c157
Thu Sep 7 16:42:59 2017 +0000

Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59
Issue-id: SO-107
Signed-off-by: Arthur Martella <amartell@research.att.com>
---
 mso-catalog-db/pom.xml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'mso-catalog-db/pom.xml')

diff --git a/mso-catalog-db/pom.xml b/mso-catalog-db/pom.xml
index 7051ab7071..606c878c3e 100644
--- a/mso-catalog-db/pom.xml
+++ b/mso-catalog-db/pom.xml
@@ -29,8 +29,10 @@
 						<configuration>
 							<hibernateDialect>org.hibernate.dialect.MySQL5Dialect</hibernateDialect>
 							<hibernateMapping>
+								${project.basedir}/src/main/resources/AllottedResource.hbm.xml,
 								${project.basedir}/src/main/resources/AllottedResourceCustomization.hbm.xml,
 								${project.basedir}/src/main/resources/HeatEnvironment.hbm.xml,
+								${project.basedir}/src/main/resources/HeatFiles.hbm.xml,
 								${project.basedir}/src/main/resources/HeatNestedTemplate.hbm.xml,
 								${project.basedir}/src/main/resources/HeatTemplate.hbm.xml,
 								${project.basedir}/src/main/resources/ModelRecipe.hbm.xml,
@@ -38,14 +40,21 @@
 								${project.basedir}/src/main/resources/NetworkResource.hbm.xml,
 								${project.basedir}/src/main/resources/NetworkResourceCustomization.hbm.xml,
 								${project.basedir}/src/main/resources/Service.hbm.xml,
+								${project.basedir}/src/main/resources/ServiceRecipe.hbm.xml,
 								${project.basedir}/src/main/resources/ServiceToAllottedResources.hbm.xml,
 								${project.basedir}/src/main/resources/ServiceToNetworks.hbm.xml,
+								${project.basedir}/src/main/resources/ServiceToResourceCustomization.hbm.xml,
+								${project.basedir}/src/main/resources/TempNetworkHeatTemplateLookup.hbm.xml,
+								${project.basedir}/src/main/resources/ToscaCsar.hbm.xml,
 								${project.basedir}/src/main/resources/VfModule.hbm.xml,
+								${project.basedir}/src/main/resources/VfModuleCustomization.hbm.xml,
 								${project.basedir}/src/main/resources/VfModuleToHeatFiles.hbm.xml,
 								${project.basedir}/src/main/resources/VnfComponent.hbm.xml,
 								${project.basedir}/src/main/resources/VnfComponentsRecipe.hbm.xml,
 								${project.basedir}/src/main/resources/VnfRecipe.hbm.xml,
-								${project.basedir}/src/main/resources/VnfResource.hbm.xml
+								${project.basedir}/src/main/resources/VnfResCustomToVfModuleCustom.hbm.xml,
+								${project.basedir}/src/main/resources/VnfResource.hbm.xml,
+								${project.basedir}/src/main/resources/VnfResourceCustomization.hbm.xml
 							</hibernateMapping>
 							<target>SCRIPT</target>
 							<skip>false</skip>
@@ -157,12 +166,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-             <groupId>org.evosuite</groupId>
-             <artifactId>evosuite-standalone-runtime</artifactId>
-             <version>${evosuiteVersion}</version>
-             <scope>test</scope>
-        </dependency>
 		<dependency>
 			<groupId>org.openecomp.so</groupId>
 			<artifactId>common</artifactId>
-- 
cgit 1.2.3-korg