Changes in pom and features.xml files
Issue-ID : APPC-240
Change-Id: I42d2277d73163041ccfebe69897f05ac0314e6a1
Signed-off-by: Dilip kumar Pampana <dp583p@att.com>
diff --git a/appc-inbound/appc-artifact-handler/features/src/main/resources/features.xml b/appc-inbound/appc-artifact-handler/features/src/main/resources/features.xml
index f742dfc..6760491 100644
--- a/appc-inbound/appc-artifact-handler/features/src/main/resources/features.xml
+++ b/appc-inbound/appc-artifact-handler/features/src/main/resources/features.xml
@@ -29,12 +29,12 @@
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.version}/xml/features</repository>
+ <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository>
<feature name='app-cntrl-artifact-handler' description="Application Controller Artifact Handler"
version='${project.version}'>
<!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
- <feature version="${broker-mdsal.version">odl-mdsal-broker</feature>
+ <feature version="${broker-mdsal.version}">odl-mdsal-broker</feature>
<feature version='${sdnctl.sli.version}'>sdnc-sli</feature>
<bundle>wrap:mvn:com.att.eelf/eelf-core/${eelf.version}</bundle>
<bundle>wrap:mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
diff --git a/appc-inbound/appc-design-services/features/src/main/resources/features.xml b/appc-inbound/appc-design-services/features/src/main/resources/features.xml
index d3cf5d2..315becf 100644
--- a/appc-inbound/appc-design-services/features/src/main/resources/features.xml
+++ b/appc-inbound/appc-design-services/features/src/main/resources/features.xml
@@ -29,20 +29,20 @@
xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
<repository>mvn:org.opendaylight.yangtools/features-yangtools/${odl.yangtools.version}/xml/features</repository>
- <repository>mvn:org.opendaylight.controller/features-mdsal/${odl.controller.mdsal.version}/xml/features</repository>
- <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features</repository>
- <repository>mvn:org.opendaylight.netconf/features-restconf/${odl.controller.mdsal.version}/xml/features</repository>
+ <repository>mvn:org.opendaylight.controller/features-mdsal/${odl.controller.mdsal.features.version}/xml/features</repository>
+<!-- <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features</repository>
+ <repository>mvn:org.opendaylight.netconf/features-restconf/${odl.controller.mdsal.version}/xml/features</repository> -->
- <feature name='appc-design-services' description="Application Controller LCM API Bypass"
+ <feature name='appc-design-services' description="Application Controller Design Services"
version='${project.version}'>
- <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
+ <feature version='${odl.mdsal.model.version}'>odl-mdsal-models</feature>
<bundle>mvn:org.openecomp.appc/appc-design-services-model/${project.version}</bundle>
<!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
<feature version='${broker-mdsal.version}'>odl-mdsal-broker</feature>
<feature version='${sdnctl.sli.version}'>sdnc-sli</feature>
- <bundle>mvn:org.openecomp.appc/appc-design-services.provider/${project.version}</bundle>
+ <bundle>mvn:org.openecomp.appc/appc-design-services-provider/${project.version}</bundle>
<bundle>wrap:mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.3.0</bundle>
<feature version='${broker-mdsal.version}'>odl-restconf</feature>