From: Dan Timoney <dt5972@att.com>
Date: Tue, 11 Sep 2018 20:57:02 +0000 (+0000)
Subject: Merge "Update parent pom to conform to CCSDK structure"
X-Git-Tag: 0.3.0~11
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=5dfa696b46c79c64c429c66d2af911bd54a653d7;hp=ea45fbffab1f36271def9443fd32cdbd75839f7e;p=ccsdk%2Ffeatures.git

Merge "Update parent pom to conform to CCSDK structure"
---

diff --git a/blueprints-processor/installer/pom.xml b/blueprints-processor/installer/pom.xml
index 65d42ecaa..54ad30d42 100644
--- a/blueprints-processor/installer/pom.xml
+++ b/blueprints-processor/installer/pom.xml
@@ -36,7 +36,7 @@
 	<properties>
 		<application.name>blueprints-processor</application.name>
 		<features.boot>blueprints-processor-features</features.boot>
-		<features.repositories>mvn:org.onap.ccsdk.config/blueprints-processor-features/${project.version}/xml/features</features.repositories>
+		<features.repositories>mvn:org.onap.ccsdk.features/ccsdk-features/blueprints-processor-features/${project.version}/xml/features</features.repositories>
 		<include.transitive.dependencies>false</include.transitive.dependencies>
 	</properties>
 
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment.json
index 030af7b4f..0e29fe160 100644
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment.json
+++ b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment.json
@@ -194,7 +194,7 @@
 					"type": "tosca.capabilities.Node"
 				},
 				"content": {
-					"type": "tosca.capability.Content",
+					"type": "tosca.capabilities.Content",
 					"properties": {
 						"type": {
 							"required": false,
@@ -321,7 +321,7 @@
 			},
 			"capabilities": {
 				"content": {
-					"type": "tosca.capability.Content",
+					"type": "tosca.capabilities.Content",
 					"properties": {
 						"content": {
 							"required": true,
@@ -330,7 +330,7 @@
 					}
 				},
 				"mapping": {
-					"type": "tosca.capability.Mapping",
+					"type": "tosca.capabilities.Mapping",
 					"properties": {
 						"mapping": {
 							"required": false,
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment/resource_assignment.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment/resource_assignment.json
index 30c7f49c4..6347f4223 100644
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment/resource_assignment.json
+++ b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment/resource_assignment.json
@@ -196,7 +196,7 @@
 					"type": "tosca.capabilities.Node"
 				},
 				"content": {
-					"type": "tosca.capability.Content",
+					"type": "tosca.capabilities.Content",
 					"properties": {
 						"type": {
 							"required": false,
@@ -331,7 +331,7 @@
 			},
 			"capabilities": {
 				"content": {
-					"type": "tosca.capability.Content",
+					"type": "tosca.capabilities.Content",
 					"properties": {
 						"content": {
 							"required": true,
@@ -340,7 +340,7 @@
 					}
 				},
 				"mapping": {
-					"type": "tosca.capability.Mapping",
+					"type": "tosca.capabilities.Mapping",
 					"properties": {
 						"mapping": {
 							"required": false,
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/vpe-201802-baseconfig/vpe-201802-baseconfig.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/vpe-201802-baseconfig/vpe-201802-baseconfig.json
index ed1fe4093..20207a87b 100644
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/vpe-201802-baseconfig/vpe-201802-baseconfig.json
+++ b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/vpe-201802-baseconfig/vpe-201802-baseconfig.json
@@ -279,7 +279,7 @@
 					"type": "tosca.capabilities.Node"
 				},
 				"content": {
-					"type": "tosca.capability.Content",
+					"type": "tosca.capabilities.Content",
 					"properties": {
 						"type": {
 							"required": false,
@@ -395,7 +395,7 @@
 			},
 			"capabilities": {
 				"content": {
-					"type": "tosca.capability.Content",
+					"type": "tosca.capabilities.Content",
 					"properties": {
 						"content": {
 							"required": true,
@@ -404,7 +404,7 @@
 					}
 				},
 				"mapping": {
-					"type": "tosca.capability.Mapping",
+					"type": "tosca.capabilities.Mapping",
 					"properties": {
 						"mapping": {
 							"required": false,
diff --git a/blueprints-processor/plugin/generator-provider/src/test/resources/service_templates/generate_configuration.json b/blueprints-processor/plugin/generator-provider/src/test/resources/service_templates/generate_configuration.json
index d2c16ede1..0d569ef85 100644
--- a/blueprints-processor/plugin/generator-provider/src/test/resources/service_templates/generate_configuration.json
+++ b/blueprints-processor/plugin/generator-provider/src/test/resources/service_templates/generate_configuration.json
@@ -132,7 +132,7 @@
 			},
 			"capabilities": {
 				"content": {
-					"type": "tosca.capability.Content",
+					"type": "tosca.capabilities.Content",
 					"properties": {
 						"content": {
 							"required": true,
@@ -141,7 +141,7 @@
 					}
 				},
 				"mapping": {
-					"type": "tosca.capability.Mapping",
+					"type": "tosca.capabilities.Mapping",
 					"properties": {
 						"mapping": {
 							"required": false,
@@ -252,7 +252,7 @@
 					"type": "tosca.capabilities.Node"
 				},
 				"content": {
-					"type": "tosca.capability.Content",
+					"type": "tosca.capabilities.Content",
 					"properties": {
 						"type": {
 							"required": false,
diff --git a/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/default.json b/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/default.json
index f7dc5940a..d3dd9934a 100644
--- a/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/default.json
+++ b/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/default.json
@@ -241,7 +241,7 @@
           "type" : "tosca.capabilities.Node"
         },
         "content" : {
-          "type" : "tosca.capability.Content",
+          "type" : "tosca.capabilities.Content",
           "properties" : {
             "type" : {
               "required" : false,
@@ -306,7 +306,7 @@
           "type" : "tosca.capabilities.Node"
         },
         "content" : {
-          "type" : "tosca.capability.Content",
+          "type" : "tosca.capabilities.Content",
           "properties" : {
             "type" : {
               "required" : false,
@@ -371,7 +371,7 @@
       },
       "capabilities" : {
         "content" : {
-          "type" : "tosca.capability.Content",
+          "type" : "tosca.capabilities.Content",
           "properties" : {
             "content" : {
               "required" : true,
@@ -380,7 +380,7 @@
           }
         },
         "mapping" : {
-          "type" : "tosca.capability.Mapping",
+          "type" : "tosca.capabilities.Mapping",
           "properties" : {
             "mapping" : {
               "required" : false,
diff --git a/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/resource_assignment.json b/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/resource_assignment.json
index 030af7b4f..0e29fe160 100644
--- a/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/resource_assignment.json
+++ b/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/resource_assignment.json
@@ -194,7 +194,7 @@
 					"type": "tosca.capabilities.Node"
 				},
 				"content": {
-					"type": "tosca.capability.Content",
+					"type": "tosca.capabilities.Content",
 					"properties": {
 						"type": {
 							"required": false,
@@ -321,7 +321,7 @@
 			},
 			"capabilities": {
 				"content": {
-					"type": "tosca.capability.Content",
+					"type": "tosca.capabilities.Content",
 					"properties": {
 						"content": {
 							"required": true,
@@ -330,7 +330,7 @@
 					}
 				},
 				"mapping": {
-					"type": "tosca.capability.Mapping",
+					"type": "tosca.capabilities.Mapping",
 					"properties": {
 						"mapping": {
 							"required": false,