Fix installation issues with generic-resource-api

Updated generic-resource-api to use Aries blueprint to install and
resolved issues preventing it from installing properly in karaf.

Change-Id: Iaef8bdb7a9e6aaf149a8e8a0d847197cf3f704a9
Issue-ID: SDNC-109
Signed-off-by: Dan Timoney <dtimoney@att.com>
diff --git a/generic-resource-api/pom.xml b/generic-resource-api/pom.xml
index 2d76101..f3c2e93 100644
--- a/generic-resource-api/pom.xml
+++ b/generic-resource-api/pom.xml
@@ -18,9 +18,9 @@
     </properties>
 	<modules>
 		<module>model</module>
+        <module>provider</module>
 		<module>features</module>
 		<module>installer</module>
-		<module>provider</module>
 	</modules>
 
 
@@ -28,26 +28,19 @@
 		<dependencies>
 			<dependency>
 				<groupId>org.onap.sdnc.northbound</groupId>
-				<artifactId>generic-resource-api.features</artifactId>
+				<artifactId>generic-resource-api-features</artifactId>
 				<version>${project.version}</version>
 				<type>xml</type>
 				<classifier>features</classifier>
 			</dependency>
 			<dependency>
 				<groupId>org.onap.sdnc.northbound</groupId>
-				<artifactId>generic-resource-api.model</artifactId>
+				<artifactId>generic-resource-api-model</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.onap.sdnc.northbound</groupId>
-				<artifactId>generic-resource-api.provider</artifactId>
-				<version>${project.version}</version>
-				<type>xml</type>
-				<classifier>config</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.onap.sdnc.northbound</groupId>
-				<artifactId>generic-resource-api.provider</artifactId>
+				<artifactId>generic-resource-api-provider</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 		</dependencies>