From 3e8e2d843d5c3f78bc140fd5308d0b2974f1f3ae Mon Sep 17 00:00:00 2001
From: Patrick Brady <pb071s@att.com>
Date: Tue, 1 May 2018 13:35:59 -0700
Subject: Fixes for the two features that were not installed

These features relied on exports that didn't exist.
Also versions had to be removed from feature files.

Change-Id: I1860ae6c46354061943223ac6a201518871d3608
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-871
---
 .../features/src/main/resources/features.xml                  |  8 ++++----
 appc-outbound/appc-network-inventory-client/installer/pom.xml |  2 +-
 appc-outbound/appc-network-inventory-client/provider/pom.xml  | 11 +++++++++++
 3 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'appc-outbound/appc-network-inventory-client')

diff --git a/appc-outbound/appc-network-inventory-client/features/src/main/resources/features.xml b/appc-outbound/appc-network-inventory-client/features/src/main/resources/features.xml
index c80568e70..276a275a2 100644
--- a/appc-outbound/appc-network-inventory-client/features/src/main/resources/features.xml
+++ b/appc-outbound/appc-network-inventory-client/features/src/main/resources/features.xml
@@ -23,17 +23,17 @@
   -->
 
 
-<features name="app-cntrl-network-inventory-client-${project.version}"
+<features name="appc-network-inventory-client-${project.version}"
 	xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
 
 	<!--<repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository>-->
 
-	<feature name='app-cntrl-network-inventory' description="Application Controller Instar Client"
+	<feature name='appc-network-inventory-client' description="Application Controller Instar Client"
 		version='${project.version}'>
 		<!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
-		<feature >odl-mdsal-broker</feature>
-		<feature version= "${sdnctl.sli.version}">ccsdk-sli</feature>
+		<feature>odl-mdsal-broker</feature>
+		<feature>ccsdk-sli</feature>
 		
 		<bundle>mvn:commons-lang/commons-lang/2.6</bundle>
 		<bundle>mvn:commons-collections/commons-collections/${common.collections.version}</bundle>		
diff --git a/appc-outbound/appc-network-inventory-client/installer/pom.xml b/appc-outbound/appc-network-inventory-client/installer/pom.xml
index 7d1c2c042..9e5179006 100755
--- a/appc-outbound/appc-network-inventory-client/installer/pom.xml
+++ b/appc-outbound/appc-network-inventory-client/installer/pom.xml
@@ -34,7 +34,7 @@
 	<properties>
 		<application.name>appc-network-inventory-client</application.name>
 		<features.boot>appc-network-inventory-client</features.boot>
-		<features.repositories>mvn:org.onap.appc/appc-network-inventory-features/${project.version}/xml/features</features.repositories>
+		<features.repositories>mvn:org.onap.appc/appc-network-inventory-client-features/${project.version}/xml/features</features.repositories>
 		<include.transitive.dependencies>false</include.transitive.dependencies>
 	</properties>
 
diff --git a/appc-outbound/appc-network-inventory-client/provider/pom.xml b/appc-outbound/appc-network-inventory-client/provider/pom.xml
index a4b9f07ae..000b73e21 100755
--- a/appc-outbound/appc-network-inventory-client/provider/pom.xml
+++ b/appc-outbound/appc-network-inventory-client/provider/pom.xml
@@ -94,6 +94,16 @@
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-yaml</artifactId>
+            <version>2.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>${snakeyaml.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -108,6 +118,7 @@
                         <Bundle-Activator>org.onap.appc.instar.InstarClientActivator</Bundle-Activator>
                         <Export-Package>org.onap.appc.instar</Export-Package>
                         <Import-Package>*</Import-Package>
+                        <Embed-Dependency>jackson-dataformat-yaml,snakeyaml</Embed-Dependency>
                         <DynamicImport-Package>*</DynamicImport-Package>
                     </instructions>
                     <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
-- 
cgit 1.2.3-korg