From: Michael Lando <michael.lando@intl.att.com>
Date: Tue, 20 Nov 2018 14:50:37 +0000 (+0200)
Subject: fix issue in in alloted resource
X-Git-Tag: 1.3.4~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=4f1b51d3db3daf74e68d5dba8e62956a08641d22;p=sdc.git

fix issue in in alloted resource

update aloted template add it to upgrade normative
remove use of mail librery

Change-Id: Ie8922c6cce4ca10baaf401f7a7bfed436ceb585e
Issue-ID: SDC-1945
Signed-off-by: Michael Lando <michael.lando@intl.att.com>
---

diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.yml
index 00d3bd243d..cf7b5cc490 100644
--- a/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.yml
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.yml
@@ -34,5 +34,4 @@ node_types:
     - service_dependency:
         capability: org.openecomp.capabilities.AllottedResource
         relationship: tosca.relationships.DependsOn
-        node: tosca.services.Root
 
diff --git a/catalog-be/src/main/resources/scripts/import/tosca/onapTypesToUpgrade.json b/catalog-be/src/main/resources/scripts/import/tosca/onapTypesToUpgrade.json
index 9101291fc9..cbe581acd2 100644
--- a/catalog-be/src/main/resources/scripts/import/tosca/onapTypesToUpgrade.json
+++ b/catalog-be/src/main/resources/scripts/import/tosca/onapTypesToUpgrade.json
@@ -1,5 +1,6 @@
 {
   "nfv": [
+    "allottedResource"
   ],
   "onap": [
   ],
diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml
index 36105aa923..7b2ef6e709 100644
--- a/catalog-fe/pom.xml
+++ b/catalog-fe/pom.xml
@@ -96,12 +96,6 @@
 			<scope>compile</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>javax.mail</groupId>
-			<artifactId>javax.mail-api</artifactId>
-			<version>1.5.2</version>
-			<scope>compile</scope>
-		</dependency>
 
 		<dependency>
 			<groupId>org.glassfish.jersey.media</groupId>