From: Patrick Brady <pb071s@att.com>
Date: Fri, 4 May 2018 22:26:31 +0000 (-0700)
Subject: Changes needed to install appc-interfaces-service
X-Git-Tag: v1.3.0~24
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=4e5f6810a25cb05fee98bb8027f47c057bbc88ec;hp=3099e80738203974c7a967a99dc65a8a97711243;p=appc.git

Changes needed to install appc-interfaces-service

Change-Id: I3592f49b2561b518fb85e080031ce2bc0e432cf3
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-880
---

diff --git a/appc-inbound/appc-interfaces-service/bundle/pom.xml b/appc-inbound/appc-interfaces-service/bundle/pom.xml
index bfc156014..e5beab487 100644
--- a/appc-inbound/appc-interfaces-service/bundle/pom.xml
+++ b/appc-inbound/appc-interfaces-service/bundle/pom.xml
@@ -41,6 +41,7 @@
                     <instructions>
                     <Export-Package>org.onap.appc.interfaces.services</Export-Package>
                          <Import-Package>org.onap.appc.aai.client,*;resolution:=optional</Import-Package>
+                         <Embed-Dependency>jackson-dataformat-yaml</Embed-Dependency>
                          <DynamicImport-Package>*</DynamicImport-Package>
                                      <Embed-Transitive>true</Embed-Transitive>
                     </instructions>
diff --git a/appc-inbound/appc-interfaces-service/features/src/main/resources/features.xml b/appc-inbound/appc-interfaces-service/features/src/main/resources/features.xml
index ecb5520fc..7f4efda7a 100644
--- a/appc-inbound/appc-interfaces-service/features/src/main/resources/features.xml
+++ b/appc-inbound/appc-interfaces-service/features/src/main/resources/features.xml
@@ -35,16 +35,15 @@
     <feature name='appc-interfaces-service' description="Application Controller Interfaces Services"
         version='${project.version}'>
 
-        <feature version='${odl.mdsal.model.version}'>odl-mdsal-models</feature>
+        <feature>odl-mdsal-models</feature>
         <bundle>mvn:org.onap.appc/appc-interfaces-service-model/${project.version}</bundle>
 
         <!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
-        <feature version='${odl.mdsal.version}'>odl-mdsal-broker</feature>
+        <feature>odl-mdsal-broker</feature>
         <feature>ccsdk-sli</feature>
         <bundle>mvn:org.onap.appc/appc-interfaces-service-bundle/${project.version}</bundle>
-        <bundle>mvn:org.onap.appc/appc-aai-client-provider/${project.version}</bundle>
-        <bundle>wrap:mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.3.0</bundle>
-        <feature version='${odl.mdsal.version}'>odl-restconf</feature>
+        <bundle dependency="true">mvn:org.onap.appc/appc-aai-client-provider/${project.version}</bundle>
+        <feature>odl-restconf</feature>
 
     </feature>