From 3e8e2d843d5c3f78bc140fd5308d0b2974f1f3ae Mon Sep 17 00:00:00 2001 From: Patrick Brady 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 Issue-ID: APPC-871 --- .../features/src/main/resources/features.xml | 11 +++-------- appc-inbound/appc-design-services/provider/pom.xml | 3 ++- appc-inbound/appc-interfaces-service/bundle/pom.xml | 2 +- .../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 +++++++++++ 6 files changed, 22 insertions(+), 15 deletions(-) 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 7fb150504..c13ed2f06 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 @@ -27,23 +27,18 @@ 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"> - mvn:org.opendaylight.yangtools/features-yangtools/${odl.yangtools.version}/xml/features - mvn:org.opendaylight.controller/features-mdsal/${odl.controller.mdsal.features.version}/xml/features - - odl-mdsal-models + odl-mdsal-models mvn:org.onap.appc/appc-design-services-model/${project.version} - odl-mdsal-broker + odl-mdsal-broker ccsdk-sli mvn:org.onap.appc/appc-design-services-provider/${project.version} mvn:org.onap.appc/appc-network-inventory-client-provider/${project.version} - wrap:mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.3.0 - - odl-restconf + odl-restconf diff --git a/appc-inbound/appc-design-services/provider/pom.xml b/appc-inbound/appc-design-services/provider/pom.xml index b72f29048..6a6b3b72d 100755 --- a/appc-inbound/appc-design-services/provider/pom.xml +++ b/appc-inbound/appc-design-services/provider/pom.xml @@ -41,6 +41,7 @@ org.onap.appc.design.services org.onap.appc.instar,*;resolution:=optional + jackson-dataformat-yaml * true @@ -143,7 +144,7 @@ com.fasterxml.jackson.dataformat jackson-dataformat-yaml - 2.3.0 + 2.3.2 com.fasterxml.jackson.core diff --git a/appc-inbound/appc-interfaces-service/bundle/pom.xml b/appc-inbound/appc-interfaces-service/bundle/pom.xml index 8a4586ea3..bfc156014 100644 --- a/appc-inbound/appc-interfaces-service/bundle/pom.xml +++ b/appc-inbound/appc-interfaces-service/bundle/pom.xml @@ -127,7 +127,7 @@ com.fasterxml.jackson.dataformat jackson-dataformat-yaml - 2.3.0 + 2.3.2 com.fasterxml.jackson.core 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 @@ --> - - - odl-mdsal-broker - ccsdk-sli + odl-mdsal-broker + ccsdk-sli mvn:commons-lang/commons-lang/2.6 mvn:commons-collections/commons-collections/${common.collections.version} 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 @@ appc-network-inventory-client appc-network-inventory-client - mvn:org.onap.appc/appc-network-inventory-features/${project.version}/xml/features + mvn:org.onap.appc/appc-network-inventory-client-features/${project.version}/xml/features false 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 @@ org.json json + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + 2.3.2 + + + org.yaml + snakeyaml + ${snakeyaml.version} + @@ -108,6 +118,7 @@ org.onap.appc.instar.InstarClientActivator org.onap.appc.instar * + jackson-dataformat-yaml,snakeyaml * ${project.basedir}/src/main/resources/META-INF -- cgit 1.2.3-korg